Changeset 0678d60 in network-game

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

Files:

• common/Game.cpp (modified) (5 diffs)
• common/MessageProcessor.cpp (modified) (1 diff)
• common/Player.cpp (modified) (1 diff)
• common/WorldMap.cpp (modified) (4 diffs)
• common/WorldMap.h (modified) (1 diff)
• server/DataAccess.cpp (modified) (1 diff)
• server/server.cpp (modified) (1 diff)

common/Game.cpp

@@ -162 +162 @@
    vector<WorldMap::Object>* vctObjects = this->worldMap->getObjects();
    vector<WorldMap::Object>::iterator it;
-   int playerId = -1;
+   int itemId = -1;
 
    for (it = vctObjects->begin(); it != vctObjects->end(); it++) {
@@ -170 +170 @@
                if (p->team == 1) {
                   p->hasBlueFlag = true;
-                  playerId = it->id;
+                  itemId = it->id;
                }
                break;
@@ -176 +176 @@
                if (p->team == 0) {
                   p->hasRedFlag = true;
-                  playerId = it->id;
+                  itemId = it->id;
                }
                break;
-         }
-
-         if (playerId > -1) {
+            case WorldMap::OBJECT_NONE:
+               break;
+         }
+
+         if (itemId > -1) {
             vctObjects->erase(it);
-            return playerId;
-         }
-      }
-   }
-
-   return playerId;
+            return itemId;
+         }
+      }
+   }
+
+   return itemId;
 }
 
@@ -214 +216 @@
 
 bool Game::handleGameEvents() {
-   NETWORK_MSG serverMsg;
    map<unsigned int, Player*>::iterator it;
    bool gameFinished = false;
@@ -325 +326 @@
             }
 
+            break;
+         }
+         default:
+         {
             break;
          }

common/MessageProcessor.cpp

@@ -42 +42 @@
    if (ret < 0)
       error("sendMessage");
-   else
-      return ret;
+
+   return ret;
 }
 

common/Player.cpp

@@ -150 +150 @@
          cout << "No class" << endl;
          break;
-      dafault:
-         cout << "nvalid class" << endl;
-         break;
    }
 }

common/WorldMap.cpp

@@ -45 +45 @@
 }
 
+void WorldMap::createObjectsFromStructures() {
+   for (int y=0; y<this->height; y++) {
+      for (int x=0; x<this->width; x++) {
+         switch (this->getStructure(x, y)) {
+            case WorldMap::STRUCTURE_BLUE_FLAG:
+               this->addObject(WorldMap::OBJECT_BLUE_FLAG, x*25+12, y*25+12);
+               break;
+            case WorldMap::STRUCTURE_RED_FLAG:
+               this->addObject(WorldMap::OBJECT_RED_FLAG, x*25+12, y*25+12);
+               break;
+            case WorldMap::STRUCTURE_NONE:
+               break;
+         }
+      }
+   }
+}
+
 WorldMap::TerrainType WorldMap::getElement(int x, int y)
 {
@@ -71 +88 @@
    pos.y = 0;
 
-   for (int x=0; x<vctStructures->size(); x++) {
-      for (int y=0; y<(*vctStructures)[x]->size(); y++) {
+   for (unsigned int x=0; x<vctStructures->size(); x++) {
+      for (unsigned int y=0; y<(*vctStructures)[x]->size(); y++) {
         if ((*(*vctStructures)[x])[y] == t) {
            pos.x = x;
@@ -131 +148 @@
    case WorldMap::OBJECT_RED_FLAG:
       cout << "RED_FLAG" << endl;
+      break;
+   case WorldMap::OBJECT_NONE:
+      cout << "OBJECY_NONE" << endl;
       break;
    }
@@ -145 +165 @@
             cout << "RED_FLAG" << endl;
             break;
+         case WorldMap::OBJECT_NONE:
+            cout << "OBJECY_NONE" << endl;
+            break;
          }
          it->pos.x = x;

common/WorldMap.h

@@ -54 +54 @@
    ~WorldMap();
 
+   void createObjectsFromStructures();
+
    TerrainType getElement(int x, int y);
    void setElement(int x, int y, TerrainType type);

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;