Index: client/Client/Client.vcxproj =================================================================== --- client/Client/Client.vcxproj (revision 3a79253784dcf52104a4d43b21218f28f83fc81a) +++ client/Client/Client.vcxproj (revision 7b43385375bd02e506e07071412b3b79737213c2) @@ -47,5 +47,5 @@ true c:\allegro\lib;%(AdditionalLibraryDirectories) - allegro-5.0.7-monolith-md-debug.lib;%(AdditionalDependencies) + allegro-5.0.8-monolith-md-debug.lib;%(AdditionalDependencies) @@ -65,4 +65,5 @@ + @@ -77,4 +78,5 @@ + Index: client/Client/Client.vcxproj.filters =================================================================== --- client/Client/Client.vcxproj.filters (revision 3a79253784dcf52104a4d43b21218f28f83fc81a) +++ client/Client/Client.vcxproj.filters (revision 7b43385375bd02e506e07071412b3b79737213c2) @@ -55,4 +55,7 @@ Source Files\common + + Source Files\common + @@ -84,4 +87,7 @@ Header Files\common + + Header Files\common + Index: client/Client/main.cpp =================================================================== --- client/Client/main.cpp (revision 3a79253784dcf52104a4d43b21218f28f83fc81a) +++ client/Client/main.cpp (revision 7b43385375bd02e506e07071412b3b79737213c2) @@ -14,8 +14,11 @@ #include -#include -#include +#include +#include #include #include +#include + +#include #include @@ -24,7 +27,9 @@ #include #include +#include #include "../../common/Message.h" #include "../../common/Common.h" +#include "../../common/WorldMap.h" #include "../../common/Player.h" @@ -42,5 +47,9 @@ void initWinSock(); void shutdownWinSock(); -void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole); +void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map& mapPlayers, unsigned int& curPlayerId); +void drawMap(WorldMap* gameMap); +void drawPlayers(map& mapPlayers, unsigned int curPlayerId); +POSITION screenToMap(POSITION pos); +POSITION mapToScreen(POSITION pos); // callbacks @@ -99,4 +108,6 @@ bool redraw = true; doexit = false; + map mapPlayers; + unsigned int curPlayerId = -1; float bouncer_x = SCREEN_W / 2.0 - BOUNCER_SIZE / 2.0; @@ -110,10 +121,18 @@ } - al_init_primitives_addon(); + if (al_init_primitives_addon()) + cout << "Primitives initialized" << endl; + else + cout << "Primitives not initialized" << endl; + al_init_font_addon(); al_init_ttf_addon(); - ALLEGRO_FONT *font = al_load_ttf_font("../pirulen.ttf", 12, 0); - + #if defined WINDOWS + ALLEGRO_FONT *font = al_load_ttf_font("../pirulen.ttf", 12, 0); + #elif defined LINUX + ALLEGRO_FONT *font = al_load_ttf_font("pirulen.ttf", 12, 0); + #endif + if (!font) { fprintf(stderr, "Could not load 'pirulen.ttf'.\n"); @@ -144,4 +163,8 @@ return -1; } + + WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt"); + //delete gameMap; + //gameMap = WorldMap::createDefaultMap(); wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H); @@ -291,8 +314,29 @@ } } + else if(ev.type == ALLEGRO_EVENT_MOUSE_BUTTON_UP) { + if(wndCurrent == wndMain) { + msgTo.type = MSG_TYPE_PLAYER_MOVE; + + POSITION pos; + pos.x = ev.mouse.x; + pos.y = ev.mouse.y; + pos = screenToMap(pos); + + if (pos.x != -1) + { + memcpy(msgTo.buffer, &curPlayerId, 4); + memcpy(msgTo.buffer+4, &pos.x, 4); + memcpy(msgTo.buffer+8, &pos.y, 4); + + sendMessage(&msgTo, sock, &server); + } + else + cout << "Invalid point: User did not click on the map" << endl; + } + } if (receiveMessage(&msgFrom, sock, &from) >= 0) { - processMessage(msgFrom, state, chatConsole); + processMessage(msgFrom, state, chatConsole, mapPlayers, curPlayerId); cout << "state: " << state << endl; } @@ -301,8 +345,6 @@ { redraw = false; - + wndCurrent->draw(display); - - al_draw_bitmap(bouncer, bouncer_x, bouncer_y, 0); chatConsole.draw(font, al_map_rgb(255,255,255)); @@ -314,4 +356,7 @@ else if(wndCurrent == wndMain) { al_draw_text(font, al_map_rgb(0, 255, 0), 4, 43, ALLEGRO_ALIGN_LEFT, "Message:"); + + drawMap(gameMap); + drawPlayers(mapPlayers, curPlayerId); } @@ -330,4 +375,6 @@ delete wndLogin; delete wndMain; + + delete gameMap; al_destroy_event_queue(event_queue); @@ -372,5 +419,36 @@ } -void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole) +POSITION screenToMap(POSITION pos) +{ + pos.x = pos.x-300; + pos.y = pos.y-100; + + if (pos.x < 0 || pos.y < 0) + { + pos.x = -1; + pos.y = -1; + } + + return pos; +} + +POSITION mapToScreen(POSITION pos) +{ + pos.x = pos.x+300; + pos.y = pos.y+100; + + return pos; +} + +POSITION mapToScreen(FLOAT_POSITION pos) +{ + POSITION p; + p.x = pos.x+300; + p.y = pos.y+100; + + return p; +} + +void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map& mapPlayers, unsigned int& curPlayerId) { string response = string(msg.buffer); @@ -383,6 +461,4 @@ { cout << "In STATE_START" << endl; - - chatConsole.addLine(response); switch(msg.type) @@ -408,6 +484,14 @@ state = STATE_LOGIN; wndCurrent = wndMain; - cout << "User login successful" << endl; + + Player p("", ""); + p.deserialize(msg.buffer); + mapPlayers[p.id] = p; + curPlayerId = p.id; + + cout << "Got a valid login response with the player" << endl; + cout << "Player id: " << curPlayerId << endl; } + break; } @@ -418,7 +502,5 @@ case STATE_LOGIN: { - chatConsole.addLine(response); - - switch(msg.type) + switch(msg.type) { case MSG_TYPE_REGISTER: @@ -428,4 +510,6 @@ case MSG_TYPE_LOGIN: { + chatConsole.addLine(response); + if (response.compare("You have successfully logged out.") == 0) { @@ -448,12 +532,15 @@ cout << "p.id: " << p.id << endl; - cout << "p.name: " << p.name << endl; - cout << "p.pos.x: " << p.pos.x << endl; - cout << "p.pos.y: " << p.pos.y << endl; break; } - } - + case MSG_TYPE_CHAT: + { + chatConsole.addLine(response); + + break; + } + } + break; } @@ -467,4 +554,45 @@ } +void drawMap(WorldMap* gameMap) +{ + POSITION mapPos; + mapPos.x = 0; + mapPos.y = 0; + mapPos = mapToScreen(mapPos); + for (int x=0; x<12; x++) + { + for (int y=0; y<12; y++) + { + WorldMap::TerrainType el = gameMap->getElement(x, y); + + if (el == WorldMap::TERRAIN_GRASS) + al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 255, 0)); + else if (el == WorldMap::TERRAIN_OCEAN) + al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 0, 255)); + else if (el == WorldMap::TERRAIN_ROCK) + al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(100, 100, 0)); + } + } +} + +void drawPlayers(map& mapPlayers, unsigned int curPlayerId) +{ + map::iterator it; + + Player* p; + POSITION pos; + + for(it = mapPlayers.begin(); it != mapPlayers.end(); it++) + { + p = &it->second; + pos = mapToScreen(p->pos); + + if (p->id == curPlayerId) + al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(255, 0, 0)); + else + al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(191, 0, 0)); + } +} + void registerAccount() { Index: client/makefile =================================================================== --- client/makefile (revision 3a79253784dcf52104a4d43b21218f28f83fc81a) +++ client/makefile (revision 7b43385375bd02e506e07071412b3b79737213c2) @@ -3,8 +3,11 @@ FLAGS = $(LIB_FLAGS) COMMON_PATH = ../common -DEPENDENCIES = Message.o Player.o chat.o GuiComponent.o Window.o Textbox.o Button.o +DEPENDENCIES = Common.o Message.o Player.o chat.o GuiComponent.o Window.o Textbox.o Button.o gameClient : Client/main.cpp $(DEPENDENCIES) $(CC) -o $@ $+ $(FLAGS) + +Common.o : $(COMMON_PATH)/Common.cpp + $(CC) -c -o $@ $? $(FLAGS) Message.o : $(COMMON_PATH)/Message.cpp