Changes in common/Player.cpp [8f85180:01d0d00] in network-game

File:

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

common/Player.cpp

@@ -4 +4 @@
 #include <sstream>
 #include <cstring>
-#include <cmath>
 
 using namespace std;
@@ -13 +12 @@
    this->name = "";
    this->password = "";
-   this->pos.x = this->target.x = 0;
-   this->pos.y = this->target.y = 0;
-   this->timeLastUpdated = 0;
+   this->pos.x = 0;
+   this->pos.y = 0;
 }
 
@@ -25 +23 @@
    this->pos.x = p.pos.x;
    this->pos.y = p.pos.y;
-   this->target.x = p.target.x;
-   this->target.y = p.target.y;
    this->addr = p.addr;
 }
@@ -35 +31 @@
    this->name = name;
    this->password = password;
-   this->pos.x = this->target.x = 200;
-   this->pos.y = this->target.y = 200;
+   this->pos.x = 200;
+   this->pos.y = 200;
 }
 
@@ -44 +40 @@
    this->name = name;
    this->password = "";
-   this->pos.x = this->target.x = 200;
-   this->pos.y = this->target.y = 200;
+   this->pos.x = 200;
+   this->pos.y = 200;
    this->addr = addr;
 }
@@ -55 +51 @@
 void Player::serialize(char* buffer)
 {
-   memcpy(buffer, &this->id, 4);
-   memcpy(buffer+4, &this->pos.x, 4);
-   memcpy(buffer+8, &this->pos.y, 4);
-   memcpy(buffer+12, &this->target.x, 4);
-   memcpy(buffer+16, &this->target.y, 4);
-   strcpy(buffer+20, this->name.c_str());
+   ostringstream oss;
+
+   oss.write((char*)&(this->id), sizeof(int));
+   oss << this->name;
+   oss.write("\0", 1);
+   oss.write((char*)&(this->pos.x), sizeof(int));
+   oss.write((char*)&(this->pos.y), sizeof(int));
+
+   memcpy(buffer, oss.str().c_str(), this->name.length()+1+2*sizeof(int));
 }
 
 void Player::deserialize(char* buffer)
 {
-   memcpy(&this->id, buffer, 4);
-   memcpy(&this->pos.x, buffer+4, 4);
-   memcpy(&this->pos.y, buffer+8, 4);
-   memcpy(&this->target.x, buffer+12, 4);
-   memcpy(&this->target.y, buffer+16, 4);
-   this->name.assign(buffer+20);
+   istringstream iss;
+   iss.str(buffer);
 
-   cout << "id: " << this->id << endl;
-   cout << "pos x: " << this->pos.x << endl;
-   cout << "pos y: " << this->pos.y << endl;
-   cout << "target x: " << this->target.x << endl;
-   cout << "target y: " << this->target.y << endl;
-   cout << "name: " << this->name << endl;
+   iss.read((char*)&(this->id), sizeof(int));
+   iss >> this->name;
+   iss.read((char*)&(this->pos.x), sizeof(int));
+   iss.read((char*)&(this->pos.y), sizeof(int));
 }
 
@@ -89 +82 @@
    this->addr = addr;
 }
-
-void Player::move(void) {
-   int speed = 100; // pixels per second
-   unsigned long long curTime = getCurrentMillis();
-
-   // if we're at our target, don't move
-   if (pos.x == target.x && pos.y == target.y)
-      cout << "We're already at our target" << endl;
-   else {
-      float pixels = speed * (curTime-timeLastUpdated) / 1000.0;
-      cout << "We need to move " << pixels << " pixels" << endl;
-
-      double angle = atan2(target.y-pos.y, target.x-pos.x);
-
-      float dist = sqrt(pow(target.x-pos.x, 2) + pow(target.y-pos.y, 2));
-      if (dist <= pixels) {
-         pos.x = target.x;
-         pos.y = target.y;
-      }else {
-         pos.x += cos(angle)*pixels;
-         pos.y += sin(angle)*pixels;
-      }
-   }
-
-   timeLastUpdated = curTime;
-}