Mercurial > LightClone

diff LightClone/Source/World.h @ 14:7081e8e6008c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Working on integrating the EventSystem
author koryspansel
date Tue, 13 Sep 2011 23:01:45 -0700
parents 292e534f00c2
children 4951acfe92fc
line wrap: on
line diff
--- a/LightClone/Source/World.h	Tue Sep 13 19:44:23 2011 -0700
+++ b/LightClone/Source/World.h	Tue Sep 13 23:01:45 2011 -0700
@@ -6,6 +6,8 @@
 #define __WORLD_H__
 
 #include "Core.h"
+#include "ResourceManager.h"
+#include "EventSystem.h"
 #include "RenderContext.h"
 #include "Environment.h"
 #include "Bot.h"
@@ -13,7 +15,6 @@
 #include "Loader.h"
 #include "CameraController.h"
 #include "DragController.h"
-#include "ResourceManager.h"
 #include "InputManager.h"
 #include "ButtonPane.h"
 #include "Dialog.h"
@@ -25,6 +26,11 @@
 class World
 {
 	/*
+	 * pEventSystem
+	 */
+	EventSystem* pEventSystem;
+
+	/*
 	 * pInputManager
 	 */
 	InputManager* pInputManager;
@@ -135,7 +141,7 @@
 	/*
 	 * Initialize
 	 */
-	ErrorCode Initialize(ResourceManager* pResource, InputManager* pInput);
+	ErrorCode Initialize(EventSystem* pSystem, ResourceManager* pResource, InputManager* pInput);
 
 	/*
 	 * Terminate