draw overlay hover bar

draw border around overlay map

Changed from refptr<map<U8, Player> > to map<U8, refptr<player> >

minor bugfix - using more memory on sky than needed

Fixed some bugs with multiplayer

CCFS: print error when unable to find file by default

simplify GLProgram creation with stdarg

src/common/HexTile.cc

@@ -1,4 +1,3 @@
-
 #include <math.h>
 #include "HexTile.h"
 

src/common/HexTile.h

@@ -1,4 +1,3 @@
-
 #ifndef HEXTILE_H
 #define HEXTILE_H
 

src/common/Map.cc

@@ -1,4 +1,3 @@
-
 #include "Map.h"
 #include "HexTile.h"
 

src/common/Map.h

@@ -1,4 +1,3 @@
-
 #ifndef MAP_H
 #define MAP_H
 

src/common/Player.cc

@@ -1,4 +1,3 @@
-
 #include "Player.h"
 #include <math.h>
 
@@ -8,11 +7,11 @@ Player::Player()
     y = 0.0;
     direction = M_PI_2;
     hover = 1.0;
-	name =  "";
-	w_pressed = KEY_NOT_PRESSED;
-	a_pressed = KEY_NOT_PRESSED;
-	s_pressed = KEY_NOT_PRESSED;
-	d_pressed = KEY_NOT_PRESSED;
-	rel_mouse_movement = 0;	
-	updated = false;
+    name =  "";
+    w_pressed = KEY_NOT_PRESSED;
+    a_pressed = KEY_NOT_PRESSED;
+    s_pressed = KEY_NOT_PRESSED;
+    d_pressed = KEY_NOT_PRESSED;
+    rel_mouse_movement = 0;
+    updated = false;
 }

src/common/Player.h

@@ -1,4 +1,3 @@
-
 #ifndef PLAYER_H
 #define PLAYER_H
 
@@ -14,12 +13,12 @@ class Player
         double y;
         double direction; /* 0 = East, M_PI_2 = North, M_PI = West, ... */
         double hover;
-		sf::Uint8 w_pressed;
-		sf::Uint8 a_pressed;
-		sf::Uint8 s_pressed;
-		sf::Uint8 d_pressed;
-		sf::Int32 rel_mouse_movement;	
-		bool updated;
+        sf::Uint8 w_pressed;
+        sf::Uint8 a_pressed;
+        sf::Uint8 s_pressed;
+        sf::Uint8 d_pressed;
+        sf::Int32 rel_mouse_movement;
+        bool updated;
 
         Player();
 };

src/common/Timer.cc

@@ -23,7 +23,6 @@ void Timer::Update(void)
 {
     // Record the time step
     stepTime = ((myClock.getElapsedTime().asSeconds() / 1000.0f) * gameSpeed);
-    //stepTime = ((((sf::Window*)screen)->GetFrameTime() / 1000.0f) * gameSpeed);
     myClock.restart();
 
     // Add the time to the total time

src/common/Types.h

@@ -4,9 +4,9 @@
 #define KEY_PRESSED         0xA5u
 #define KEY_NOT_PRESSED     0x5Au
 
-#define PLAYER_CONNECT		0x1Au
-#define PLAYER_DISCONNECT	0x2Bu
-#define PLAYER_DEATH		0x3Cu
-#define PLAYER_UPDATE		0x4Du
+#define PLAYER_CONNECT      0x1Au
+#define PLAYER_DISCONNECT   0x2Bu
+#define PLAYER_DEATH        0x3Cu
+#define PLAYER_UPDATE       0x4Du
 
 #endif

src/common/refptr.h

@@ -1,4 +1,3 @@
-
 #ifndef REFPTR_H
 #define REFPTR_H REFPTR_H