Changeset 9ba9b96 in network-game

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

Files:

• common/Player.cpp (modified) (1 diff)
• common/Player.h (modified) (3 diffs)
• common/Projectile.cpp (modified) (1 diff)
• common/Projectile.h (modified) (2 diffs)
• common/WorldMap.cpp (modified) (6 diffs)
• common/WorldMap.h (modified) (2 diffs)
• server/server.cpp (modified) (6 diffs)

common/Player.cpp

@@ -100 +100 @@
 }
 
-void Player::setId(int id)
+void Player::setId(unsigned int id)
 {
    this->id = id;

common/Player.h

@@ -41 +41 @@
    ~Player();
 
-   void setId(int id);
+   void setId(unsigned int id);
    void setAddr(sockaddr_in addr);
    void setClass(PlayerClass c);
@@ -52 +52 @@
    void takeDamage(int damage);
 
-   void takeFlag(int flag, WorldMap* map);
-   void dropFlag(int flag, WorldMap* map);
+   void takeFlag(unsigned int flag, WorldMap* map);
+   void dropFlag(unsigned int flag, WorldMap* map);
 
-   int id;
+   unsigned int id;
    string name;
    string password;
@@ -66 +66 @@
    bool isChasing;
    bool isAttacking;
-   int targetPlayer;
+   unsigned int targetPlayer;
    bool isDead;
 

common/Projectile.cpp

@@ -45 +45 @@
 }
 
-void Projectile::setId(int id)
+void Projectile::setId(unsigned int id)
 {
    this->id = id;

common/Projectile.h

@@ -13 +13 @@
 class Projectile {
 public:
+   unsigned int id;
+   POSITION pos;
+   unsigned int target;
+   int speed;
+   int damage;
+   unsigned long long timeLastUpdated;
 
    Projectile();
@@ -20 +26 @@
    ~Projectile();
 
-   void setId(int id);
+   void setId(unsigned int id);
 
    void serialize(char* buffer);
    void deserialize(char* buffer);
 
-   // returns true if it reached the target and should be deleted
+   // returns true if the projectile reached the target and should be deleted
    bool move(map<unsigned int, Player*>& mapPlayers);
-
-   /*
-    * target should become a Player*. When this object gets serialized, the player's id should be sent.
-    * Deserialization in this case might be tricky since it will require a playerMap to turn the id into a Plauyer*
-    */
-
-   int id;
-   POSITION pos;
-   int target;
-   int speed;
-   int damage;
-   unsigned long long timeLastUpdated;
 };
 

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;

common/WorldMap.h

@@ -32 +32 @@
    class Object {
    public:
-      int id;
+      unsigned int id;
       ObjectType type;
       POSITION pos;
 
-      Object(int id, ObjectType type, int x, int y);
-      Object(int id, ObjectType type, POSITION pos);
+      Object(unsigned int id, ObjectType type, int x, int y);
+      Object(unsigned int id, ObjectType type, POSITION pos);
 
       ~Object();
@@ -65 +65 @@
 
    void addObject(ObjectType type, int x, int y);
-   void updateObject(int id, WorldMap::ObjectType t, int x, int y);
-   bool removeObject(int id);
+   void updateObject(unsigned int id, WorldMap::ObjectType t, int x, int y);
+   bool removeObject(unsigned int id);
 
    static WorldMap* createDefaultMap();

server/server.cpp

@@ -450 +450 @@
          cout << "PLAYER_MOVE" << endl;
 
-         int id, x, y;
+         unsigned int id;
+         int x, y;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -493 +494 @@
          cout << "PICKUP_FLAG" << endl;
 
-         int id;
+         unsigned int id;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -499 +500 @@
 
          Player* p = mapPlayers[id];
-         int objectId = p->currentGame->processFlagPickupRequest(p);
+         unsigned int objectId = p->currentGame->processFlagPickupRequest(p);
 
          if (objectId >= 0) {
@@ -520 +521 @@
          cout << "DROP_FLAG" << endl;
 
-         int id;
+         unsigned int id;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -550 +551 @@
          cout << "Received a START_ATTACK message" << endl;
 
-         int id, targetId;
+         unsigned int id, targetId;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -726 +727 @@
          serverMsg.type = MSG_TYPE_SCORE;
 
-         int blueScore = g->getBlueScore();
-         int redScore = g->getRedScore();
+         unsigned int blueScore = g->getBlueScore();
+         unsigned int redScore = g->getRedScore();
          memcpy(serverMsg.buffer, &blueScore, 4);
          memcpy(serverMsg.buffer+4, &redScore, 4);