Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 25, 2009, 11:53:04 PM (15 years ago)
Author:
rgrieder
Message:
  • Started working on cleaning up the GameState mess ;)
  • Cleaned out GUIManager
  • Renamed GSGUI to GSMainMenu
  • "—state blah" has been changed to —server, —client, —standalone, —dedicated
  • —console starts the game in the console (no level loading there yet, but "loadMenu")
  • adjusted run scripts
File:
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/gui/src/orxonox/gamestates/GSMainMenu.h

    r2844 r2850  
    2727 */
    2828
    29 #ifndef _GSGUI_H__
    30 #define _GSGUI_H__
     29#ifndef _GSMainMenu_H__
     30#define _GSMainMenu_H__
    3131
    3232#include "OrxonoxPrereqs.h"
     33#include <OgrePrerequisites.h>
    3334#include "core/GameState.h"
    3435
    3536namespace orxonox
    3637{
    37     class _OrxonoxExport GSGUI : public GameState
     38    class _OrxonoxExport GSMainMenu : public GameState
    3839    {
    3940    public:
    40         GSGUI(const std::string& name);
    41         ~GSGUI();
     41        GSMainMenu(const std::string& name);
     42        ~GSMainMenu();
    4243
    4344        void activate();
     
    4849
    4950    private:
    50         GUIManager* guiManager_;
     51        SimpleInputState* inputState_;
     52        Scene*            scene_;
     53        Ogre::Camera*     camera_;
    5154
    5255        // console commands
     
    5558}
    5659
    57 #endif /* _GSGUI_H__ */
     60#endif /* _GSMainMenu_H__ */
Note: See TracChangeset for help on using the changeset viewer.