Changeset 03ba5e3 in network-game

Timestamp:

Sep 27, 2013, 7:31:17 PM (11 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

ab8fd40

Parents:

a6fe73d

Message:

Added a NEW_GAME screen with a button to leave the game and return to the lobby

File:

• client/Client/main.cpp (modified) (7 diffs)

client/Client/main.cpp

@@ -70 +70 @@
 void joinGame();
 void createGame();
+void leaveGame();
 
 void error(const char *);
@@ -92 +93 @@
 Window* wndLobby;
 Window* wndGame;
+Window* wndNewGame;
 Window* wndGameDebug;
 Window* wndCurrent;
@@ -280 +282 @@
    cout << "Created game screen" << endl;
 
+   wndNewGame = new Window(0, 0, SCREEN_W, SCREEN_H);
+   wndNewGame->addComponent(new Button(880, 10, 120, 20, font, "Leave Game", leaveGame));
+
+   cout << "Created new game screen" << endl;
+
    goToLoginScreen();
  
@@ -467 +474 @@
             }
          }
+         else if (wndCurrent == wndNewGame)
+         {
+            ostringstream ossScoreBlue, ossScoreRed;
+
+            ossScoreBlue << "Blue: " << game->getBlueScore() << endl;
+            ossScoreRed << "Red: " << game->getRedScore() << endl;
+
+            al_draw_text(font, al_map_rgb(0, 255, 0), 330, 80, ALLEGRO_ALIGN_LEFT, ossScoreBlue.str().c_str());
+            al_draw_text(font, al_map_rgb(0, 255, 0), 515, 80, ALLEGRO_ALIGN_LEFT, ossScoreRed.str().c_str());
+         }
          else if (wndCurrent == wndGame)
          {
@@ -852 +869 @@
                cout << "Received a JOIN_GAME_SUCCESS message" << endl;
 
-               string gameName(msg.buffer);
-               
+               string gameName(msg.buffer);         
+               game = new Game(gameName, "../../data/map.txt");
                cout << "Game name: " << gameName << endl;
-               
-               game = new Game(gameName, "../../data/map.txt");
-
-               /*
+
                state = STATE_NEW_GAME;
+               wndCurrent = wndNewGame;
 
                msgTo.type = MSG_TYPE_JOIN_GAME_ACK;
@@ -865 +880 @@
 
                msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
-               */
 
                break;
@@ -1299 +1313 @@
    msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
 }
+
+void leaveGame()
+{
+   cout << "Leaving game" << endl;
+
+   game = NULL;
+   
+   state = STATE_LOBBY;
+   wndCurrent = wndLobby;
+
+   msgTo.type = MSG_TYPE_LEAVE_GAME;
+
+   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+}