Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2841


Ignore:
Timestamp:
Mar 25, 2009, 3:17:38 PM (15 years ago)
Author:
rgrieder
Message:

Using loadGUI_2.lua in this branch now.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gui/src/orxonox/gui/GUIManager.cc

    r2840 r2841  
    205205                tolua_Orxonox_open(this->scriptModule_->getLuaState());
    206206                */
    207                 this->scriptModule_->executeScriptFile("loadGUI.lua", "GUI");
     207                this->scriptModule_->executeScriptFile("loadGUI_2.lua", "GUI");
    208208            }
    209209            catch (CEGUI::Exception& ex)
     
    249249        try
    250250        {
    251             this->scriptModule_->executeScriptFile("loadGUI.lua", "GUI");
     251            this->scriptModule_->executeScriptFile("loadGUI_2.lua", "GUI");
    252252            lua_pushfstring(this->scriptModule_->getLuaState(), Core::getMediaPathString().c_str());
    253253            lua_setglobal(this->scriptModule_->getLuaState(), "datapath");
Note: See TracChangeset for help on using the changeset viewer.