Changeset 0678d60 in network-game for common/WorldMap.cpp

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

File:

• common/WorldMap.cpp (modified) (4 diffs)

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;