Mercurial > LightClone

diff LightClone/Source/World.h @ 40:00d17d8f407d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hookup game over dialog; Remove Code class
author koryspansel
date Thu, 22 Sep 2011 10:21:14 -0700
parents d0ce73ced12e
children d27c06bd8ce1
line wrap: on
line diff
--- a/LightClone/Source/World.h	Thu Sep 22 09:01:42 2011 -0700
+++ b/LightClone/Source/World.h	Thu Sep 22 10:21:14 2011 -0700
@@ -11,7 +11,6 @@
 #include "RenderContext.h"
 #include "Environment.h"
 #include "Bot.h"
-#include "Code.h"
 #include "Loader.h"
 #include "CameraController.h"
 #include "InputManager.h"
@@ -63,6 +62,11 @@
 	uint32 nGameState;
 
 	/*
+	 * nGameStatePrevious
+	 */
+	uint32 nGameStatePrevious;
+
+	/*
 	 * nSimulationState
 	 */
 	uint32 nSimulationState;
@@ -128,29 +132,14 @@
 	CodePanel* pFunctionB;
 
 	/*
-	 * pLevelDialog
+	 * kMessageDialog
 	 */
-	//GuiImage* pLevelDialog;
-
-	/*
-	 * pLevelDialogOk
-	 */
-	//GuiButton* pLevelDialogOk;
+	Dialog<1> kMessageDialog;
 
 	/*
-	 * pGameDialog
-	 */
-	//GuiImage* pGameDialog;
-
-	/*
-	 * pGameDialogOk
+	 * kConfirmDialog
 	 */
-	//GuiButton* pGameDialogOk;
-
-	/*
-	 * kLevelDialog
-	 */
-	Dialog<1> kLevelDialog;	
+	Dialog<2> kConfigDialog;
 
 public:
 	
@@ -260,6 +249,11 @@
 	 * OnResult
 	 */
 	void OnResult(GuiEventArguments& kArguments);
+
+	/*
+	 * OnConfirm
+	 */
+	void OnConfirm(GuiEventArguments& kArguments);
 };
 
 #endif //__WORLD_H__