Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision 093c141baf9734648d61a380eb59f797b189014a)
+++ common/Player.cpp	(revision 66906aaa163dcbbf63aa4105d695b9dece3e4602)
@@ -103,13 +103,17 @@
    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;
Index: common/WorldMap.cpp
===================================================================
--- common/WorldMap.cpp	(revision 093c141baf9734648d61a380eb59f797b189014a)
+++ common/WorldMap.cpp	(revision 66906aaa163dcbbf63aa4105d695b9dece3e4602)
@@ -5,4 +5,5 @@
 #include <fstream>
 #include <sstream>
+#include <cstdlib>
 
 using namespace std;
@@ -67,5 +68,5 @@
    WorldMap* m = new WorldMap(12l, 12);
 
-   ifstream file(filename);
+   ifstream file(filename.c_str());
 
    if (file.is_open())
Index: common/WorldMap.h
===================================================================
--- common/WorldMap.h	(revision 093c141baf9734648d61a380eb59f797b189014a)
+++ common/WorldMap.h	(revision 66906aaa163dcbbf63aa4105d695b9dece3e4602)
@@ -1,4 +1,6 @@
 #ifndef _WORLDMAP_H
 #define _WORLDMAP_H
+
+#include <string>
 
 #include <vector>