Changeset d519032 in network-game

Timestamp:

Sep 27, 2013, 6:20:43 PM (11 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

233e736

Parents:

88258c9

Message:

Reorganized the client-side game creation logic

File:

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

client/Client/main.cpp

@@ -549 +549 @@
 
    delete gameMap;
-   delete game;
+
+   if (game != NULL)
+      delete game;
 
    al_destroy_event_queue(event_queue);
@@ -654 +656 @@
       }
       case STATE_LOBBY:
+         cout << "In STATE_LOBBY" << endl;
       case STATE_GAME:
       {
@@ -743 +746 @@
             case MSG_TYPE_OBJECT:
             {
-               cout << "Received object message in STATE_LOBBY." << endl;
+               cout << "Received OBJECT message" << endl;
 
                WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
@@ -845 +848 @@
                break;
             }
+            case MSG_TYPE_JOIN_GAME_SUCCESS:
+            {
+               cout << "Received a JOIN_GAME_SUCCESS message" << endl;
+
+               string gameName(msg.buffer);
+               
+               cout << "Game name: " << gameName << endl;
+               
+               game = new Game(gameName);
+
+               state = STATE_NEW_GAME;
+
+               msgTo.type = MSG_TYPE_JOIN_GAME_ACK;
+               strcpy(msgTo.buffer, gameName.c_str());
+
+               msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+
+               break;
+            }
+            case MSG_TYPE_JOIN_GAME_FAILURE:
+            {
+               cout << "Received a JOIN_GAME_FAILURE message" << endl;
+
+               break;
+            }
             default:
             {
@@ -857 +885 @@
       case STATE_NEW_GAME:
       {
+         cout << "(STATE_NEW_GAME) ";
          switch(msg.type)
          {
             case MSG_TYPE_GAME_INFO:
             {
-               cout << "(STATE_NEW_GAME) Received a GAME_INFO message" << endl;
+               cout << "Received a GAME_INFO message" << endl;
 
                string gameName(msg.buffer+4);
                int numPlayers;
-
-               //game = new Game(gameName);
 
                memcpy(&numPlayers, msg.buffer, 4);
@@ -878 +905 @@
             case MSG_TYPE_OBJECT:
             {
-               cout << "(STATE_NEW_GAME) Received object message in STATE_LOBBY." << endl;
+               cout << "Received object message in STATE_NEW_GAME" << endl;
 
                WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
@@ -889 +916 @@
             case MSG_TYPE_REMOVE_OBJECT:
             {
-               cout << "(STATE_NEW_GAME) Received REMOVE_OBJECT message!" << endl;
+               cout << "Received REMOVE_OBJECT message!" << endl;
 
                int id;
@@ -921 +948 @@
             default:
             {
-               cout << "(STATE_NEW_GAME) Received invalid message of type " << msg.type << endl;
+               cout << "Received invalid message of type " << msg.type << endl;
 
                break;
@@ -1260 +1287 @@
    cout << "Creating game" << endl;
 
-   // hack to help transitions to multiple games
-   state = STATE_NEW_GAME;
-   game = new Game( txtCreateGame->getStr());
-
    string msg = txtCreateGame->getStr();
    txtCreateGame->clear();
 
+   cout << "Sending message: " << msg.c_str() << endl;
+
    msgTo.type = MSG_TYPE_CREATE_GAME;
    strcpy(msgTo.buffer, msg.c_str());