Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8271 in orxonox.OLD for trunk/src/util


Ignore:
Timestamp:
Jun 8, 2006, 4:50:50 PM (19 years ago)
Author:
bensch
Message:

merge

Location:
trunk/src/util
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/util/state.cc

    r7039 r8271  
    3838
    3939ObjectManager* State::objectManager = NULL;
    40 
     40ScriptManager* State::scriptManager = NULL;
    4141
    4242unsigned int State::resX = 1;

  • trunk/src/util/state.h

    r8148 r8271  
    1818class ObjectManager;
    1919class GameRules;
     20
     21class ScriptManager;
    2022
    2123
    … …  
    9294
    9395
     96
     97  ////////////////////
     98  /// SCRIP_ENGINE ///
     99  ////////////////////
     100  static void setScripManager(ScriptManager* scriptManager) { State::scriptManager = scriptManager; };
     101  static ScriptManager* getScriptManager() { return State::scriptManager; };
     102
    94103  ////////////
    95104  /// Menu ///
    … …  
    116125
    117126  static SkyBox*                skyBox;            //!< The SkyBox used in the current world.
     127
     128  static  ScriptManager*        scriptManager;     //!< The ScriptManager.
     129
    118130  static unsigned int           resX;              //!< The X Resolution of the screen.
    119131  static unsigned int           resY;              //!< The Y Resolution of the screen.
Note: See TracChangeset for help on using the changeset viewer.