Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1062 for code/trunk/src


Ignore:
Timestamp:
Apr 14, 2008, 5:50:25 PM (17 years ago)
Author:
rgrieder
Message:
  • changed header file inclusion order
Location:
code/trunk/src
Files:
93 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/audio/AudioPrereqs.h

    r1056 r1062  
    3535#define _AudioPrereqs_H__
    3636
    37 #include "orxonox/OrxonoxPlatform.h"
     37#include "OrxonoxPlatform.h"
    3838
    3939//-----------------------------------------------------------------------
  • code/trunk/src/core/BaseObject.cc

    r1056 r1062  
    3232*/
    3333
     34#include "BaseObject.h"
    3435#include "util/tinyxml/tinyxml.h"
    35 
    36 #include "core/CoreIncludes.h"
    37 #include "BaseObject.h"
     36#include "CoreIncludes.h"
    3837#include "XMLPort.h"
    3938#include "Level.h"
  • code/trunk/src/core/BaseObject.h

    r1056 r1062  
    3838
    3939#include "CorePrereqs.h"
     40
    4041#include "util/XMLIncludes.h"
    41 
    4242#include "OrxonoxClass.h"
    4343
  • code/trunk/src/core/ClassFactory.h

    r1056 r1062  
    3737#define _ClassFactory_H__
    3838
     39#include "CorePrereqs.h"
     40
    3941#include <string>
    40 
    41 #include "CorePrereqs.h"
    4242
    4343#include "Factory.h"
  • code/trunk/src/core/ClassManager.h

    r1056 r1062  
    4343#define _ClassManager_H__
    4444
     45#include "CorePrereqs.h"
     46
    4547#include <string>
    4648
    4749#include "Identifier.h"
    4850#include "IdentifierDistributor.h"
    49 
    50 #include "CorePrereqs.h"
    5151
    5252namespace orxonox
  • code/trunk/src/core/ClassTreeMask.h

    r1056 r1062  
    7171#define _ClassTreeMask_H__
    7272
     73#include "CorePrereqs.h"
     74
    7375#include <list>
    7476#include <stack>
    75 
    76 #include "CorePrereqs.h"
    7777
    7878namespace orxonox
  • code/trunk/src/core/CommandExecutor.h

    r1056 r1062  
    3030#define _CommandExecutor_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <string>
    3335#include <map>
     
    3638#include "util/SubString.h"
    3739#include "util/MultiTypeMath.h"
    38 #include "CorePrereqs.h"
    3940
    4041#define COMMAND_EXECUTOR_CURSOR "$"
  • code/trunk/src/core/ConfigFileManager.h

    r1056 r1062  
    3030#define _ConfigFileManager_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <iostream>
    3335#include <string>
     
    3638
    3739#include "util/Math.h"
    38 
    39 #include "CorePrereqs.h"
    4040
    4141#define DEFAULT_CONFIG_FILE "default.ini"
  • code/trunk/src/core/ConfigValueContainer.cc

    r1056 r1062  
    3232*/
    3333
     34#include "ConfigValueContainer.h"
     35
    3436#include <fstream>
    3537
    36 #include "ConfigValueContainer.h"
     38#include "util/SubString.h"
     39#include "util/Convert.h"
    3740#include "Language.h"
    3841#include "Identifier.h"
    39 #include "util/SubString.h"
    40 #include "util/Convert.h"
    4142
    4243#define MAX_VECTOR_INDEX 255 // to avoid up to 4*10^9 vector entries in the config file after accidentally using a wrong argument
  • code/trunk/src/core/ConfigValueContainer.h

    r1056 r1062  
    4444#define _ConfigValueContainer_H__
    4545
     46#include "CorePrereqs.h"
     47
    4648#include <string>
    4749#include <vector>
    48 
    49 #include "CorePrereqs.h"
    5050
    5151#include "util/Math.h"
  • code/trunk/src/core/ConfigValueIncludes.h

    r1056 r1062  
    3434#ifndef _ConfigValueIncludes_H__
    3535#define _ConfigValueIncludes_H__
     36
     37#include "CorePrereqs.h"
    3638
    3739#include "Identifier.h"
  • code/trunk/src/core/ConsoleCommand.h

    r1056 r1062  
    3030#define _ConsoleCommand_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include "Executor.h"
    3335#include "ClassManager.h"
  • code/trunk/src/core/CoreIncludes.h

    r1056 r1062  
    4040#ifndef _CoreIncludes_H__
    4141#define _CoreIncludes_H__
     42
     43#include "CorePrereqs.h"
    4244
    4345#include "Identifier.h"
  • code/trunk/src/core/CorePrereqs.h

    r1056 r1062  
    3535#define _CorePrereqs_H__
    3636
     37#include "OrxonoxPlatform.h"
     38
    3739#include <string>
    38 
    39 #include "OrxonoxPlatform.h"
    4040
    4141//-----------------------------------------------------------------------
  • code/trunk/src/core/CoreSettings.h

    r1058 r1062  
    3838#define _CoreSettings_H__
    3939
     40#include "CorePrereqs.h"
     41
    4042#include "OrxonoxClass.h"
    4143#include "OutputHandler.h"
    42 
    43 #include "CorePrereqs.h"
    4444
    4545namespace orxonox
  • code/trunk/src/core/Debug.h

    r1056 r1062  
    3737#define _Debug_H__
    3838
     39#include "CorePrereqs.h"
     40
    3941#include <stdio.h>
    40 
    41 #include "CorePrereqs.h"
    4242
    4343#include "OutputHandler.h"
  • code/trunk/src/core/Error.cc

    r1056 r1062  
    3232*/
    3333
     34#include "Error.h"
    3435#include "Debug.h"
    35 #include "Error.h"
    3636
    3737namespace orxonox
  • code/trunk/src/core/Error.h

    r1056 r1062  
    3535#define _Error_H__
    3636
     37#include "CorePrereqs.h"
     38
    3739#include <string>
    38 
    39 #include "CorePrereqs.h"
    4040
    4141namespace orxonox
  • code/trunk/src/core/Executor.cc

    r1056 r1062  
    2929
    3030#include "Executor.h"
     31#include "util/Math.h"
    3132#include "Language.h"
    32 #include "util/Math.h"
    3333
    3434namespace orxonox
  • code/trunk/src/core/Executor.h

    r1056 r1062  
    3232
    3333#include "CorePrereqs.h"
     34
     35#include "util/SubString.h"
     36#include "util/String.h"
    3437#include "Functor.h"
    3538#include "Debug.h"
    36 #include "util/SubString.h"
    37 #include "util/String.h"
    3839
    3940
  • code/trunk/src/core/Factory.cc

    r1056 r1062  
    3232*/
    3333
     34#include "Factory.h"
    3435#include "Identifier.h"
    3536#include "Debug.h"
    3637#include "BaseObject.h"
    37 #include "Factory.h"
    3838
    3939namespace orxonox
  • code/trunk/src/core/Factory.h

    r1056 r1062  
    4545#define _Factory_H__
    4646
     47#include "CorePrereqs.h"
     48
    4749#include <map>
    4850#include <string>
    49 
    50 #include "CorePrereqs.h"
    5151
    5252namespace orxonox
  • code/trunk/src/core/Functor.h

    r1056 r1062  
    3131#define _Functor_H__
    3232
     33#include "CorePrereqs.h"
     34
    3335#include "util/MultiTypeMath.h"
    3436#include "Debug.h"
    35 
    36 #include "CorePrereqs.h"
    3737
    3838#define MAX_FUNCTOR_ARGUMENTS 5
  • code/trunk/src/core/Identifier.cc

    r1060 r1062  
    3232*/
    3333
     34#include "Identifier.h"
     35
    3436#include <ostream>
    3537
    36 #include "Identifier.h"
    3738#include "Factory.h"
    3839#include "Executor.h"
  • code/trunk/src/core/Identifier.h

    r1056 r1062  
    5353#define _Identifier_H__
    5454
     55#include "CorePrereqs.h"
     56
    5557#include <set>
    5658#include <map>
    5759#include <string>
    5860#include <utility>
    59 
    60 #include "CorePrereqs.h"
    6161
    6262#include "ObjectList.h"
  • code/trunk/src/core/IdentifierDistributor.h

    r1056 r1062  
    3939#define _IdentifierDistributor_H__
    4040
     41#include "CorePrereqs.h"
     42
    4143#include <map>
    42 
    43 #include "CorePrereqs.h"
    4444
    4545namespace orxonox
  • code/trunk/src/core/InputBuffer.cc

    r1056 r1062  
    2727 */
    2828
     29#include "InputBuffer.h"
     30
    2931#include <iostream>
    3032
    31 #include "InputBuffer.h"
     33#include "util/Clipboard.h"
    3234#include "InputManager.h"
    33 #include "util/Clipboard.h"
    3435
    3536namespace orxonox
  • code/trunk/src/core/InputBuffer.h

    r1056 r1062  
    3030#define _InputBuffer_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <string>
    3335#include <list>
     
    3840#include <OISKeyboard.h>
    3941#endif
    40 
    41 #include "CorePrereqs.h"
    4242
    4343namespace orxonox
  • code/trunk/src/core/InputEventListener.cc

    r1056 r1062  
    3232 */
    3333
    34 #include "core/CoreIncludes.h"
    3534#include "InputEventListener.h"
     35#include "CoreIncludes.h"
    3636
    3737namespace orxonox
  • code/trunk/src/core/InputEventListener.h

    r1056 r1062  
    3737#include "CorePrereqs.h"
    3838
    39 #include "core/OrxonoxClass.h"
     39#include "OrxonoxClass.h"
    4040#include "InputEvent.h"
    4141
  • code/trunk/src/core/InputHandler.cc

    r1056 r1062  
    3232 */
    3333
     34#include "InputHandler.h"
    3435#include "Debug.h"
    3536#include "util/Convert.h"
    3637#include "InputEventListener.h"
    3738#include "InputEvent.h"
    38 #include "InputHandler.h"
    3939
    4040namespace orxonox
  • code/trunk/src/core/InputHandler.h

    r1056 r1062  
    3535#define _InputHandler_H__
    3636
     37#include "CorePrereqs.h"
     38
    3739#include <string>
    38 
    3940#include <OIS/OIS.h>
    4041
    41 #include "CorePrereqs.h"
    4242#include "InputEvent.h"
    4343
  • code/trunk/src/core/InputManager.cc

    r1056 r1062  
    3333 */
    3434
    35 #include "core/CoreIncludes.h"
    36 #include "core/Debug.h"
     35#include "InputManager.h"
     36#include "CoreIncludes.h"
     37#include "Debug.h"
    3738#include "InputEventListener.h"
    3839#include "InputHandler.h"
    39 #include "InputManager.h"
    4040
    4141namespace orxonox
  • code/trunk/src/core/InputManager.h

    r1056 r1062  
    3636#define _InputManager_H__
    3737
     38#include "CorePrereqs.h"
     39
    3840#include <OIS/OIS.h>
    3941
    40 #include "CorePrereqs.h"
    41 #include "core/Tickable.h"
     42#include "Tickable.h"
    4243#include "InputEvent.h"
    4344
  • code/trunk/src/core/Language.cc

    r1056 r1062  
    3232*/
    3333
     34#include "Language.h"
     35
    3436#include <fstream>
    3537
    36 #include "Language.h"
    3738#include "CoreSettings.h"
    3839
  • code/trunk/src/core/Language.h

    r1056 r1062  
    4646#define _Language_H__
    4747
     48#include "CorePrereqs.h"
     49
    4850#include <map>
    4951#include <string>
    50 
    51 #include "CorePrereqs.h"
    5252
    5353
  • code/trunk/src/core/Level.h

    r1056 r1062  
    3030#define _Level_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <string>
    3335
    34 #include "CorePrereqs.h"
    3536#include "ClassTreeMask.h"
    3637
  • code/trunk/src/core/Loader.h

    r1056 r1062  
    3030#define _Loader_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <vector>
    3335
    3436#include "ClassTreeMask.h"
    3537#include "Level.h"
    36 
    37 #include "CorePrereqs.h"
    3838
    3939namespace orxonox
  • code/trunk/src/core/Namespace.cc

    r1056 r1062  
    2828
    2929#include "Namespace.h"
     30#include "NamespaceNode.h"
    3031#include "CoreIncludes.h"
    3132#include "XMLPort.h"
    3233#include "util/SubString.h"
    33 #include "NamespaceNode.h"
    3434
    3535namespace orxonox
  • code/trunk/src/core/Namespace.h

    r1056 r1062  
    3030#define _Namespace_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <map>
    3335
     36#include "util/XMLIncludes.h"
    3437#include "BaseObject.h"
    35 #include "util/XMLIncludes.h"
    36 
    37 #include "CorePrereqs.h"
    3838
    3939namespace orxonox
  • code/trunk/src/core/NamespaceNode.h

    r1056 r1062  
    3030#define _NamespaceNode_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <map>
    3335#include <set>
    3436#include <string>
    35 
    36 #include "CorePrereqs.h"
    3737
    3838namespace orxonox
  • code/trunk/src/core/ObjectList.h

    r1056 r1062  
    4040
    4141#include "CorePrereqs.h"
     42
    4243#include "Iterator.h"
    4344#include "ClassManager.h"
  • code/trunk/src/core/OrxonoxClass.h

    r1056 r1062  
    3838#define _OrxonoxClass_H__
    3939
     40#include "CorePrereqs.h"
     41
    4042#include <set>
    4143#include <string>
    4244
    43 #include "CorePrereqs.h"
    4445#include "MetaObjectList.h"
    4546#include "Iterator.h"
  • code/trunk/src/core/OutputHandler.cc

    r1056 r1062  
    3232*/
    3333
     34#include "OutputHandler.h"
    3435#include "CoreSettings.h"
    35 #include "OutputHandler.h"
    3636#include "ConsoleCommand.h"
    3737
  • code/trunk/src/core/OutputHandler.h

    r1056 r1062  
    3838#define _OutputHandler_H__
    3939
     40#include "CorePrereqs.h"
     41
    4042#include <iostream>
    4143#include <fstream>
    4244#include <string>
    43 
    44 #include "CorePrereqs.h"
    4545
    4646namespace orxonox
  • code/trunk/src/core/SignalHandler.cc

    r1056 r1062  
    3232*/
    3333
     34#include "SignalHandler.h"
     35
    3436#include <assert.h>
    3537
    3638#include "Debug.h"
    37 #include "SignalHandler.h"
    3839
    3940SignalHandler * SignalHandler::singletonRef = NULL;
  • code/trunk/src/core/SignalHandler.h

    r1056 r1062  
    3535#define _SignalHandler_H__
    3636
     37#include "CorePrereqs.h"
     38
    3739#include <list>
    3840#include <string>
    39 
    40 #include "CorePrereqs.h"
    4141
    4242typedef int (*SignalCallback)( void * someData );
  • code/trunk/src/core/Tickable.cc

    r1056 r1062  
    2727 */
    2828
    29 #include "core/CoreIncludes.h"
    30 #include "core/ConsoleCommand.h"
    3129#include "Tickable.h"
     30#include "CoreIncludes.h"
     31#include "ConsoleCommand.h"
    3232
    3333namespace orxonox
  • code/trunk/src/core/Tickable.h

    r1056 r1062  
    4343
    4444#include "CorePrereqs.h"
    45 #include "core/OrxonoxClass.h"
     45
     46#include "OrxonoxClass.h"
    4647
    4748namespace orxonox
  • code/trunk/src/core/ToLuaBind.h

    r1048 r1062  
    44*/
    55
     6#include "CorePrereqs.h"
     7
    68/* Exported function */
    79TOLUA_API int  tolua_orxonox_open (lua_State* tolua_S);
  • code/trunk/src/core/XMLPort.h

    r1059 r1062  
    2929#ifndef _XMLPort_H__
    3030#define _XMLPort_H__
     31
     32#include "CorePrereqs.h"
    3133
    3234#include "util/XMLIncludes.h"
     
    3739#include "CoreIncludes.h"
    3840#include "BaseObject.h"
    39 
    40 #include "CorePrereqs.h"
    4141
    4242
  • code/trunk/src/network/Client.cc

    r1056 r1062  
    3939//
    4040
     41#include "Client.h"
    4142#include "core/CoreIncludes.h"
    42 #include "Client.h"
    4343
    4444namespace network
  • code/trunk/src/network/Client.h

    r1056 r1062  
    4242#define _Client_H__
    4343
     44#include "NetworkPrereqs.h"
     45
    4446#include <string>
    45 
    46 #include "NetworkPrereqs.h"
    4747
    4848#include "core/Tickable.h"
  • code/trunk/src/network/ClientConnection.cc

    r1056 r1062  
    3838//
    3939
     40#include "ClientConnection.h"
     41
    4042#include <iostream>
    4143// boost.thread library for multithreading support
     
    4547#include "util/Sleep.h"
    4648#include "core/Debug.h"
    47 #include "ClientConnection.h"
    4849
    4950namespace network
  • code/trunk/src/network/ClientConnection.h

    r1056 r1062  
    4141#define _ClientConnection_H__
    4242
     43#include "NetworkPrereqs.h"
     44
    4345#include <string>
    4446#include <enet/enet.h>
    4547
    46 #include "NetworkPrereqs.h"
    4748#include "PacketBuffer.h"
    4849
  • code/trunk/src/network/ClientInformation.cc

    r1056 r1062  
    3939//
    4040
     41#include "ClientInformation.h"
     42
    4143#include <iostream> //debug
    42 
    43 #include "ClientInformation.h"
    4444
    4545namespace network
  • code/trunk/src/network/ClientInformation.h

    r1056 r1062  
    4141#define _ClientInformation_H__
    4242
     43#include "NetworkPrereqs.h"
     44
    4345#include <enet/enet.h>
    44 
    45 #include "NetworkPrereqs.h"
    4646
    4747#define GAMESTATEID_INITIAL -1
  • code/trunk/src/network/ConnectionManager.h

    r1056 r1062  
    4141#define _ConnectionManager_H__
    4242
     43#include "NetworkPrereqs.h"
     44
    4345#include <string>
    4446#include <map>
     
    4648#include <enet/enet.h>
    4749
    48 #include "NetworkPrereqs.h"
    4950#include "PacketBuffer.h"
    5051#include "PacketManager.h"
  • code/trunk/src/network/GameStateClient.cc

    r1056 r1062  
    2727 */
    2828
     29#include "GameStateClient.h"
     30
    2931#include <zlib.h>
    3032
    3133#include "core/CoreIncludes.h"
    3234#include "Synchronisable.h"
    33 #include "GameStateClient.h"
    3435
    3536namespace network
  • code/trunk/src/network/GameStateClient.h

    r1056 r1062  
    4242
    4343#include "NetworkPrereqs.h"
     44#include "core/CorePrereqs.h"
    4445#include "GameStateManager.h"
    4546
  • code/trunk/src/network/GameStateManager.cc

    r1056 r1062  
    3939//
    4040
     41#include "GameStateManager.h"
     42
    4143#include <utility>
    4244#include <iostream>
     
    4446
    4547#include "core/CoreIncludes.h"
    46 
    4748#include "ClientInformation.h"
    4849#include "Synchronisable.h"
    49 #include "GameStateManager.h"
    5050
    5151namespace network
  • code/trunk/src/network/GameStateManager.h

    r1056 r1062  
    4141#define _GameStateManager_H__
    4242
     43#include "NetworkPrereqs.h"
     44
    4345#include <map>
    4446
    45 #include "NetworkPrereqs.h"
    4647#include "PacketTypes.h"
    4748
  • code/trunk/src/network/NetworkFrameListener.h

    r1056 r1062  
    4242#define _NetworkFrameListener_H__
    4343
     44#include "NetworkPrereqs.h"
     45
    4446#include <OgreFrameListener.h>
    4547
    46 #include "NetworkPrereqs.h"
    4748#include "Server.h"
    4849#include "Client.h"
  • code/trunk/src/network/NetworkPrereqs.h

    r1056 r1062  
    3535#define _NetworkPrereqs_H__
    3636
    37 #include "orxonox/OrxonoxPlatform.h"
     37#include "OrxonoxPlatform.h"
    3838
    3939//-----------------------------------------------------------------------
  • code/trunk/src/network/PacketBuffer.cc

    r1056 r1062  
    3131// Author Oliver Scheuss
    3232
     33#include "PacketBuffer.h"
     34
    3335#include <iostream>
    3436#include <queue>
     
    3638#include <boost/bind.hpp>
    3739#include <boost/thread/mutex.hpp>
    38 
    39 #include "PacketBuffer.h"
    4040
    4141namespace network
  • code/trunk/src/network/PacketBuffer.h

    r1056 r1062  
    4242#define _PacketBuffer_H__
    4343
     44#include "NetworkPrereqs.h"
     45
    4446#include <enet/enet.h>
    45 
    46 #include "NetworkPrereqs.h"
    4747
    4848namespace network
  • code/trunk/src/network/PacketDecoder.cc

    r1056 r1062  
    3535*/
    3636
    37 #include <iostream>
    38 
    3937#include "PacketTypes.h"
    4038#include "PacketManager.h"
     39
     40#include <iostream>
     41
    4142#include "core/Debug.h"
    4243
  • code/trunk/src/network/PacketGenerator.cc

    r1056 r1062  
    3535*/
    3636
     37#include "PacketManager.h"
     38#include "PacketTypes.h"
     39
    3740#include <iostream>
    3841#include <list>
     
    4043#include <cstring>
    4144
    42 #include "PacketTypes.h"
    43 #include "PacketManager.h"
    4445
    4546namespace network
  • code/trunk/src/network/PacketManager.h

    r1056 r1062  
    3030#define _PacketManager_H__
    3131
     32#include "NetworkPrereqs.h"
     33
    3234#include <string>
    3335#include <enet/enet.h>
    3436
    3537#include "core/CoreIncludes.h"
    36 
    37 #include "NetworkPrereqs.h"
    3838
    3939#define CLIENTID_CLIENT -1
  • code/trunk/src/network/Server.cc

    r1056 r1062  
    3838//
    3939//
     40
     41#include "Server.h"
    4042
    4143#include <iostream>
     
    4749//#include "NetworkFrameListener.h"
    4850#include "util/Sleep.h"
    49 #include "Server.h"
    5051
    5152
  • code/trunk/src/network/Server.h

    r1056 r1062  
    4242#define _Server_H__
    4343
     44#include "NetworkPrereqs.h"
     45
    4446#include <string>
    45 
    46 #include "NetworkPrereqs.h"
    4747
    4848#include "core/Tickable.h"
  • code/trunk/src/network/Synchronisable.cc

    r1056 r1062  
    3939//
    4040
     41#include "Synchronisable.h"
     42
    4143#include <string>
    4244#include <iostream>
    4345
    44 #include "Synchronisable.h"
    4546#include "core/CoreIncludes.h"
    4647
  • code/trunk/src/network/Synchronisable.h

    r1056 r1062  
    4141#define _Synchronisable_H__
    4242
     43#include "NetworkPrereqs.h"
     44
    4345#include <list>
    44 
    45 #include "NetworkPrereqs.h"
    4646#include "core/OrxonoxClass.h"
    4747
  • code/trunk/src/network/dummyclient3.cc

    r1056 r1062  
    2727 */
    2828
     29#include "Client.h"
     30
    2931#include <iostream>
    3032#include <string>
     
    3335#include "PacketManager.h"
    3436#include "PacketTypes.h"
    35 #include "Client.h"
    3637
    3738using namespace network;
  • code/trunk/src/network/dummyserver3.cc

    r1056 r1062  
    2727 */
    2828
     29#include "Server.h"
     30
    2931#include <iostream>
    3032
     
    3234#include "PacketManager.h"
    3335#include "PacketTypes.h"
    34 #include "Server.h"
    3536
    3637namespace network
  • code/trunk/src/orxonox/GraphicsEngine.cc

    r1056 r1062  
    133133
    134134    // create a logManager
    135     /*LogManager *logger;
    136                 if(LogManager::getSingletonPtr() == 0)
    137                         logger = new LogManager();
    138     else
    139       logger = LogManager::getSingletonPtr();
     135    Ogre::LogManager *logger;
     136                if (Ogre::LogManager::getSingletonPtr() == 0)
     137                        logger = new Ogre::LogManager();
     138    else
     139      logger = Ogre::LogManager::getSingletonPtr();
    140140    COUT(4) << "*** GraphicsEngine: Ogre LogManager created/assigned" << std::endl;
    141141
    142142    // create our own log that we can listen to
    143     Log *myLog;
     143    Ogre::Log *myLog;
    144144    if (this->ogreLogfile_ == "")
    145145      myLog = logger->createLog("ogre.log", true, false, true);
     
    148148    COUT(4) << "*** GraphicsEngine: Ogre Log created" << std::endl;
    149149
    150     myLog->setLogDetail(LL_BOREME);
    151     myLog->addListener(this);*/
     150    myLog->setLogDetail(Ogre::LL_BOREME);
     151    myLog->addListener(this);
    152152
    153153    // Root will detect that we've already created a Log
  • code/trunk/src/orxonox/Orxonox.cc

    r1056 r1062  
    448448      // Iterate through all Tickables and call their tick(dt) function
    449449      for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; )
    450         (it++)->tick((float)evt.timeSinceLastFrame * this->timefactor_);
     450      {
     451        (it)->tick((float)evt.timeSinceLastFrame * this->timefactor_);
     452         it++;
     453     }
    451454
    452455      // don't forget to call _fireFrameStarted in ogre to make sure
  • code/trunk/src/orxonox/objects/weapon/WeaponStation.h

    r1056 r1062  
    3131#define _WeaponStation_H__
    3232
     33#include "OrxonoxPrereqs.h"
     34
    3335#include <OgrePrerequisites.h>
    34 
    35 #include "OrxonoxPrereqs.h"
    3636
    3737
  • code/trunk/src/orxonox/tools/Timer.cc

    r1056 r1062  
    2828
    2929#include "OrxonoxStableHeaders.h"
     30#include "Timer.h"
     31
    3032#include "core/Executor.h"
    3133#include "core/CoreIncludes.h"
    3234#include "core/ConsoleCommand.h"
    3335#include "core/CommandExecutor.h"
    34 #include "Timer.h"
    3536
    3637namespace orxonox
  • code/trunk/src/util/ArgReader.cc

    r1056 r1062  
    3232 */
    3333
     34#include "ArgReader.h"
     35
    3436#include <iostream>
    35 
    36 #include "ArgReader.h"
    3737
    3838ArgReader::ArgReader(int argc, char** argv)
  • code/trunk/src/util/ArgReader.h

    r1056 r1062  
    3636#define _ArgReader_H__
    3737
     38#include "UtilPrereqs.h"
     39
    3840#include <string>
    39 
    40 #include "UtilPrereqs.h"
    4141
    4242class _UtilExport ArgReader
  • code/trunk/src/util/Clipboard.h

    r1056 r1062  
    3030#define _Clipboard_H__
    3131
     32#include "UtilPrereqs.h"
     33
    3234#include <string>
    33 
    34 #include "UtilPrereqs.h"
    3535
    3636
  • code/trunk/src/util/Convert.h

    r1056 r1062  
    3535#define _Convert_H__
    3636
     37#include "UtilPrereqs.h"
     38
    3739#include <string>
    3840#include <sstream>
    3941
    40 #include "UtilPrereqs.h"
    4142#include "Math.h"
    4243#include "SubString.h"
  • code/trunk/src/util/Math.h

    r1056 r1062  
    3030#define _Util_Math_H__
    3131
     32#include "UtilPrereqs.h"
     33
    3234#include <ostream>
    33 
    34 #include "UtilPrereqs.h"
    3535
    3636#include <OgreMath.h>
  • code/trunk/src/util/MultiTypePrimitive.h

    r1056 r1062  
    3131#define _MultiTypePrimitive_H__
    3232
     33#include "UtilPrereqs.h"
     34
    3335#include <ostream>
    34 
    35 #include "UtilPrereqs.h"
    3636
    3737#include "MultiType.h"
  • code/trunk/src/util/MultiTypeString.h

    r1056 r1062  
    3131#define _MultiTypeString_H__
    3232
     33#include "UtilPrereqs.h"
     34
    3335#include <string>
    3436#include <iostream>
    35 #include "UtilPrereqs.h"
    3637
    3738#include "MultiTypePrimitive.h"
  • code/trunk/src/util/Sleep.h

    r1056 r1062  
    3232 */
    3333
    34 #include "OrxonoxPlatform.h"
     34#include "UtilPrereqs.h"
    3535
    3636#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
  • code/trunk/src/util/String.cc

    r1056 r1062  
    2727 */
    2828
     29#include "String.h"
     30
    2931#include <cctype>
    3032#include <iostream>
    31 #include "String.h"
    3233
    3334/**
  • code/trunk/src/util/String.h

    r1056 r1062  
    3030#define _Util_String_H__
    3131
     32#include "UtilPrereqs.h"
     33
    3234#include <string>
    3335#include <sstream>
    34 
    35 #include "UtilPrereqs.h"
    3636
    3737_UtilExport void         strip(std::string* str);
  • code/trunk/src/util/String2Number.h

    r1056 r1062  
    3030#define _String2Number_H__
    3131
     32#include "UtilPrereqs.h"
     33
    3234#include <string>
    3335#include <sstream>
     
    3537
    3638#include "core/Debug.h"
    37 #include "UtilPrereqs.h"
    3839
    3940/**
  • code/trunk/src/util/SubString.h

    r1056 r1062  
    5959#define __SUBSTRING_H__
    6060
     61#include "UtilPrereqs.h"
     62
    6163#include <vector>
    6264#include <string>
    63 
    64 #include "UtilPrereqs.h"
    6565
    6666//! A class that can load one string and split it in multipe ones
  • code/trunk/src/util/UtilPrereqs.h

    r1056 r1062  
    3535#define _UtilPrereqs_H__
    3636
    37 #include "orxonox/OrxonoxPlatform.h"
     37#include "OrxonoxPlatform.h"
    3838
    3939//-----------------------------------------------------------------------
  • code/trunk/src/util/XMLIncludes.h

    r1056 r1062  
    2626 *
    2727 */
     28
     29#include "UtilPrereqs.h"
    2830
    2931//-----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.