Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2957 for code/trunk/src


Ignore:
Timestamp:
May 7, 2009, 5:05:45 PM (16 years ago)
Author:
bknecht
Message:

hack to include gui into hud

Location:
code/trunk/src/orxonox
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/gamestates/GSMainMenu.cc

    r2928 r2957  
    6767
    6868        // show main menu
    69         GUIManager::getInstance().showGUI("mainmenu");
     69        GUIManager::getInstance().showGUI("mainmenu_2");
    7070        GUIManager::getInstance().setCamera(this->camera_);
    7171        GraphicsManager::getInstance().setCamera(this->camera_);
  • code/trunk/src/orxonox/gui/GUIManager.cc

    r2927 r2957  
    187187        try
    188188        {
    189             // call main Lua script
    190             this->scriptModule_->executeScriptFile("loadGUI_2.lua", "GUI");
    191189            // set datapath for GUI data
    192190            lua_pushfstring(this->scriptModule_->getLuaState(), Core::getMediaPathString().c_str());
    193191            lua_setglobal(this->scriptModule_->getLuaState(), "datapath");
     192            // call main Lua script
     193            this->scriptModule_->executeScriptFile("loadGUI_3.lua", "GUI");
    194194        }
    195195        catch (CEGUI::Exception& ex)
  • code/trunk/src/orxonox/overlays/CMakeLists.txt

    r2710 r2957  
    33  OverlayGroup.cc
    44  OverlayText.cc
     5  GUIOverlay.cc
    56)
    67
Note: See TracChangeset for help on using the changeset viewer.