Changeset 9ba9b96 in network-game for common/WorldMap.cpp

Timestamp:

Jan 20, 2014, 4:59:34 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

949cf70

Parents:

d998572

Message:

All ids should now be unsigned ints

File:

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

common/WorldMap.cpp

@@ -102 +102 @@
 // used by the server to create new objects
 void WorldMap::addObject(WorldMap::ObjectType t, int x, int y) {
-   int id;
+   unsigned int id;
    vector<WorldMap::Object>::iterator it;
 
@@ -111 +111 @@
       }
 
-      if (it == vctObjects->end())  // if no objects with this id exists
+      if (it == vctObjects->end())  // if no objects with this id exist
          break;
    }
@@ -120 +120 @@
 
 // used by the client to update object positions or create objects it has not seen before
-void WorldMap::updateObject(int id, WorldMap::ObjectType t, int x, int y) {
+void WorldMap::updateObject(unsigned int id, WorldMap::ObjectType t, int x, int y) {
    vector<WorldMap::Object>::iterator it;
    bool foundObject = false;
@@ -157 +157 @@
 }
 
-bool WorldMap::removeObject(int id) {
+bool WorldMap::removeObject(unsigned int id) {
    vector<WorldMap::Object>::iterator it;
 
@@ -316 +316 @@
 /*** Functions for Object ***/
 
-WorldMap::Object::Object(int id, ObjectType type, int x, int y) {
+WorldMap::Object::Object(unsigned int id, ObjectType type, int x, int y) {
    this->type = type;
    this->id = id;
@@ -323 +323 @@
 }
 
-WorldMap::Object::Object(int id, ObjectType type, POSITION pos) {
+WorldMap::Object::Object(unsigned int id, ObjectType type, POSITION pos) {
    this->type = type;
    this->id = id;