From a8b798ddffbfcbdd06d6ad92638ec3ec6341be68 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Tue, 4 Jun 2013 20:39:44 +1000
Subject: [PATCH] Players are moving and animating correctly

---
 client/player.cpp       | 2 +-
 client/test_systems.cpp | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/player.cpp b/client/player.cpp
index d499f85..7abc4a5 100644
--- a/client/player.cpp
+++ b/client/player.cpp
@@ -1,6 +1,6 @@
 #include "player.hpp"
 
-#define ANIMATION_SPEED 100
+#define ANIMATION_SPEED 0.1
 #define WALKING_SPEED 140
 
 Player::Player(SDL_Surface* s, int w, int h)
diff --git a/client/test_systems.cpp b/client/test_systems.cpp
index 96c8522..0ecef6e 100644
--- a/client/test_systems.cpp
+++ b/client/test_systems.cpp
@@ -44,8 +44,7 @@ void TestSystems::FrameStart() {
 }
 
 void TestSystems::Update(double delta) {
-//	Delta::Calculate();
-//	playerMgr.UpdateAll(Delta::GetTime());
+	playerMgr.UpdateAll(delta);
 }
 
 void TestSystems::FrameEnd() {
@@ -83,7 +82,7 @@ void TestSystems::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 void TestSystems::KeyDown(SDL_KeyboardEvent const& key) {
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
-			QuitEvent();
+			SetNextScene(SceneList::MAINMENU);
 		break;
 
 		case SDLK_w: