Removed singletons

client/in_game.hpp

@@ -3,9 +3,11 @@
 
 #include "base_scene.hpp"
 
+#include "player_manager.hpp"
+
 #include "delta.hpp"
 #include "frame_rate.hpp"
-#include "player_manager.hpp"
+#include "config_utility.hpp"
 #include "surface_manager.hpp"
 
 #include <string>
@@ -13,7 +15,7 @@
 class InGame : public BaseScene {
 public:
 	//Public access members
-	InGame();
+	InGame(ConfigUtility*, SurfaceManager*);
 	virtual ~InGame();
 
 protected:
@@ -24,21 +26,23 @@ protected:
 	virtual void Render(SDL_Surface* const);
 
 	//Event handlers
-	virtual void MouseMotion		(SDL_MouseMotionEvent const&);
-	virtual void MouseButtonDown	(SDL_MouseButtonEvent const&);
-	virtual void MouseButtonUp		(SDL_MouseButtonEvent const&);
-	virtual void KeyDown			(SDL_KeyboardEvent const&);
-	virtual void KeyUp				(SDL_KeyboardEvent const&);
+	virtual void MouseMotion(SDL_MouseMotionEvent const&);
+	virtual void MouseButtonDown(SDL_MouseButtonEvent const&);
+	virtual void MouseButtonUp(SDL_MouseButtonEvent const&);
+	virtual void KeyDown(SDL_KeyboardEvent const&);
+	virtual void KeyUp(SDL_KeyboardEvent const&);
 
 	//utilities
 	void NewPlayer(int index, std::string avatarName, int x, int y);
 	void SwitchToPlayer(int index);
 
 	//members
+	PlayerManager playerMgr;
+
 	Delta delta;
 	FrameRate frameRate;
-	SurfaceManager surfaceMgr;
-	PlayerManager playerMgr;
+	ConfigUtility* configUtil;
+	SurfaceManager* surfaceMgr;
 
 	int playerCounter;
 	int currentPlayer;