merging various commits and stashes

2013-05-01 21:30:02 +10:00
parent fe04561b26
commit 80004ca8d4
7 changed files with 66 additions and 3 deletions
@@ -31,7 +31,7 @@ InGame::~InGame() {
 //-------------------------

 void InGame::FrameStart() {
-	//
+	frameRate.Calculate();
 }

 void InGame::FrameEnd() {
@@ -100,3 +100,11 @@ void InGame::KeyUp(SDL_KeyboardEvent const& key) {
 		break;
 	}
 }
+
+//-------------------------
+//Utilities
+//-------------------------
+
+void InGame::NewPlayer(int index, std::string avatarName, int x, int y) {
+	//
+}