Changeset 6051 for code/branches/menu/src/libraries/core/GUIManager.cc

Timestamp:

Nov 12, 2009, 7:41:20 PM (14 years ago)

Author:

rgrieder

Message:

Fix for the resource group problem in the GUIManager. This should fix the lua require function (though I could not test it).

File:

• code/branches/menu/src/libraries/core/GUIManager.cc (modified) (2 diffs)

code/branches/menu/src/libraries/core/GUIManager.cc

@@ -121 +121 @@
         // setup scripting
         luaState_.reset(new LuaState());
+        rootFileInfo_ = Resource::getInfo("InitialiseGUI.lua", "GUI");
+        // This is necessary to ensure that input events also use the right resource info when triggering lua functions
+        luaState_->setDefaultResourceInfo(this->rootFileInfo_);
         scriptModule_.reset(new LuaScriptModule(luaState_->getInternalLuaState()));
 
@@ -135 +138 @@
 
         // Initialise the basic lua code
-        rootFileInfo_ = Resource::getInfo("InitialiseGUI.lua", "GUI");
         this->luaState_->doFile("InitialiseGUI.lua", "GUI", false);