From c478aeeb9b7b40bfd3415500b4886c0c0542bc26 Mon Sep 17 00:00:00 2001
From: Vegard Storheil Eriksen <zyp@jvnv.net>
Date: Sun, 23 May 2010 18:13:50 +0200
Subject: Added Stage-class.

---
 engine/application.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'engine/application.h')

diff --git a/engine/application.h b/engine/application.h
index 4bf9251..3f58f87 100644
--- a/engine/application.h
+++ b/engine/application.h
@@ -5,10 +5,11 @@
 #include <FTGL/ftgl.h>
 #include <vector>
 
+#include "stage.h"
+
 #include "bulletpattern.h"
 #include "shader.h"
 #include "texture.h"
-#include "player.h"
 
 class Application {
 	private:
@@ -17,20 +18,16 @@ class Application {
 		
 		bool paused;
 		unsigned int lasttick;
-		unsigned int elapsed;
 		unsigned int frames;
 		unsigned int lastframes;
 		float fps;
 		
 		FTFont* font;
 		Texture* background;
-		Texture* texture;
-		GLShaderProgram* shader;
-		Player *player;
 		
-		std::vector<BulletPattern*> patterns;
+	public:	
+		Stage* stage;
 		
-	public:
 		Application();
 		~Application();
 		void run();
@@ -39,7 +36,7 @@ class Application {
 	protected:
 		virtual void event_keypress(SDLKey key);
 		
-		void main_loop(unsigned int tick, unsigned int step);
+		void main_loop(unsigned int tick);
 };
 
 #endif
-- 
cgit v1.2.3