Mercurial > LightClone

diff LightClone/Source/GameScreen.h @ 74:40c0b5305de8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on removing ScreenManager
author koryspansel
date Tue, 18 Oct 2011 11:56:49 -0700
parents 0574e2cf8bac
children
line wrap: on
line diff
--- a/LightClone/Source/GameScreen.h	Tue Oct 11 17:44:10 2011 -0700
+++ b/LightClone/Source/GameScreen.h	Tue Oct 18 11:56:49 2011 -0700
@@ -6,7 +6,6 @@
 #define __GAMESCREEN_H__
 
 #include "Core.h"
-#include "Screen.h"
 #include "CameraController.h"
 #include "GuiInterface.h"
 #include "GuiImage.h"
@@ -20,7 +19,7 @@
 /*
  * GameScreen
  */
-class GameScreen : public Screen
+class GameScreen
 {
 	/*
 	 * pInputManager
@@ -53,9 +52,9 @@
 	Program kProgram;
 
 	/*
-	 * nLogicState
+	 * nGameState
 	 */
-	uint32 nLogicState;
+	uint32 nGameState;
 
 	/*
 	 * nSimulationState