Changeset e0fd377 in network-game

Timestamp:

Dec 25, 2013, 3:23:09 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

df74597

Parents:

f3fb980

Message:

Removed global score variables from client, removed the old STATE_GAME, and renamed STATE_NEW_GAME to STATE_GAME

File:

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

client/Client/main.cpp

@@ -56 +56 @@
 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);
+                    map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId);
 int getRefreshRate(int width, int height);
 void drawMessageStatus(ALLEGRO_FONT* font);
@@ -81 +81 @@
    STATE_START,
    STATE_LOBBY,
-   STATE_GAME,
-   STATE_NEW_GAME
+   STATE_GAME
 };
 
@@ -140 +139 @@
    ofstream outputLog;
 
-   int scoreBlue, scoreRed;
-
    doexit = false;
    debugging = false;
@@ -148 +145 @@
    game = NULL;
    gameSummary = NULL;
-
-   scoreBlue = 0;
-   scoreRed = 0;
 
    state = STATE_START;
@@ -368 +362 @@
                break;
             case ALLEGRO_KEY_S:  // pickup an item next to you
-               if (state == STATE_GAME || state == STATE_NEW_GAME) {
+               if (state == STATE_GAME) {
                   msgTo.type = MSG_TYPE_PICKUP_FLAG;
                   memcpy(msgTo.buffer, &curPlayerId, 4);
@@ -375 +369 @@
                break;
             case ALLEGRO_KEY_D:  // drop the current item
-               if (state == STATE_GAME || state == STATE_NEW_GAME) {
+               if (state == STATE_GAME) {
                   Player* p = NULL;
                   try {
@@ -458 +452 @@
 
       if (msgProcessor.receiveMessage(&msgFrom, &from) >= 0)
-         processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, mapProjectiles, curPlayerId, scoreBlue, scoreRed);
+         processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, mapProjectiles, curPlayerId);
 
       if (redraw)
@@ -557 +551 @@
             ostringstream ossScoreBlue, ossScoreRed;
 
-            ossScoreBlue << "Blue: " << scoreBlue << endl;
-            ossScoreRed << "Red: " << scoreRed << endl;
+            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());
@@ -711 +705 @@
 
 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)
+                    map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId)
 {
    // this is outdated since most messages now don't contain just a text string
@@ -739 +733 @@
       }
       case STATE_LOBBY:
+      {
          cout << "In STATE_LOBBY" << endl;
-      case STATE_GAME:
-      {
          switch(msg.type)
          {
@@ -875 +868 @@
                break;
             }
-            case MSG_TYPE_SCORE:
-            {
-               memcpy(&scoreBlue, msg.buffer, 4);
-               memcpy(&scoreRed, msg.buffer+4, 4);
- 
-               break;
-            }
             case MSG_TYPE_ATTACK:
             {
@@ -965 +951 @@
                cout << "Game name: " << gameName << endl;
 
-               state = STATE_NEW_GAME;
+               state = STATE_GAME;
                wndCurrent = wndNewGame;
 
@@ -991 +977 @@
          break;
       }
-      case STATE_NEW_GAME:
+      case STATE_GAME:
       {
-         cout << "(STATE_NEW_GAME) ";
+         cout << "(STATE_GAME) ";
          switch(msg.type)
          {
@@ -1125 +1111 @@
             case MSG_TYPE_OBJECT:
             {
-               cout << "Received object message in STATE_NEW_GAME" << endl;
+               cout << "Received object message in STATE_GAME" << endl;
 
                WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
@@ -1381 +1367 @@
       txtCreateGame->clear();
       break;
-   case STATE_GAME:
-      txtChat->clear();
-      chatConsole.clear();
-      break;
    default:
       cout << "Logout called from invalid state: " << state << endl;