Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts: Escape-the-Dawn/GameWorld.cpp Escape-the-Dawn/GameWorld.h
2014-03-13 01:45:27 +01:00
parent 2beaa22758 21b2e3bdc1
commit 5ae8a15bcf
15 changed files with 365 additions and 190 deletions
@@ -42,7 +42,8 @@ public:

 private:
 	std::shared_ptr<Renderer> m_Renderer;
-	EntityID entcamera, player1, player2;
+	EntityID entcamera, player2;
+	EntityID m_Player;
 };

 #endif // GameWorld_h__