--- a/LightClone/Source/GameScreen.cpp	Tue Oct 11 17:44:10 2011 -0700
+++ b/LightClone/Source/GameScreen.cpp	Tue Oct 18 11:56:49 2011 -0700
@@ -3,7 +3,6 @@
  */
 
 #include "GameScreen.h"
-#include "ScreenManager.h"
 
 /*
  * Initialize
@@ -55,7 +54,7 @@
 		return eCode;
 	}
 
-	nLogicState			= LogicState_LevelLoad;
+	nGameState			= GameState_Load;
 	nSimulationState	= SimulationState_Idle;
 	nCurrentLevel		= 0;
 
@@ -71,8 +70,6 @@
 	kProgram.Terminate();
 	kBot.Terminate();
 	kEnvironment.Terminate();
-
-	Screen::Terminate();
 }
 
 /*
@@ -101,7 +98,7 @@
  */
 void GameScreen::Render(RenderContext& kContext)
 {
-	if(nLogicState != LogicState_LevelLoad)
+	if(nGameState != GameState_Load)
 	{
 		D3DVIEWPORT9 kOriginal;
 		kContext.GetViewport(&kOriginal);
@@ -413,7 +410,7 @@
 			if(nCount > 0)
 			{
 				nCurrentLevel	= 0;
-				nLogicState		= LogicState_LevelLoad;
+				nGameState		= GameState_Load;
 
 				for(uint32 i = 0; i < nCount; ++i)
 				{
@@ -440,7 +437,7 @@
  */
 void GameScreen::UpdateLogic(float fElapsed)
 {
-	if(nLogicState == LogicState_LevelLoad)
+	if(nGameState == GameState_Load)
 	{
 		char kBuffer[256];
 		sprintf(kBuffer, "Data\\Maps\\Map%02d.map", nCurrentLevel++);
@@ -455,18 +452,18 @@
 				pCode[i]->Clear();
 			}
 
-			nLogicState = LogicState_GameActive;
+			nGameState = GameState_Active;
 		}
 		else
 		{
-			pScreenManager->Push("GameOver");
+			//pScreenManager->Push("GameOver");
 		}
 
 		nSimulationState = SimulationState_Idle;
 	}
 	else
 
-	if(nLogicState == LogicState_GameActive)
+	if(nGameState == GameState_Active)
 	{
 		if(nSimulationState == SimulationState_Active)
 		{
@@ -474,8 +471,8 @@
 			{
 				if(kEnvironment.RequirementsMet())
 				{
-					nLogicState = LogicState_LevelLoad;
-					pScreenManager->Push("LevelOver");
+					nGameState = GameState_Load;
+					//pScreenManager->Push("LevelOver");
 				}
 			}
 		}
@@ -551,5 +548,5 @@
  */
 void GameScreen::OnExit(GuiEventArguments& kArguments)
 {
-	pScreenManager->Push("Confirm");
+	//pScreenManager->Push("Confirm");
 }