[Orxonox-commit 840] r3355 - in branches/resource/src: core orxonox/gamestates
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Jul 26 14:15:09 CEST 2009
Author: rgrieder
Date: 2009-07-26 14:15:08 +0200 (Sun, 26 Jul 2009)
New Revision: 3355
Modified:
branches/resource/src/core/Core.cc
branches/resource/src/core/CorePrereqs.h
branches/resource/src/core/Game.cc
branches/resource/src/core/Game.h
branches/resource/src/core/GameMode.h
branches/resource/src/core/GameState.cc
branches/resource/src/core/GameState.h
branches/resource/src/orxonox/gamestates/GSClient.cc
branches/resource/src/orxonox/gamestates/GSClient.h
branches/resource/src/orxonox/gamestates/GSDedicated.cc
branches/resource/src/orxonox/gamestates/GSDedicated.h
branches/resource/src/orxonox/gamestates/GSGraphics.cc
branches/resource/src/orxonox/gamestates/GSGraphics.h
branches/resource/src/orxonox/gamestates/GSIOConsole.cc
branches/resource/src/orxonox/gamestates/GSIOConsole.h
branches/resource/src/orxonox/gamestates/GSLevel.cc
branches/resource/src/orxonox/gamestates/GSLevel.h
branches/resource/src/orxonox/gamestates/GSMainMenu.cc
branches/resource/src/orxonox/gamestates/GSMainMenu.h
branches/resource/src/orxonox/gamestates/GSRoot.cc
branches/resource/src/orxonox/gamestates/GSRoot.h
branches/resource/src/orxonox/gamestates/GSServer.cc
branches/resource/src/orxonox/gamestates/GSServer.h
branches/resource/src/orxonox/gamestates/GSStandalone.cc
branches/resource/src/orxonox/gamestates/GSStandalone.h
Log:
Loading and unloading graphics automatically: As soon as a GameState requires graphics (defined at the GameState declaration with a bool) it gets loaded. And vice versa.
Modified: branches/resource/src/core/Core.cc
===================================================================
--- branches/resource/src/core/Core.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/core/Core.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -363,7 +363,6 @@
// load the CEGUI interface
guiManager_ = new GUIManager(renderWindow);
- GameMode::setShowsGraphics(true);
bGraphicsLoaded_ = true;
}
@@ -377,7 +376,6 @@
delete graphicsManager_;
bGraphicsLoaded_ = false;
- GameMode::setShowsGraphics(false);
}
/**
Modified: branches/resource/src/core/CorePrereqs.h
===================================================================
--- branches/resource/src/core/CorePrereqs.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/core/CorePrereqs.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -169,8 +169,8 @@
// game states
class Game;
- struct GameStateConstrParams;
class GameState;
+ struct GameStateInfo;
struct GameStateTreeNode;
// input
Modified: branches/resource/src/core/Game.cc
===================================================================
--- branches/resource/src/core/Game.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/core/Game.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -47,6 +47,7 @@
#include "Core.h"
#include "CoreIncludes.h"
#include "ConfigValueIncludes.h"
+#include "GameMode.h"
#include "GameState.h"
namespace orxonox
@@ -58,7 +59,7 @@
{ Game::getInstance().stop(); }
SetConsoleCommandShortcutExternAlias(stop_game, "exit");
- std::map<std::string, Game::GameStateInfo> Game::gameStateDeclarations_s;
+ std::map<std::string, GameStateInfo> Game::gameStateDeclarations_s;
Game* Game::singletonRef_s = 0;
@@ -142,8 +143,7 @@
{
// Only create the states appropriate for the game mode
//if (GameMode::showsGraphics || !it->second.bGraphicsMode)
- GameStateConstrParams params = { it->second.stateName, it->second.bIgnoreTickTime };
- gameStates_[getLowercase(it->second.stateName)] = GameStateFactory::fabricate(it->second.className, params);
+ gameStates_[getLowercase(it->second.stateName)] = GameStateFactory::fabricate(it->second);
}
// The empty root state is ALWAYS loaded!
@@ -291,10 +291,10 @@
{
// Add tick time for most of the states
uint64_t timeBeforeTick;
- if ((*it)->ignoreTickTime())
+ if ((*it)->getInfo().bIgnoreTickTime)
timeBeforeTick = this->gameClock_->getRealMicroseconds();
(*it)->update(*this->gameClock_);
- if ((*it)->ignoreTickTime())
+ if ((*it)->getInfo().bIgnoreTickTime)
this->subtractTickTime(static_cast<int32_t>(this->gameClock_->getRealMicroseconds() - timeBeforeTick));
}
catch (const std::exception& ex)
@@ -516,9 +516,30 @@
/*** Internal ***/
+ void Game::loadGraphics()
+ {
+ if (!GameMode::bShowsGraphics_s)
+ {
+ core_->loadGraphics();
+ GameMode::bShowsGraphics_s = true;
+ }
+ }
+
+ void Game::unloadGraphics()
+ {
+ if (GameMode::bShowsGraphics_s)
+ {
+ core_->unloadGraphics();
+ GameMode::bShowsGraphics_s = false;
+ }
+ }
+
void Game::loadState(GameState* state)
{
this->bChangingState_ = true;
+ // If state requires graphics, load it
+ if (state->getInfo().bGraphicsMode)
+ this->loadGraphics();
state->activate();
if (!this->activeStates_.empty())
this->activeStates_.back()->activity_.topState = false;
@@ -537,6 +558,12 @@
try
{
state->deactivate();
+ // Check if graphis is still required
+ bool graphicsRequired = false;
+ for (unsigned i = 0; i < activeStates_.size(); ++i)
+ graphicsRequired |= activeStates_[i]->getInfo().bGraphicsMode;
+ if (!graphicsRequired)
+ this->unloadGraphics();
}
catch (const std::exception& ex)
{
@@ -548,11 +575,11 @@
std::map<std::string, Game::GameStateFactory*> Game::GameStateFactory::factories_s;
- /*static*/ GameState* Game::GameStateFactory::fabricate(const std::string& className, const GameStateConstrParams& params)
+ /*static*/ GameState* Game::GameStateFactory::fabricate(const GameStateInfo& info)
{
- std::map<std::string, GameStateFactory*>::const_iterator it = factories_s.find(className);
+ std::map<std::string, GameStateFactory*>::const_iterator it = factories_s.find(info.className);
assert(it != factories_s.end());
- return it->second->fabricate(params);
+ return it->second->fabricateInternal(info);
}
/*static*/ void Game::GameStateFactory::destroyFactories()
Modified: branches/resource/src/core/Game.h
===================================================================
--- branches/resource/src/core/Game.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/core/Game.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -60,6 +60,15 @@
{
class GameConfiguration;
+ //! Helper object required before GameStates are being constructed
+ struct GameStateInfo
+ {
+ std::string stateName;
+ std::string className;
+ bool bIgnoreTickTime;
+ bool bGraphicsMode;
+ };
+
/**
@brief
Main class responsible for running the game.
@@ -96,31 +105,23 @@
{
public:
virtual ~GameStateFactory() { }
- static GameState* fabricate(const std::string& className, const GameStateConstrParams& params);
+ static GameState* fabricate(const GameStateInfo& info);
template <class T>
static void createFactory(const std::string& className)
{ factories_s[className] = new TemplateGameStateFactory<T>(); }
static void destroyFactories();
private:
- virtual GameState* fabricate(const GameStateConstrParams& params) = 0;
+ virtual GameState* fabricateInternal(const GameStateInfo& info) = 0;
static std::map<std::string, GameStateFactory*> factories_s;
};
template <class T>
class TemplateGameStateFactory : public GameStateFactory
{
public:
- GameState* fabricate(const GameStateConstrParams& params)
- { return new T(params); }
+ GameState* fabricateInternal(const GameStateInfo& info)
+ { return new T(info); }
};
- struct GameStateInfo
- {
- std::string stateName;
- std::string className;
- bool bIgnoreTickTime;
- bool bGraphicsMode;
- };
-
struct StatisticsTickInfo
{
uint64_t tickTime;
@@ -129,6 +130,9 @@
Game(Game&); // don't mess with singletons
+ void loadGraphics();
+ void unloadGraphics();
+
void loadState(GameState* state);
void unloadState(GameState* state);
Modified: branches/resource/src/core/GameMode.h
===================================================================
--- branches/resource/src/core/GameMode.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/core/GameMode.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -40,7 +40,7 @@
{
class _CoreExport GameMode
{
- friend class Core;
+ friend class Game;
public:
static bool showsGraphics() { return bShowsGraphics_s; }
@@ -58,8 +58,10 @@
GameMode(const GameMode& inst);
~GameMode();
- static void setShowsGraphics(bool val) { bShowsGraphics_s = val; updateIsMaster(); }
- static void updateIsMaster () { bIsMaster_s = (bHasServer_s || bIsStandalone_s); }
+ static void updateIsMaster()
+ {
+ bIsMaster_s = (bHasServer_s || bIsStandalone_s);
+ }
static bool bShowsGraphics_s; //!< global variable that tells whether to show graphics
static bool bHasServer_s; //!< global variable that tells whether this is a server
Modified: branches/resource/src/core/GameState.cc
===================================================================
--- branches/resource/src/core/GameState.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/core/GameState.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -37,6 +37,7 @@
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/OrxAssert.h"
+#include "Game.h"
namespace orxonox
{
@@ -44,9 +45,8 @@
@brief
Constructor only initialises variables and sets the name permanently.
*/
- GameState::GameState(const GameStateConstrParams& params)
- : name_(params.name)
- , bIgnoreTickTime_(params.bIgnoreTickTime)
+ GameState::GameState(const GameStateInfo& info)
+ : info_(info)
, parent_(0)
{
this->activity_.activating = false;
@@ -66,6 +66,11 @@
OrxAssert(this->activity_.active == false, "Deleting an active GameState is a very bad idea..");
}
+ const std::string& GameState::getName() const
+ {
+ return info_.stateName;
+ }
+
/**
@brief
Adds a child to the current tree. The Child can contain children of its own.
@@ -106,7 +111,7 @@
this->children_.erase(it);
else
{
- ThrowException(GameState, "Game state '" + name_ + "' doesn't have a child named '"
+ ThrowException(GameState, "Game state '" + this->getName() + "' doesn't have a child named '"
+ state->getName() + "'.");
}
}
Modified: branches/resource/src/core/GameState.h
===================================================================
--- branches/resource/src/core/GameState.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/core/GameState.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -44,16 +44,6 @@
{
/**
@brief
- Helper class to group construction parameters for better genericity.
- */
- struct GameStateConstrParams
- {
- std::string name;
- bool bIgnoreTickTime;
- };
-
- /**
- @brief
An implementation of a tree to manage game states.
This leads to a certain hierarchy that is created at runtime.
To actually use the structure, you will have to derive from it and
@@ -86,15 +76,14 @@
};
public:
- GameState(const GameStateConstrParams& params);
+ GameState(const GameStateInfo& info);
virtual ~GameState();
- const std::string& getName() const { return name_; }
- State getActivity() const { return this->activity_; }
- GameState* getParent() const { return this->parent_; }
+ const std::string& getName() const;
+ State getActivity() const { return activity_; }
+ GameState* getParent() const { return parent_; }
+ const GameStateInfo& getInfo() const { return info_; }
- bool ignoreTickTime() const { return this->bIgnoreTickTime_; }
-
void addChild(GameState* state);
void removeChild(GameState* state);
@@ -110,9 +99,8 @@
void deactivateInternal();
void updateInternal(const Clock& time);
- const std::string name_;
+ const GameStateInfo& info_;
State activity_;
- const bool bIgnoreTickTime_;
GameState* parent_;
std::map<std::string, GameState*> children_;
};
Modified: branches/resource/src/orxonox/gamestates/GSClient.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSClient.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSClient.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -41,8 +41,8 @@
SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as strin in the form #.#.#.#");
- GSClient::GSClient(const GameStateConstrParams& params)
- : GameState(params)
+ GSClient::GSClient(const GameStateInfo& info)
+ : GameState(info)
, client_(0)
{
}
Modified: branches/resource/src/orxonox/gamestates/GSClient.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSClient.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSClient.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -39,7 +39,7 @@
class _OrxonoxExport GSClient : public GameState
{
public:
- GSClient(const GameStateConstrParams& params);
+ GSClient(const GameStateInfo& info);
~GSClient();
void activate();
Modified: branches/resource/src/orxonox/gamestates/GSDedicated.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSDedicated.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSDedicated.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -54,8 +54,8 @@
termios* GSDedicated::originalTerminalSettings_;
- GSDedicated::GSDedicated(const GameStateConstrParams& params)
- : GameState(params)
+ GSDedicated::GSDedicated(const GameStateInfo& info)
+ : GameState(info)
, server_(0)
, closeThread_(false)
, cleanLine_(true)
Modified: branches/resource/src/orxonox/gamestates/GSDedicated.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSDedicated.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSDedicated.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -47,7 +47,7 @@
class _OrxonoxExport GSDedicated : public GameState
{
public:
- GSDedicated(const GameStateConstrParams& params);
+ GSDedicated(const GameStateInfo& info);
~GSDedicated();
void activate();
Modified: branches/resource/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSGraphics.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSGraphics.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -56,8 +56,8 @@
{
DeclareGameState(GSGraphics, "graphics", false, true);
- GSGraphics::GSGraphics(const GameStateConstrParams& params)
- : GameState(params)
+ GSGraphics::GSGraphics(const GameStateInfo& info)
+ : GameState(info)
, console_(0)
, soundManager_(0)
, masterKeyBinder_(0)
@@ -87,9 +87,6 @@
*/
void GSGraphics::activate()
{
- // Load OGRE, CEGUI and OIS
- Core::getInstance().loadGraphics();
-
// load debug overlay
COUT(3) << "Loading Debug Overlay..." << std::endl;
this->debugOverlay_ = new XMLFile(Core::getMediaPathString() + "overlay/debug.oxo");
@@ -146,9 +143,6 @@
// HACK: (destroys a resource smart pointer)
Map::hackDestroyMap();
-
- // Unload OGRE, CEGUI and OIS
- Core::getInstance().loadGraphics();
}
/**
Modified: branches/resource/src/orxonox/gamestates/GSGraphics.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSGraphics.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSGraphics.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -49,7 +49,7 @@
class _OrxonoxExport GSGraphics : public GameState
{
public:
- GSGraphics(const GameStateConstrParams& params);
+ GSGraphics(const GameStateInfo& info);
~GSGraphics();
void activate();
Modified: branches/resource/src/orxonox/gamestates/GSIOConsole.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSIOConsole.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSIOConsole.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -37,8 +37,8 @@
{
DeclareGameState(GSIOConsole, "ioConsole", false, false);
- GSIOConsole::GSIOConsole(const GameStateConstrParams& params)
- : GameState(params)
+ GSIOConsole::GSIOConsole(const GameStateInfo& info)
+ : GameState(info)
{
}
Modified: branches/resource/src/orxonox/gamestates/GSIOConsole.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSIOConsole.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSIOConsole.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -37,7 +37,7 @@
class _OrxonoxExport GSIOConsole : public GameState
{
public:
- GSIOConsole(const GameStateConstrParams& params);
+ GSIOConsole(const GameStateInfo& info);
~GSIOConsole();
void activate();
Modified: branches/resource/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSLevel.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSLevel.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -59,8 +59,8 @@
XMLFile* GSLevel::startFile_s = NULL;
- GSLevel::GSLevel(const GameStateConstrParams& params)
- : GameState(params)
+ GSLevel::GSLevel(const GameStateInfo& info)
+ : GameState(info)
, keyBinder_(0)
, gameInputState_(0)
, guiMouseOnlyInputState_(0)
Modified: branches/resource/src/orxonox/gamestates/GSLevel.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSLevel.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSLevel.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -40,7 +40,7 @@
class _OrxonoxExport GSLevel : public GameState, public OrxonoxClass
{
public:
- GSLevel(const GameStateConstrParams& params);
+ GSLevel(const GameStateInfo& info);
~GSLevel();
void setConfigValues();
Modified: branches/resource/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSMainMenu.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSMainMenu.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -44,8 +44,8 @@
{
DeclareGameState(GSMainMenu, "mainMenu", false, true);
- GSMainMenu::GSMainMenu(const GameStateConstrParams& params)
- : GameState(params)
+ GSMainMenu::GSMainMenu(const GameStateInfo& info)
+ : GameState(info)
, inputState_(0)
{
}
Modified: branches/resource/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSMainMenu.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSMainMenu.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -39,7 +39,7 @@
class _OrxonoxExport GSMainMenu : public GameState
{
public:
- GSMainMenu(const GameStateConstrParams& params);
+ GSMainMenu(const GameStateInfo& info);
~GSMainMenu();
void activate();
Modified: branches/resource/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSRoot.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSRoot.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -52,8 +52,8 @@
SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
SetCommandLineSwitch(standalone).information("Start in standalone mode");
- GSRoot::GSRoot(const GameStateConstrParams& params)
- : GameState(params)
+ GSRoot::GSRoot(const GameStateInfo& info)
+ : GameState(info)
, timeFactor_(1.0f)
, bPaused_(false)
, timeFactorPauseBackup_(1.0f)
@@ -173,6 +173,9 @@
/**
@brief
Changes the speed of Orxonox
+ @remark
+ This function is a hack when placed here!
+ Timefactor should be related to the scene (level or so), not the game
*/
void GSRoot::setTimeFactor(float factor)
{
Modified: branches/resource/src/orxonox/gamestates/GSRoot.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSRoot.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSRoot.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -37,7 +37,7 @@
class _OrxonoxExport GSRoot : public GameState
{
public:
- GSRoot(const GameStateConstrParams& params);
+ GSRoot(const GameStateInfo& info);
~GSRoot();
void activate();
Modified: branches/resource/src/orxonox/gamestates/GSServer.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSServer.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSServer.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -40,8 +40,8 @@
SetCommandLineArgument(port, 55556).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
- GSServer::GSServer(const GameStateConstrParams& params)
- : GameState(params)
+ GSServer::GSServer(const GameStateInfo& info)
+ : GameState(info)
, server_(0)
{
}
Modified: branches/resource/src/orxonox/gamestates/GSServer.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSServer.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSServer.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -39,7 +39,7 @@
class _OrxonoxExport GSServer : public GameState
{
public:
- GSServer(const GameStateConstrParams& params);
+ GSServer(const GameStateInfo& info);
~GSServer();
void activate();
Modified: branches/resource/src/orxonox/gamestates/GSStandalone.cc
===================================================================
--- branches/resource/src/orxonox/gamestates/GSStandalone.cc 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSStandalone.cc 2009-07-26 12:15:08 UTC (rev 3355)
@@ -35,8 +35,8 @@
{
DeclareGameState(GSStandalone, "standalone", false, true);
- GSStandalone::GSStandalone(const GameStateConstrParams& params)
- : GameState(params)
+ GSStandalone::GSStandalone(const GameStateInfo& info)
+ : GameState(info)
{
}
Modified: branches/resource/src/orxonox/gamestates/GSStandalone.h
===================================================================
--- branches/resource/src/orxonox/gamestates/GSStandalone.h 2009-07-26 01:23:27 UTC (rev 3354)
+++ branches/resource/src/orxonox/gamestates/GSStandalone.h 2009-07-26 12:15:08 UTC (rev 3355)
@@ -37,7 +37,7 @@
class _OrxonoxExport GSStandalone : public GameState
{
public:
- GSStandalone(const GameStateConstrParams& params);
+ GSStandalone(const GameStateInfo& info);
~GSStandalone();
void activate();
More information about the Orxonox-commit
mailing list