Changeset 5693 for code/trunk/src/orxonox/gamestates
- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 15 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
code/trunk ¶
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
TabularUnified code/trunk/src/orxonox/gamestates/CMakeLists.txt ¶
r2896 r5693 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES1 SET_SOURCE_FILES(GAMESTATES_SRC_FILES 2 2 GSClient.cc 3 3 GSDedicated.cc … … 10 10 GSStandalone.cc 11 11 ) 12 13 ORXONOX_ADD_LIBRARY(gamestates 14 MODULE 15 DEFINE_SYMBOL 16 "GAMESTATES_SHARED_BUILD" 17 LINK_LIBRARIES 18 orxonox 19 SOURCE_FILES ${GAMESTATES_SRC_FILES} 20 ) -
TabularUnified code/trunk/src/orxonox/gamestates/GSClient.cc ¶
r3370 r5693 40 40 DeclareGameState(GSClient, "client", false, true); 41 41 42 SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as strin in the form #.#.#.#");42 SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as string in the form #.#.#.#"); 43 43 44 44 GSClient::GSClient(const GameStateInfo& info) -
TabularUnified code/trunk/src/orxonox/gamestates/GSClient.h ¶
r3370 r5693 30 30 #define _GSClient_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 34 34 #include "core/GameState.h" … … 37 37 namespace orxonox 38 38 { 39 class _ OrxonoxExport GSClient : public GameState39 class _GameStatesExport GSClient : public GameState 40 40 { 41 41 public: -
TabularUnified code/trunk/src/orxonox/gamestates/GSDedicated.h ¶
r3370 r5693 30 30 #define _GSDedicated_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 34 34 #include "core/GameState.h" … … 44 44 namespace orxonox 45 45 { 46 47 class _ OrxonoxExport GSDedicated : public GameState46 47 class _GameStatesExport GSDedicated : public GameState 48 48 { 49 49 public: … … 61 61 void setTerminalMode(); 62 62 static void resetTerminalMode(); 63 63 64 64 void insertCharacter( unsigned int position, char c ); 65 65 void deleteCharacter( unsigned int position ); 66 66 67 67 Server* server_; 68 68 69 69 boost::thread *inputThread_; 70 70 boost::recursive_mutex inputLineMutex_; … … 76 76 std::queue<std::string> commandQueue_; 77 77 static termios* originalTerminalSettings_; 78 78 79 79 unsigned int cursorX_; 80 80 unsigned int cursorY_; -
TabularUnified code/trunk/src/orxonox/gamestates/GSGraphics.cc ¶
r3370 r5693 47 47 #include "core/Loader.h" 48 48 #include "core/XMLFile.h" 49 #include " overlays/console/InGameConsole.h"49 #include "InGameConsole.h" 50 50 #include "sound/SoundManager.h" 51 51 52 52 // HACK: 53 #include " overlays/map/Map.h"53 #include "Map.h" 54 54 55 55 namespace orxonox -
TabularUnified code/trunk/src/orxonox/gamestates/GSGraphics.h ¶
r3370 r5693 36 36 #define _GSGraphics_H__ 37 37 38 #include " OrxonoxPrereqs.h"38 #include "gamestates/GameStatesPrereqs.h" 39 39 #include "core/GameState.h" 40 40 … … 47 47 This game state is only left out if we start a dedicated server where no graphics are present. 48 48 */ 49 class _ OrxonoxExport GSGraphics : public GameState49 class _GameStatesExport GSGraphics : public GameState 50 50 { 51 51 public: -
TabularUnified code/trunk/src/orxonox/gamestates/GSIOConsole.h ¶
r3370 r5693 30 30 #define _GSIOConsole_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 #include "core/GameState.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _ OrxonoxExport GSIOConsole : public GameState37 class _GameStatesExport GSIOConsole : public GameState 38 38 { 39 39 public: -
TabularUnified code/trunk/src/orxonox/gamestates/GSLevel.cc ¶
r3370 r5693 45 45 #include "core/XMLFile.h" 46 46 47 #include " interfaces/Tickable.h"47 #include "tools/interfaces/Tickable.h" 48 48 #include "objects/Radar.h" 49 #include "objects/quest/QuestManager.h"50 #include "overlays/notifications/NotificationManager.h"51 49 #include "CameraManager.h" 52 50 #include "LevelManager.h" … … 110 108 this->playerManager_ = new PlayerManager(); 111 109 112 this->questManager_ = new QuestManager(); 113 114 this->notificationManager_ = new NotificationManager(); 110 this->scope_GSLevel_ = new Scope<ScopeID::GSLevel>(); 115 111 116 112 if (GameMode::isMaster()) … … 201 197 } 202 198 203 if (this->questManager_) 204 { 205 delete this->questManager_; 206 this->questManager_ = NULL; 207 } 208 209 if (this->notificationManager_) 210 { 211 delete this->notificationManager_; 212 this->notificationManager_ = NULL; 199 if (this->scope_GSLevel_) 200 { 201 delete this->scope_GSLevel_; 202 this->scope_GSLevel_ = NULL; 213 203 } 214 204 -
TabularUnified code/trunk/src/orxonox/gamestates/GSLevel.h ¶
r3370 r5693 30 30 #define _GSLevel_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 34 34 #include <string> 35 #include "util/Scope.h" 35 36 #include "core/OrxonoxClass.h" 36 37 #include "core/GameState.h" … … 38 39 namespace orxonox 39 40 { 40 class _ OrxonoxExport GSLevel : public GameState, public OrxonoxClass41 class _GameStatesExport GSLevel : public GameState, public OrxonoxClass 41 42 { 42 43 public: … … 62 63 void keybindInternal(const std::string& command, bool bTemporary); 63 64 64 KeyBinder* keyBinder_; //!< tool that loads and manages the input bindings 65 InputState* gameInputState_; //!< input state for normal ingame playing 66 InputState* guiMouseOnlyInputState_; //!< input state if we only need the mouse to use the GUI 67 InputState* guiKeysOnlyInputState_; //!< input state if we only need the keys to use the GUI 68 Radar* radar_; //!< represents the Radar (not the HUD part) 69 CameraManager* cameraManager_; //!< camera manager for this level 70 PlayerManager* playerManager_; //!< player manager for this level 71 QuestManager* questManager_; 72 NotificationManager* notificationManager_; 65 KeyBinder* keyBinder_; //!< tool that loads and manages the input bindings 66 InputState* gameInputState_; //!< input state for normal ingame playing 67 InputState* guiMouseOnlyInputState_; //!< input state if we only need the mouse to use the GUI 68 InputState* guiKeysOnlyInputState_; //!< input state if we only need the keys to use the GUI 69 Radar* radar_; //!< represents the Radar (not the HUD part) 70 CameraManager* cameraManager_; //!< camera manager for this level 71 PlayerManager* playerManager_; //!< player manager for this level 72 Scope<ScopeID::GSLevel>* scope_GSLevel_; 73 73 74 74 //##### ConfigValues ##### -
TabularUnified code/trunk/src/orxonox/gamestates/GSMainMenu.h ¶
r3370 r5693 30 30 #define _GSMainMenu_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 34 34 #include "util/OgreForwardRefs.h" … … 37 37 namespace orxonox 38 38 { 39 class _ OrxonoxExport GSMainMenu : public GameState39 class _GameStatesExport GSMainMenu : public GameState 40 40 { 41 41 public: -
TabularUnified code/trunk/src/orxonox/gamestates/GSRoot.cc ¶
r3370 r5693 38 38 #include "ToluaBindOrxonox.h" 39 39 #include "tools/Timer.h" 40 #include " interfaces/TimeFactorListener.h"41 #include " interfaces/Tickable.h"40 #include "tools/interfaces/TimeFactorListener.h" 41 #include "tools/interfaces/Tickable.h" 42 42 #include "LevelManager.h" 43 43 -
TabularUnified code/trunk/src/orxonox/gamestates/GSRoot.h ¶
r3370 r5693 30 30 #define _GSRoot_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 #include "core/GameState.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _ OrxonoxExport GSRoot : public GameState37 class _GameStatesExport GSRoot : public GameState 38 38 { 39 39 public: -
TabularUnified code/trunk/src/orxonox/gamestates/GSServer.h ¶
r3370 r5693 30 30 #define _GSServer_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 34 34 #include "core/GameState.h" … … 37 37 namespace orxonox 38 38 { 39 class _ OrxonoxExport GSServer : public GameState39 class _GameStatesExport GSServer : public GameState 40 40 { 41 41 public: -
TabularUnified code/trunk/src/orxonox/gamestates/GSStandalone.h ¶
r3370 r5693 30 30 #define _GSStandalone_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 #include "core/GameState.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _ OrxonoxExport GSStandalone : public GameState37 class _GameStatesExport GSStandalone : public GameState 38 38 { 39 39 public:
Note: See TracChangeset
for help on using the changeset viewer.