Changes in common/Player.cpp [60017fc:5806dc2] in network-game

File:

• common/Player.cpp (modified) (6 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->pos.x = 0;
+   this->pos.y = 0;
 }
 
@@ -24 +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;
 }
@@ -34 +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;
 }
 
@@ -43 +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;
 }
@@ -82 +79 @@
    this->addr = addr;
 }
-
-void Player::move(void) {
-   // timeLastMoved
-   // pos
-   // target
-   int speed = 100; // pixels per second
-
-   timespec curTS, diffTS;
-   clock_gettime(CLOCK_REALTIME, &curTS);
-
-   // get time elapsed
-   diffTS.tv_sec = curTS.tv_sec - timeLastUpdated.tv_sec;
-   diffTS.tv_nsec = curTS.tv_nsec - timeLastUpdated.tv_nsec;
-   if (diffTS.tv_nsec < 0) {
-      diffTS.tv_sec -= 1;
-      diffTS.tv_nsec += 1000000000;
-   }
-
-   cout << "elapsed secs: " << diffTS.tv_sec << endl;
-   cout << "elapsed nsecs: " << diffTS.tv_nsec << endl;
-
-   // here we move 100 pixels per second
-   float pixels = 100 * (diffTS.tv_sec+diffTS.tv_nsec/1000000000.0);
-   cout << "We need to move " << pixels << "pixels" << endl;
-
-   double angle = atan2(target.y-pos.y, target.x-pos.x);
-
-   // we just need to check that we don't overjump the target
-   pos.x += cos(angle)*pixels;
-   pos.y += sin(angle)*pixels;
-
-   timeLastUpdated.tv_sec = curTS.tv_sec;
-   timeLastUpdated.tv_nsec = curTS.tv_nsec;
-}