Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3173


Ignore:
Timestamp:
Jun 15, 2009, 9:01:15 AM (15 years ago)
Author:
rgrieder
Message:

GameStates cleanup

Location:
code/branches/pch/src/orxonox/gamestates
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pch/src/orxonox/gamestates/GSClient.cc

    r3149 r3173  
    3030
    3131#include "util/Exception.h"
    32 #include "core/input/InputManager.h"
    3332#include "core/Clock.h"
    3433#include "core/CommandLine.h"

  • code/branches/pch/src/orxonox/gamestates/GSClient.h

    r2896 r3173  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include "core/GameState.h"
    3435#include "network/NetworkPrereqs.h"

  • code/branches/pch/src/orxonox/gamestates/GSDedicated.cc

    r3157 r3173  
    2929#include "GSDedicated.h"
    3030
     31#include "util/Debug.h"
     32#include "util/Sleep.h"
    3133#include "core/Clock.h"
    3234#include "core/CommandLine.h"
    3335#include "core/Game.h"
    3436#include "core/GameMode.h"
    35 #include "core/ObjectList.h"
    3637#include "network/Server.h"
    37 #include "objects/Tickable.h"
    38 #include "util/Sleep.h"
    3938
    4039namespace orxonox

  • code/branches/pch/src/orxonox/gamestates/GSDedicated.h

    r2896 r3173  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include "core/GameState.h"
    3435#include "network/NetworkPrereqs.h"

  • code/branches/pch/src/orxonox/gamestates/GSGraphics.cc

    r3110 r3173  
    2828
    2929/**
    30     @file
    31     @brief Implementation of Graphics GameState class.
     30@file
     31@brief
     32    Implementation of Graphics GameState class.
    3233 */
    3334

  • code/branches/pch/src/orxonox/gamestates/GSGraphics.h

    r3084 r3173  
    2727 */
    2828
    29  /**
    30     @file
    31     @brief Declaration of the Graphics GameState class.
    32   */
     29/**
     30@file
     31@brief
     32    Declaration of the Graphics GameState class.
     33*/
    3334
    3435#ifndef _GSGraphics_H__
    … …  
    3637
    3738#include "OrxonoxPrereqs.h"
     39
    3840#include "core/GameState.h"
    3941#include "tools/WindowEventListener.h"
    … …  
    4244{
    4345    /**
    44     @class GSGraphics
    4546    @brief
    46         Game state used when displaying graphics of any kind
     47        Game state used when displaying graphics of any kind. Another blubb resides here.
    4748
    4849        This game state is only left out if we start a dedicated server where no graphics are present.

  • code/branches/pch/src/orxonox/gamestates/GSIOConsole.cc

    r3110 r3173  
    3030
    3131#include <iostream>
    32 #include <OgreFrameListener.h>
    33 #include <OgreRoot.h>
    34 #include <OgreTimer.h>
    3532
    3633#include "core/ConsoleCommand.h"

  • code/branches/pch/src/orxonox/gamestates/GSLevel.cc

    r3154 r3173  
    3030#include "GSLevel.h"
    3131
     32#include "util/Debug.h"
    3233#include "core/input/InputManager.h"
    3334#include "core/input/SimpleInputState.h"
    3435#include "core/input/KeyBinder.h"
    35 #include "core/Loader.h"
    36 #include "core/XMLFile.h"
    37 #include "core/CommandExecutor.h"
     36#include "core/Clock.h"
     37#include "core/CommandLine.h"
    3838#include "core/ConsoleCommand.h"
    39 #include "core/CommandLine.h"
    4039#include "core/ConfigValueIncludes.h"
    41 #include "core/Core.h"
    42 #include "core/CoreIncludes.h"
    4340#include "core/Game.h"
    4441#include "core/GameMode.h"
     42#include "core/Loader.h"
     43#include "core/ObjectList.h"
     44#include "core/XMLFile.h"
     45
     46#include "objects/Radar.h"
    4547#include "objects/Tickable.h"
    46 #include "objects/Radar.h"
     48#include "objects/quest/QuestManager.h"
     49#include "overlays/notifications/NotificationManager.h"
     50#include "gui/GUIManager.h"
    4751#include "CameraManager.h"
    4852#include "GraphicsManager.h"
    4953#include "LevelManager.h"
    5054#include "PlayerManager.h"
    51 #include "gui/GUIManager.h"
    52 #include "objects/quest/QuestManager.h"
    53 #include "overlays/notifications/NotificationManager.h"
    5455
    5556namespace orxonox

  • code/branches/pch/src/orxonox/gamestates/GSLevel.h

    r3008 r3173  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <string>
    3335#include "core/OrxonoxClass.h"
    3436#include "core/GameState.h"
    … …  
    4850
    4951        static void showIngameGUI(bool show);
    50         static void setLevel(std::string levelName);
    5152
    5253        static XMLFile* startFile_s;
    … …  
    6970        LevelManager*         levelManager_;            //!< global level manager
    7071        PlayerManager*        playerManager_;           //!< player manager for this level
    71         QuestManager*          questManager_;
     72        QuestManager*         questManager_;
    7273        NotificationManager*  notificationManager_;
    7374

  • code/branches/pch/src/orxonox/gamestates/GSMainMenu.cc

    r3110 r3173  
    2929#include "GSMainMenu.h"
    3030
    31 //#include <OgreViewport.h>
    3231#include <OgreSceneManager.h>
     32
     33#include "core/input/InputManager.h"
     34#include "core/input/SimpleInputState.h"
     35#include "core/Game.h"
    3336#include "core/Clock.h"
    3437#include "core/ConsoleCommand.h"
    35 #include "core/Game.h"
    36 #include "core/input/InputManager.h"
    37 #include "core/input/SimpleInputState.h"
     38#include "objects/Scene.h"
    3839#include "gui/GUIManager.h"
    39 #include "objects/Scene.h"
     40#include "sound/SoundMainMenu.h"
    4041#include "GraphicsManager.h"
    41 #include "sound/SoundMainMenu.h"
    4242
    4343namespace orxonox

  • code/branches/pch/src/orxonox/gamestates/GSMainMenu.h

    r3094 r3173  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include <OgrePrerequisites.h>
    3435#include "core/GameState.h"

  • code/branches/pch/src/orxonox/gamestates/GSRoot.cc

    r3149 r3173  
    2929#include "GSRoot.h"
    3030
    31 #include "util/Debug.h"
    3231#include "core/Clock.h"
     32#include "core/CommandLine.h"
     33#include "core/ConsoleCommand.h"
    3334#include "core/Game.h"
    3435#include "core/GameMode.h"
    35 #include "core/CommandLine.h"
    36 #include "core/ConsoleCommand.h"
    3736#include "tools/TimeFactorListener.h"
    3837#include "tools/Timer.h"

  • code/branches/pch/src/orxonox/gamestates/GSRoot.h

    r3084 r3173  
    3232#include "OrxonoxPrereqs.h"
    3333#include "core/GameState.h"
    34 #include "core/OrxonoxClass.h"
    3534
    3635namespace orxonox

  • code/branches/pch/src/orxonox/gamestates/GSServer.h

    r2896 r3173  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include "core/GameState.h"
    3435#include "network/NetworkPrereqs.h"

  • code/branches/pch/src/orxonox/gamestates/GSStandalone.cc

    r3110 r3173  
    2929#include "GSStandalone.h"
    3030
    31 #include <OgreViewport.h>
    32 #include <OgreCamera.h>
    3331#include "core/Game.h"
    3432#include "core/GameMode.h"
    35 #include "core/ConsoleCommand.h"
    36 #include "gui/GUIManager.h"
    37 #include "GraphicsManager.h"
    3833
    3934namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.