Changeset 3e44a59 in network-game

Timestamp:

Dec 23, 2013, 8:45:55 PM (11 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

778d0c9

Parents:

c9f6a1c

Message:

The client shows a game summary screen when the current game cfinishes

Location:

client/Client

Files:

• Client.vcxproj (modified) (2 diffs)
• Client.vcxproj.filters (modified) (2 diffs)
• main.cpp (modified) (15 diffs)

client/Client/Client.vcxproj

@@ -69 +69 @@
     <ClCompile Include="..\..\common\Common.cpp" />
     <ClCompile Include="..\..\common\Game.cpp" />
+    <ClCompile Include="..\..\common\GameSummary.cpp" />
     <ClCompile Include="..\..\common\MessageContainer.cpp" />
     <ClCompile Include="..\..\common\MessageProcessor.cpp" />
@@ -88 +89 @@
     <ClInclude Include="..\..\common\Compiler.h" />
     <ClInclude Include="..\..\common\Game.h" />
+    <ClInclude Include="..\..\common\GameSummary.h" />
     <ClInclude Include="..\..\common\MessageContainer.h" />
     <ClInclude Include="..\..\common\MessageProcessor.h" />

client/Client/Client.vcxproj.filters

@@ -76 +76 @@
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\common\GameSummary.cpp">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -126 +129 @@
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\GameSummary.h">
+      <Filter>Header Files\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>

client/Client/main.cpp

@@ -35 +35 @@
 #include "../../common/Projectile.h"
 #include "../../common/Game.h"
+#include "../../common/GameSummary.h"
 
 #include "Window.h"
@@ -54 +55 @@
 void initWinSock();
 void shutdownWinSock();
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player*>& mapPlayers, map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed);
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player*>& mapPlayers,
+                    map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed,
+                    GameSummary* gameSummary);
 int getRefreshRate(int width, int height);
 void drawMessageStatus(ALLEGRO_FONT* font);
@@ -70 +73 @@
 void createGame();
 void leaveGame();
+void closeGameSummary();
 
 void error(const char *);
@@ -94 +98 @@
 Window* wndNewGame;
 Window* wndGameDebug;
+Window* wndGameSummary;
 Window* wndCurrent;
 
@@ -123 +128 @@
 map<string, int> mapGames;
 Game* game;
+GameSummary* gameSummary;
 
 MessageProcessor msgProcessor;
@@ -143 +149 @@
    bool fullscreen = false;
    game = NULL;
+   gameSummary = NULL;
 
    scoreBlue = 0;
@@ -288 +295 @@
 
    cout << "Created new game screen" << endl;
+
+   wndGameSummary = new Window(0, 0, SCREEN_W, SCREEN_H);
+   wndGameSummary->addComponent(new Button(840, 730, 160, 20, font, "Back to Lobby", closeGameSummary));
+
+   cout << "Created game summary screen" << endl;
 
    goToLoginScreen();
@@ -388 +400 @@
       }
       else if(ev.type == ALLEGRO_EVENT_MOUSE_BUTTON_UP) {
-         if(wndCurrent == wndLobby) {
-            /*
-            if (ev.mouse.button == 1) { // left click
-               txtJoinGame->clear();
-               txtCreateGame->clear();
-               state = STATE_GAME;
-               wndCurrent = wndGame;
-            }
-            */
-         }else if(wndCurrent == wndGame || wndCurrent == wndNewGame) {
+         if(wndCurrent == wndGame || wndCurrent == wndNewGame) {
             if (ev.mouse.button == 1) {   // left click
                msgTo.type = MSG_TYPE_PLAYER_MOVE;
@@ -455 +458 @@
 
       if (msgProcessor.receiveMessage(&msgFrom, sock, &from, &outputLog) >= 0)
-         processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, mapProjectiles, curPlayerId, scoreBlue, scoreRed);
+         processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, mapProjectiles, curPlayerId, scoreBlue, scoreRed, gameSummary);
 
       if (redraw)
@@ -602 +605 @@
                al_draw_line(start.x, start.y, end.x, end.y, al_map_rgb(0, 0, 0), 4);
             }
+         }else if (wndCurrent == wndGameSummary) {
+            string strBlueScore = "Blue Score: "+gameSummary->getBlueScore();
+            string strRedScore = "Red Score: "+gameSummary->getRedScore();
+
+            string strWinner;
+
+            if (gameSummary->getWinner() == 0)
+                strWinner = "Blue Team Wins";
+            else if (gameSummary->getWinner() == 1)
+                strWinner = "Red Team Wins";
+
+            al_draw_text(font, al_map_rgb(0, 255, 0), 512, 40, ALLEGRO_ALIGN_CENTRE, gameSummary->getName().c_str());
+            al_draw_text(font, al_map_rgb(0, 255, 0), 330, 80, ALLEGRO_ALIGN_LEFT, strBlueScore.c_str());
+            al_draw_text(font, al_map_rgb(0, 255, 0), 515, 80, ALLEGRO_ALIGN_LEFT, strRedScore.c_str());
+            al_draw_text(font, al_map_rgb(0, 255, 0), 512, 120, ALLEGRO_ALIGN_CENTRE, strWinner.c_str());
          }
 
@@ -632 +650 @@
       delete game;
 
+   if (gameSummary != NULL)
+      delete gameSummary;
+
    map<unsigned int, Player*>::iterator it;
 
@@ -683 +704 @@
 }
 
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player*>& mapPlayers, map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed)
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player*>& mapPlayers,
+                    map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed,
+                    GameSummary* gameSummary)
 {
    // this is outdated since most messages now don't contain just a text string
@@ -986 +1009 @@
                break;
             }
+            case MSG_TYPE_SCORE:
+            {
+               cout << "Received SCORE message!" << endl;
+
+               int blueScore;
+               memcpy(&blueScore, msg.buffer, 4);
+               cout << "blue score: " << blueScore << endl;
+               game->setBlueScore(blueScore);
+
+               int redScore;
+               memcpy(&redScore, msg.buffer+4, 4);
+               cout << "red score: " << redScore << endl;
+               game->setRedScore(redScore);
+
+               cout << "Processed SCORE message!" << endl;
+ 
+               break;
+            }
+            case MSG_TYPE_FINISH_GAME:
+            {
+               cout << "Got a finish game message" << endl;
+               cout << "Should switch to STATE_LOBBY and show the final score" << endl;
+
+               string gameName(msg.buffer);
+
+               unsigned int winner, blueScore, redScore;
+               memcpy(&winner, msg.buffer+4, 4);
+               memcpy(&blueScore, msg.buffer+8, 4);
+               memcpy(&redScore, msg.buffer+12, 4);
+
+               gameSummary = new GameSummary(gameName, winner, blueScore, redScore);
+
+               delete game;
+               game = NULL;
+               state = STATE_LOBBY;
+               wndCurrent = wndGameSummary;
+
+               break;
+            }
             case MSG_TYPE_PLAYER:
             {
@@ -1069 +1131 @@
                   cout << "Did not remove the object" << endl;
 
-               break;
-            }
-            case MSG_TYPE_SCORE:
-            {
-               cout << "Received SCORE message!" << endl;
-
-               int blueScore;
-               memcpy(&blueScore, msg.buffer, 4);
-               cout << "blue score: " << blueScore << endl;
-               game->setBlueScore(blueScore);
-
-               int redScore;
-               memcpy(&redScore, msg.buffer+4, 4);
-               cout << "red score: " << redScore << endl;
-               game->setRedScore(redScore);
-
-               cout << "Processed SCORE message!" << endl;
- 
                break;
             }
@@ -1400 +1444 @@
    msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
 }
+
+void closeGameSummary()
+{
+    delete gameSummary;
+    wndCurrent = wndLobby;
+}