Mercurial > LightClone
changeset 16:88f7c22e7b45
Get project in a building state again
| author | koryspansel <koryspansel@bendbroadband.com> |
|---|---|
| date | Wed, 14 Sep 2011 12:40:50 -0700 |
| parents | ee1c2510096d |
| children | 4951acfe92fc |
| files | LightClone/Source/Interface.cpp LightClone/Source/Interface.h LightClone/Source/World.cpp |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/LightClone/Source/Interface.cpp Wed Sep 14 11:04:18 2011 -0700 +++ b/LightClone/Source/Interface.cpp Wed Sep 14 12:40:50 2011 -0700 @@ -61,7 +61,7 @@ * Initialize */ //ErrorCode Interface::Initialize(EventSystem* pSystem, ResourceManager* pManager) -ErrorCode Interface::Initialize(InputManager* pInput, ResourceManager* pManager); +ErrorCode Interface::Initialize(InputManager* pInput, ResourceManager* pManager) { ErrorCode eCode = pManager->CreateEffectFromFile("Data\\Shaders\\TexturedQuad.fx", &pEffect); if(eCode != Error_Success)
--- a/LightClone/Source/Interface.h Wed Sep 14 11:04:18 2011 -0700 +++ b/LightClone/Source/Interface.h Wed Sep 14 12:40:50 2011 -0700 @@ -10,6 +10,7 @@ #include "ResourceManager.h" #include "GuiContainer.h" #include "EventSystem.h" +#include "InputManager.h" /* * Interface
--- a/LightClone/Source/World.cpp Wed Sep 14 11:04:18 2011 -0700 +++ b/LightClone/Source/World.cpp Wed Sep 14 12:40:50 2011 -0700 @@ -274,7 +274,7 @@ */ ErrorCode World::InitializeInterface(ResourceManager* pResourceManager) { - return kInterface.Initialize(pEventSystem, pResourceManager); + return kInterface.Initialize(pInputManager, pResourceManager); /* GuiElement* pRoot = kInterface.GetRoot();