[Orxonox-commit 641] r3173 - branches/pch/src/orxonox/gamestates
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 09:01:15 CEST 2009
Author: rgrieder
Date: 2009-06-15 09:01:15 +0200 (Mon, 15 Jun 2009)
New Revision: 3173
Modified:
branches/pch/src/orxonox/gamestates/GSClient.cc
branches/pch/src/orxonox/gamestates/GSClient.h
branches/pch/src/orxonox/gamestates/GSDedicated.cc
branches/pch/src/orxonox/gamestates/GSDedicated.h
branches/pch/src/orxonox/gamestates/GSGraphics.cc
branches/pch/src/orxonox/gamestates/GSGraphics.h
branches/pch/src/orxonox/gamestates/GSIOConsole.cc
branches/pch/src/orxonox/gamestates/GSLevel.cc
branches/pch/src/orxonox/gamestates/GSLevel.h
branches/pch/src/orxonox/gamestates/GSMainMenu.cc
branches/pch/src/orxonox/gamestates/GSMainMenu.h
branches/pch/src/orxonox/gamestates/GSRoot.cc
branches/pch/src/orxonox/gamestates/GSRoot.h
branches/pch/src/orxonox/gamestates/GSServer.h
branches/pch/src/orxonox/gamestates/GSStandalone.cc
Log:
GameStates cleanup
Modified: branches/pch/src/orxonox/gamestates/GSClient.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSClient.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSClient.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -29,7 +29,6 @@
#include "GSClient.h"
#include "util/Exception.h"
-#include "core/input/InputManager.h"
#include "core/Clock.h"
#include "core/CommandLine.h"
#include "core/Game.h"
Modified: branches/pch/src/orxonox/gamestates/GSClient.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSClient.h 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSClient.h 2009-06-15 07:01:15 UTC (rev 3173)
@@ -30,6 +30,7 @@
#define _GSClient_H__
#include "OrxonoxPrereqs.h"
+
#include "core/GameState.h"
#include "network/NetworkPrereqs.h"
Modified: branches/pch/src/orxonox/gamestates/GSDedicated.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSDedicated.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSDedicated.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -28,14 +28,13 @@
#include "GSDedicated.h"
+#include "util/Debug.h"
+#include "util/Sleep.h"
#include "core/Clock.h"
#include "core/CommandLine.h"
#include "core/Game.h"
#include "core/GameMode.h"
-#include "core/ObjectList.h"
#include "network/Server.h"
-#include "objects/Tickable.h"
-#include "util/Sleep.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/gamestates/GSDedicated.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSDedicated.h 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSDedicated.h 2009-06-15 07:01:15 UTC (rev 3173)
@@ -30,6 +30,7 @@
#define _GSDedicated_H__
#include "OrxonoxPrereqs.h"
+
#include "core/GameState.h"
#include "network/NetworkPrereqs.h"
Modified: branches/pch/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSGraphics.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSGraphics.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -27,8 +27,9 @@
*/
/**
- @file
- @brief Implementation of Graphics GameState class.
+ at file
+ at brief
+ Implementation of Graphics GameState class.
*/
#include "GSGraphics.h"
Modified: branches/pch/src/orxonox/gamestates/GSGraphics.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSGraphics.h 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSGraphics.h 2009-06-15 07:01:15 UTC (rev 3173)
@@ -26,24 +26,25 @@
*
*/
- /**
- @file
- @brief Declaration of the Graphics GameState class.
- */
+/**
+ at file
+ at brief
+ Declaration of the Graphics GameState class.
+*/
#ifndef _GSGraphics_H__
#define _GSGraphics_H__
#include "OrxonoxPrereqs.h"
+
#include "core/GameState.h"
#include "tools/WindowEventListener.h"
namespace orxonox
{
/**
- @class GSGraphics
@brief
- Game state used when displaying graphics of any kind
+ Game state used when displaying graphics of any kind. Another blubb resides here.
This game state is only left out if we start a dedicated server where no graphics are present.
*/
Modified: branches/pch/src/orxonox/gamestates/GSIOConsole.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSIOConsole.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSIOConsole.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -29,9 +29,6 @@
#include "GSIOConsole.h"
#include <iostream>
-#include <OgreFrameListener.h>
-#include <OgreRoot.h>
-#include <OgreTimer.h>
#include "core/ConsoleCommand.h"
#include "core/Game.h"
Modified: branches/pch/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -29,28 +29,29 @@
#include "GSLevel.h"
+#include "util/Debug.h"
#include "core/input/InputManager.h"
#include "core/input/SimpleInputState.h"
#include "core/input/KeyBinder.h"
-#include "core/Loader.h"
-#include "core/XMLFile.h"
-#include "core/CommandExecutor.h"
+#include "core/Clock.h"
+#include "core/CommandLine.h"
#include "core/ConsoleCommand.h"
-#include "core/CommandLine.h"
#include "core/ConfigValueIncludes.h"
-#include "core/Core.h"
-#include "core/CoreIncludes.h"
#include "core/Game.h"
#include "core/GameMode.h"
+#include "core/Loader.h"
+#include "core/ObjectList.h"
+#include "core/XMLFile.h"
+
+#include "objects/Radar.h"
#include "objects/Tickable.h"
-#include "objects/Radar.h"
+#include "objects/quest/QuestManager.h"
+#include "overlays/notifications/NotificationManager.h"
+#include "gui/GUIManager.h"
#include "CameraManager.h"
#include "GraphicsManager.h"
#include "LevelManager.h"
#include "PlayerManager.h"
-#include "gui/GUIManager.h"
-#include "objects/quest/QuestManager.h"
-#include "overlays/notifications/NotificationManager.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/gamestates/GSLevel.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSLevel.h 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSLevel.h 2009-06-15 07:01:15 UTC (rev 3173)
@@ -30,6 +30,8 @@
#define _GSLevel_H__
#include "OrxonoxPrereqs.h"
+
+#include <string>
#include "core/OrxonoxClass.h"
#include "core/GameState.h"
@@ -47,7 +49,6 @@
void update(const Clock& time);
static void showIngameGUI(bool show);
- static void setLevel(std::string levelName);
static XMLFile* startFile_s;
@@ -68,7 +69,7 @@
CameraManager* cameraManager_; //!< camera manager for this level
LevelManager* levelManager_; //!< global level manager
PlayerManager* playerManager_; //!< player manager for this level
- QuestManager* questManager_;
+ QuestManager* questManager_;
NotificationManager* notificationManager_;
//##### ConfigValues #####
Modified: branches/pch/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSMainMenu.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSMainMenu.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -28,17 +28,17 @@
#include "GSMainMenu.h"
-//#include <OgreViewport.h>
#include <OgreSceneManager.h>
+
+#include "core/input/InputManager.h"
+#include "core/input/SimpleInputState.h"
+#include "core/Game.h"
#include "core/Clock.h"
#include "core/ConsoleCommand.h"
-#include "core/Game.h"
-#include "core/input/InputManager.h"
-#include "core/input/SimpleInputState.h"
+#include "objects/Scene.h"
#include "gui/GUIManager.h"
-#include "objects/Scene.h"
+#include "sound/SoundMainMenu.h"
#include "GraphicsManager.h"
-#include "sound/SoundMainMenu.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSMainMenu.h 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSMainMenu.h 2009-06-15 07:01:15 UTC (rev 3173)
@@ -30,6 +30,7 @@
#define _GSMainMenu_H__
#include "OrxonoxPrereqs.h"
+
#include <OgrePrerequisites.h>
#include "core/GameState.h"
Modified: branches/pch/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSRoot.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSRoot.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -28,12 +28,11 @@
#include "GSRoot.h"
-#include "util/Debug.h"
#include "core/Clock.h"
-#include "core/Game.h"
-#include "core/GameMode.h"
#include "core/CommandLine.h"
#include "core/ConsoleCommand.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
#include "tools/TimeFactorListener.h"
#include "tools/Timer.h"
#include "objects/Tickable.h"
Modified: branches/pch/src/orxonox/gamestates/GSRoot.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSRoot.h 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSRoot.h 2009-06-15 07:01:15 UTC (rev 3173)
@@ -31,7 +31,6 @@
#include "OrxonoxPrereqs.h"
#include "core/GameState.h"
-#include "core/OrxonoxClass.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/gamestates/GSServer.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSServer.h 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSServer.h 2009-06-15 07:01:15 UTC (rev 3173)
@@ -30,6 +30,7 @@
#define _GSServer_H__
#include "OrxonoxPrereqs.h"
+
#include "core/GameState.h"
#include "network/NetworkPrereqs.h"
Modified: branches/pch/src/orxonox/gamestates/GSStandalone.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSStandalone.cc 2009-06-14 19:04:31 UTC (rev 3172)
+++ branches/pch/src/orxonox/gamestates/GSStandalone.cc 2009-06-15 07:01:15 UTC (rev 3173)
@@ -28,13 +28,8 @@
#include "GSStandalone.h"
-#include <OgreViewport.h>
-#include <OgreCamera.h>
#include "core/Game.h"
#include "core/GameMode.h"
-#include "core/ConsoleCommand.h"
-#include "gui/GUIManager.h"
-#include "GraphicsManager.h"
namespace orxonox
{
More information about the Orxonox-commit
mailing list