Spliced in updates to the scene system; program compiles & runs, player's don't move

2013-06-04 20:20:56 +10:00
parent 783e8928d6
commit 231db701e4
19 changed files with 147 additions and 116 deletions
@@ -7,21 +7,21 @@ class Combat : public BaseScene {
 public:
 	/* Public access members */
 	Combat();
-	virtual ~Combat();
+	~Combat();

 protected:
 	/* Frame loop */
-	virtual void FrameStart();
-	virtual void FrameEnd();
-	virtual void Update();
-	virtual void Render(SDL_Surface* const);
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	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&);
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
 };

 #endif