Changeset f401cac in network-game for common

Timestamp:

Feb 18, 2013, 7:41:52 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

66906aa

Parents:

093c141

Message:

Fixed some bugs in the player movement code

Location:

common

Files:

• Player.cpp (modified) (1 diff)
• WorldMap.cpp (modified) (2 diffs)
• WorldMap.h (modified) (1 diff)

common/Player.cpp

@@ -103 +103 @@
    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;
+   // 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 * (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);
+      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;
+      // 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;

common/WorldMap.cpp

@@ -5 +5 @@
 #include <fstream>
 #include <sstream>
+#include <cstdlib>
 
 using namespace std;
@@ -67 +68 @@
    WorldMap* m = new WorldMap(12l, 12);
 
-   ifstream file(filename);
+   ifstream file(filename.c_str());
 
    if (file.is_open())

common/WorldMap.h

@@ -1 +1 @@
 #ifndef _WORLDMAP_H
 #define _WORLDMAP_H
+
+#include <string>
 
 #include <vector>