Changeset e487381 in network-game for common

Timestamp:

May 25, 2013, 6:04:08 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

7511a2b

Parents:

626e5b0

Message:

The server removes objects from its map when they are picked up by players and processes DROP_FLAG messages

Location:

common

Files:

• WorldMap.cpp (modified) (1 diff)
• WorldMap.h (modified) (1 diff)

common/WorldMap.cpp

@@ -65 +65 @@
 }
 
-vector<WorldMap::Object> WorldMap::getObjects() {
-   return *vctObjects;
+vector<WorldMap::Object>* WorldMap::getObjects() {
+   return vctObjects;
 }
 vector<WorldMap::Object> WorldMap::getObjects(int x, int y) {

common/WorldMap.h

@@ -61 +61 @@
    void setStructure(int x, int y, StructureType type);
 
-   vector<Object> getObjects();
+   vector<Object>* getObjects();
    vector<Object> getObjects(int x, int y);