Changeset 7f884ea in network-game for common/WorldMap.cpp

Timestamp:

Jan 24, 2014, 12:27:15 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

f66d04f

Parents:

e70b66b

Message:

Map-related structs are now outside of the WorldMap class

File:

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

common/WorldMap.cpp

@@ -49 +49 @@
       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);
+            case STRUCTURE_BLUE_FLAG:
+               this->addObject(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);
+            case STRUCTURE_RED_FLAG:
+               this->addObject(OBJECT_RED_FLAG, x*25+12, y*25+12);
                break;
-            case WorldMap::STRUCTURE_NONE:
+            case STRUCTURE_NONE:
                break;
          }
@@ -62 +62 @@
 }
 
-WorldMap::TerrainType WorldMap::getElement(int x, int y)
+TerrainType WorldMap::getElement(int x, int y)
 {
    return (*(*vctMap)[x])[y];
@@ -72 +72 @@
 }
 
-WorldMap::StructureType WorldMap::getStructure(int x, int y)
+StructureType WorldMap::getStructure(int x, int y)
 {
    return (*(*vctStructures)[x])[y];
@@ -118 +118 @@
 
 // used by the server to create new objects
-void WorldMap::addObject(WorldMap::ObjectType t, int x, int y) {
+void WorldMap::addObject(ObjectType t, int x, int y) {
    unsigned int id;
    vector<WorldMap::Object>::iterator it;
@@ -137 +137 @@
 
 // used by the client to update object positions or create objects it has not seen before
-void WorldMap::updateObject(unsigned int id, WorldMap::ObjectType t, int x, int y) {
+void WorldMap::updateObject(unsigned int id, ObjectType t, int x, int y) {
    vector<WorldMap::Object>::iterator it;
    bool foundObject = false;
@@ -143 +143 @@
    cout << "Searching for object to update" << endl;
    switch (t) {
-   case WorldMap::OBJECT_BLUE_FLAG:
+   case OBJECT_BLUE_FLAG:
       cout << "BLUE_FLAG" << endl;
       break;
-   case WorldMap::OBJECT_RED_FLAG:
+   case OBJECT_RED_FLAG:
       cout << "RED_FLAG" << endl;
       break;
-   case WorldMap::OBJECT_NONE:
+   case OBJECT_NONE:
       cout << "OBJECY_NONE" << endl;
       break;
@@ -159 +159 @@
          cout << "Found object with id " << id << endl;
          switch (it->type) {
-         case WorldMap::OBJECT_BLUE_FLAG:
+         case OBJECT_BLUE_FLAG:
             cout << "BLUE_FLAG" << endl;
             break;
-         case WorldMap::OBJECT_RED_FLAG:
+         case OBJECT_RED_FLAG:
             cout << "RED_FLAG" << endl;
             break;
-         case WorldMap::OBJECT_NONE:
+         case OBJECT_NONE:
             cout << "OBJECY_NONE" << endl;
             break;