Changeset f66d04f in network-game for client/Client/main.cpp

Timestamp:

Jan 24, 2014, 12:37:10 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

99cf349

Parents:

7f884ea

Message:

Client update for map structs refactoring

File:

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

client/Client/main.cpp

@@ -377 +377 @@
 
                   if (p != NULL) {
-                     int flagType = WorldMap::OBJECT_NONE;
+                     int flagType = OBJECT_NONE;
 
                      if (p->hasBlueFlag)
-                        flagType = WorldMap::OBJECT_BLUE_FLAG;
+                        flagType = OBJECT_BLUE_FLAG;
                      else if (p->hasRedFlag)
-                        flagType = WorldMap::OBJECT_RED_FLAG;
-
-                     if (flagType != WorldMap::OBJECT_NONE) {
+                        flagType = OBJECT_RED_FLAG;
+
+                     if (flagType != OBJECT_NONE) {
                         msgTo.type = MSG_TYPE_DROP_FLAG;
                         memcpy(msgTo.buffer, &curPlayerId, 4);
@@ -1029 +1029 @@
                cout << "Received object message in STATE_GAME" << endl;
 
-               WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
+               WorldMap::Object o(0, OBJECT_NONE, 0, 0);
                o.deserialize(msg.buffer);
                cout << "object id: " << o.id << endl;