Changeset 0678d60 in network-game for server

Timestamp:

Jan 22, 2014, 1:31:27 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

06fc7f7

Parents:

204edcf

Message:

All server warnings have been fixed and the WorldMap class has a new method to create flags (and, in the future, other objects) based on structures present on the map

Location:

server

Files:

• DataAccess.cpp (modified) (1 diff)
• server.cpp (modified) (1 diff)

server/DataAccess.cpp

@@ -177 +177 @@
 MYSQL_RES *DataAccess::select(string table, string filter)
 {
-   MYSQL_RES *result;
    int query_state;
    ostringstream oss;

server/server.cpp

@@ -589 +589 @@
             // add flag objects to the map
             WorldMap* m = g->getMap();
-            for (int y=0; y<m->height; y++) {
-               for (int x=0; x<m->width; x++) {
-                  switch (m->getStructure(x, y)) {
-                     case WorldMap::STRUCTURE_BLUE_FLAG:
-                        m->addObject(WorldMap::OBJECT_BLUE_FLAG, x*25+12, y*25+12);
-                        break;
-                     case WorldMap::STRUCTURE_RED_FLAG:
-                        m->addObject(WorldMap::OBJECT_RED_FLAG, x*25+12, y*25+12);
-                        break;
-                     case WorldMap::STRUCTURE_NONE:
-                        break;
-                  }
-               }
-            }
+            m->createObjectsFromStructures();
 
             serverMsg.type = MSG_TYPE_JOIN_GAME_SUCCESS;