Changeset 1062 for code/trunk/src
- Timestamp:
- Apr 14, 2008, 5:50:25 PM (17 years ago)
- Location:
- code/trunk/src
- Files:
-
- 93 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/audio/AudioPrereqs.h
r1056 r1062 35 35 #define _AudioPrereqs_H__ 36 36 37 #include " orxonox/OrxonoxPlatform.h"37 #include "OrxonoxPlatform.h" 38 38 39 39 //----------------------------------------------------------------------- -
code/trunk/src/core/BaseObject.cc
r1056 r1062 32 32 */ 33 33 34 #include "BaseObject.h" 34 35 #include "util/tinyxml/tinyxml.h" 35 36 #include "core/CoreIncludes.h" 37 #include "BaseObject.h" 36 #include "CoreIncludes.h" 38 37 #include "XMLPort.h" 39 38 #include "Level.h" -
code/trunk/src/core/BaseObject.h
r1056 r1062 38 38 39 39 #include "CorePrereqs.h" 40 40 41 #include "util/XMLIncludes.h" 41 42 42 #include "OrxonoxClass.h" 43 43 -
code/trunk/src/core/ClassFactory.h
r1056 r1062 37 37 #define _ClassFactory_H__ 38 38 39 #include "CorePrereqs.h" 40 39 41 #include <string> 40 41 #include "CorePrereqs.h"42 42 43 43 #include "Factory.h" -
code/trunk/src/core/ClassManager.h
r1056 r1062 43 43 #define _ClassManager_H__ 44 44 45 #include "CorePrereqs.h" 46 45 47 #include <string> 46 48 47 49 #include "Identifier.h" 48 50 #include "IdentifierDistributor.h" 49 50 #include "CorePrereqs.h"51 51 52 52 namespace orxonox -
code/trunk/src/core/ClassTreeMask.h
r1056 r1062 71 71 #define _ClassTreeMask_H__ 72 72 73 #include "CorePrereqs.h" 74 73 75 #include <list> 74 76 #include <stack> 75 76 #include "CorePrereqs.h"77 77 78 78 namespace orxonox -
code/trunk/src/core/CommandExecutor.h
r1056 r1062 30 30 #define _CommandExecutor_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <string> 33 35 #include <map> … … 36 38 #include "util/SubString.h" 37 39 #include "util/MultiTypeMath.h" 38 #include "CorePrereqs.h"39 40 40 41 #define COMMAND_EXECUTOR_CURSOR "$" -
code/trunk/src/core/ConfigFileManager.h
r1056 r1062 30 30 #define _ConfigFileManager_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <iostream> 33 35 #include <string> … … 36 38 37 39 #include "util/Math.h" 38 39 #include "CorePrereqs.h"40 40 41 41 #define DEFAULT_CONFIG_FILE "default.ini" -
code/trunk/src/core/ConfigValueContainer.cc
r1056 r1062 32 32 */ 33 33 34 #include "ConfigValueContainer.h" 35 34 36 #include <fstream> 35 37 36 #include "ConfigValueContainer.h" 38 #include "util/SubString.h" 39 #include "util/Convert.h" 37 40 #include "Language.h" 38 41 #include "Identifier.h" 39 #include "util/SubString.h"40 #include "util/Convert.h"41 42 42 43 #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 44 44 #define _ConfigValueContainer_H__ 45 45 46 #include "CorePrereqs.h" 47 46 48 #include <string> 47 49 #include <vector> 48 49 #include "CorePrereqs.h"50 50 51 51 #include "util/Math.h" -
code/trunk/src/core/ConfigValueIncludes.h
r1056 r1062 34 34 #ifndef _ConfigValueIncludes_H__ 35 35 #define _ConfigValueIncludes_H__ 36 37 #include "CorePrereqs.h" 36 38 37 39 #include "Identifier.h" -
code/trunk/src/core/ConsoleCommand.h
r1056 r1062 30 30 #define _ConsoleCommand_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include "Executor.h" 33 35 #include "ClassManager.h" -
code/trunk/src/core/CoreIncludes.h
r1056 r1062 40 40 #ifndef _CoreIncludes_H__ 41 41 #define _CoreIncludes_H__ 42 43 #include "CorePrereqs.h" 42 44 43 45 #include "Identifier.h" -
code/trunk/src/core/CorePrereqs.h
r1056 r1062 35 35 #define _CorePrereqs_H__ 36 36 37 #include "OrxonoxPlatform.h" 38 37 39 #include <string> 38 39 #include "OrxonoxPlatform.h"40 40 41 41 //----------------------------------------------------------------------- -
code/trunk/src/core/CoreSettings.h
r1058 r1062 38 38 #define _CoreSettings_H__ 39 39 40 #include "CorePrereqs.h" 41 40 42 #include "OrxonoxClass.h" 41 43 #include "OutputHandler.h" 42 43 #include "CorePrereqs.h"44 44 45 45 namespace orxonox -
code/trunk/src/core/Debug.h
r1056 r1062 37 37 #define _Debug_H__ 38 38 39 #include "CorePrereqs.h" 40 39 41 #include <stdio.h> 40 41 #include "CorePrereqs.h"42 42 43 43 #include "OutputHandler.h" -
code/trunk/src/core/Error.cc
r1056 r1062 32 32 */ 33 33 34 #include "Error.h" 34 35 #include "Debug.h" 35 #include "Error.h"36 36 37 37 namespace orxonox -
code/trunk/src/core/Error.h
r1056 r1062 35 35 #define _Error_H__ 36 36 37 #include "CorePrereqs.h" 38 37 39 #include <string> 38 39 #include "CorePrereqs.h"40 40 41 41 namespace orxonox -
code/trunk/src/core/Executor.cc
r1056 r1062 29 29 30 30 #include "Executor.h" 31 #include "util/Math.h" 31 32 #include "Language.h" 32 #include "util/Math.h"33 33 34 34 namespace orxonox -
code/trunk/src/core/Executor.h
r1056 r1062 32 32 33 33 #include "CorePrereqs.h" 34 35 #include "util/SubString.h" 36 #include "util/String.h" 34 37 #include "Functor.h" 35 38 #include "Debug.h" 36 #include "util/SubString.h"37 #include "util/String.h"38 39 39 40 -
code/trunk/src/core/Factory.cc
r1056 r1062 32 32 */ 33 33 34 #include "Factory.h" 34 35 #include "Identifier.h" 35 36 #include "Debug.h" 36 37 #include "BaseObject.h" 37 #include "Factory.h"38 38 39 39 namespace orxonox -
code/trunk/src/core/Factory.h
r1056 r1062 45 45 #define _Factory_H__ 46 46 47 #include "CorePrereqs.h" 48 47 49 #include <map> 48 50 #include <string> 49 50 #include "CorePrereqs.h"51 51 52 52 namespace orxonox -
code/trunk/src/core/Functor.h
r1056 r1062 31 31 #define _Functor_H__ 32 32 33 #include "CorePrereqs.h" 34 33 35 #include "util/MultiTypeMath.h" 34 36 #include "Debug.h" 35 36 #include "CorePrereqs.h"37 37 38 38 #define MAX_FUNCTOR_ARGUMENTS 5 -
code/trunk/src/core/Identifier.cc
r1060 r1062 32 32 */ 33 33 34 #include "Identifier.h" 35 34 36 #include <ostream> 35 37 36 #include "Identifier.h"37 38 #include "Factory.h" 38 39 #include "Executor.h" -
code/trunk/src/core/Identifier.h
r1056 r1062 53 53 #define _Identifier_H__ 54 54 55 #include "CorePrereqs.h" 56 55 57 #include <set> 56 58 #include <map> 57 59 #include <string> 58 60 #include <utility> 59 60 #include "CorePrereqs.h"61 61 62 62 #include "ObjectList.h" -
code/trunk/src/core/IdentifierDistributor.h
r1056 r1062 39 39 #define _IdentifierDistributor_H__ 40 40 41 #include "CorePrereqs.h" 42 41 43 #include <map> 42 43 #include "CorePrereqs.h"44 44 45 45 namespace orxonox -
code/trunk/src/core/InputBuffer.cc
r1056 r1062 27 27 */ 28 28 29 #include "InputBuffer.h" 30 29 31 #include <iostream> 30 32 31 #include " InputBuffer.h"33 #include "util/Clipboard.h" 32 34 #include "InputManager.h" 33 #include "util/Clipboard.h"34 35 35 36 namespace orxonox -
code/trunk/src/core/InputBuffer.h
r1056 r1062 30 30 #define _InputBuffer_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <string> 33 35 #include <list> … … 38 40 #include <OISKeyboard.h> 39 41 #endif 40 41 #include "CorePrereqs.h"42 42 43 43 namespace orxonox -
code/trunk/src/core/InputEventListener.cc
r1056 r1062 32 32 */ 33 33 34 #include "core/CoreIncludes.h"35 34 #include "InputEventListener.h" 35 #include "CoreIncludes.h" 36 36 37 37 namespace orxonox -
code/trunk/src/core/InputEventListener.h
r1056 r1062 37 37 #include "CorePrereqs.h" 38 38 39 #include " core/OrxonoxClass.h"39 #include "OrxonoxClass.h" 40 40 #include "InputEvent.h" 41 41 -
code/trunk/src/core/InputHandler.cc
r1056 r1062 32 32 */ 33 33 34 #include "InputHandler.h" 34 35 #include "Debug.h" 35 36 #include "util/Convert.h" 36 37 #include "InputEventListener.h" 37 38 #include "InputEvent.h" 38 #include "InputHandler.h"39 39 40 40 namespace orxonox -
code/trunk/src/core/InputHandler.h
r1056 r1062 35 35 #define _InputHandler_H__ 36 36 37 #include "CorePrereqs.h" 38 37 39 #include <string> 38 39 40 #include <OIS/OIS.h> 40 41 41 #include "CorePrereqs.h"42 42 #include "InputEvent.h" 43 43 -
code/trunk/src/core/InputManager.cc
r1056 r1062 33 33 */ 34 34 35 #include "core/CoreIncludes.h" 36 #include "core/Debug.h" 35 #include "InputManager.h" 36 #include "CoreIncludes.h" 37 #include "Debug.h" 37 38 #include "InputEventListener.h" 38 39 #include "InputHandler.h" 39 #include "InputManager.h"40 40 41 41 namespace orxonox -
code/trunk/src/core/InputManager.h
r1056 r1062 36 36 #define _InputManager_H__ 37 37 38 #include "CorePrereqs.h" 39 38 40 #include <OIS/OIS.h> 39 41 40 #include "CorePrereqs.h" 41 #include "core/Tickable.h" 42 #include "Tickable.h" 42 43 #include "InputEvent.h" 43 44 -
code/trunk/src/core/Language.cc
r1056 r1062 32 32 */ 33 33 34 #include "Language.h" 35 34 36 #include <fstream> 35 37 36 #include "Language.h"37 38 #include "CoreSettings.h" 38 39 -
code/trunk/src/core/Language.h
r1056 r1062 46 46 #define _Language_H__ 47 47 48 #include "CorePrereqs.h" 49 48 50 #include <map> 49 51 #include <string> 50 51 #include "CorePrereqs.h"52 52 53 53 -
code/trunk/src/core/Level.h
r1056 r1062 30 30 #define _Level_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <string> 33 35 34 #include "CorePrereqs.h"35 36 #include "ClassTreeMask.h" 36 37 -
code/trunk/src/core/Loader.h
r1056 r1062 30 30 #define _Loader_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <vector> 33 35 34 36 #include "ClassTreeMask.h" 35 37 #include "Level.h" 36 37 #include "CorePrereqs.h"38 38 39 39 namespace orxonox -
code/trunk/src/core/Namespace.cc
r1056 r1062 28 28 29 29 #include "Namespace.h" 30 #include "NamespaceNode.h" 30 31 #include "CoreIncludes.h" 31 32 #include "XMLPort.h" 32 33 #include "util/SubString.h" 33 #include "NamespaceNode.h"34 34 35 35 namespace orxonox -
code/trunk/src/core/Namespace.h
r1056 r1062 30 30 #define _Namespace_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <map> 33 35 36 #include "util/XMLIncludes.h" 34 37 #include "BaseObject.h" 35 #include "util/XMLIncludes.h"36 37 #include "CorePrereqs.h"38 38 39 39 namespace orxonox -
code/trunk/src/core/NamespaceNode.h
r1056 r1062 30 30 #define _NamespaceNode_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <map> 33 35 #include <set> 34 36 #include <string> 35 36 #include "CorePrereqs.h"37 37 38 38 namespace orxonox -
code/trunk/src/core/ObjectList.h
r1056 r1062 40 40 41 41 #include "CorePrereqs.h" 42 42 43 #include "Iterator.h" 43 44 #include "ClassManager.h" -
code/trunk/src/core/OrxonoxClass.h
r1056 r1062 38 38 #define _OrxonoxClass_H__ 39 39 40 #include "CorePrereqs.h" 41 40 42 #include <set> 41 43 #include <string> 42 44 43 #include "CorePrereqs.h"44 45 #include "MetaObjectList.h" 45 46 #include "Iterator.h" -
code/trunk/src/core/OutputHandler.cc
r1056 r1062 32 32 */ 33 33 34 #include "OutputHandler.h" 34 35 #include "CoreSettings.h" 35 #include "OutputHandler.h"36 36 #include "ConsoleCommand.h" 37 37 -
code/trunk/src/core/OutputHandler.h
r1056 r1062 38 38 #define _OutputHandler_H__ 39 39 40 #include "CorePrereqs.h" 41 40 42 #include <iostream> 41 43 #include <fstream> 42 44 #include <string> 43 44 #include "CorePrereqs.h"45 45 46 46 namespace orxonox -
code/trunk/src/core/SignalHandler.cc
r1056 r1062 32 32 */ 33 33 34 #include "SignalHandler.h" 35 34 36 #include <assert.h> 35 37 36 38 #include "Debug.h" 37 #include "SignalHandler.h"38 39 39 40 SignalHandler * SignalHandler::singletonRef = NULL; -
code/trunk/src/core/SignalHandler.h
r1056 r1062 35 35 #define _SignalHandler_H__ 36 36 37 #include "CorePrereqs.h" 38 37 39 #include <list> 38 40 #include <string> 39 40 #include "CorePrereqs.h"41 41 42 42 typedef int (*SignalCallback)( void * someData ); -
code/trunk/src/core/Tickable.cc
r1056 r1062 27 27 */ 28 28 29 #include "core/CoreIncludes.h"30 #include "core/ConsoleCommand.h"31 29 #include "Tickable.h" 30 #include "CoreIncludes.h" 31 #include "ConsoleCommand.h" 32 32 33 33 namespace orxonox -
code/trunk/src/core/Tickable.h
r1056 r1062 43 43 44 44 #include "CorePrereqs.h" 45 #include "core/OrxonoxClass.h" 45 46 #include "OrxonoxClass.h" 46 47 47 48 namespace orxonox -
code/trunk/src/core/ToLuaBind.h
r1048 r1062 4 4 */ 5 5 6 #include "CorePrereqs.h" 7 6 8 /* Exported function */ 7 9 TOLUA_API int tolua_orxonox_open (lua_State* tolua_S); -
code/trunk/src/core/XMLPort.h
r1059 r1062 29 29 #ifndef _XMLPort_H__ 30 30 #define _XMLPort_H__ 31 32 #include "CorePrereqs.h" 31 33 32 34 #include "util/XMLIncludes.h" … … 37 39 #include "CoreIncludes.h" 38 40 #include "BaseObject.h" 39 40 #include "CorePrereqs.h"41 41 42 42 -
code/trunk/src/network/Client.cc
r1056 r1062 39 39 // 40 40 41 #include "Client.h" 41 42 #include "core/CoreIncludes.h" 42 #include "Client.h"43 43 44 44 namespace network -
code/trunk/src/network/Client.h
r1056 r1062 42 42 #define _Client_H__ 43 43 44 #include "NetworkPrereqs.h" 45 44 46 #include <string> 45 46 #include "NetworkPrereqs.h"47 47 48 48 #include "core/Tickable.h" -
code/trunk/src/network/ClientConnection.cc
r1056 r1062 38 38 // 39 39 40 #include "ClientConnection.h" 41 40 42 #include <iostream> 41 43 // boost.thread library for multithreading support … … 45 47 #include "util/Sleep.h" 46 48 #include "core/Debug.h" 47 #include "ClientConnection.h"48 49 49 50 namespace network -
code/trunk/src/network/ClientConnection.h
r1056 r1062 41 41 #define _ClientConnection_H__ 42 42 43 #include "NetworkPrereqs.h" 44 43 45 #include <string> 44 46 #include <enet/enet.h> 45 47 46 #include "NetworkPrereqs.h"47 48 #include "PacketBuffer.h" 48 49 -
code/trunk/src/network/ClientInformation.cc
r1056 r1062 39 39 // 40 40 41 #include "ClientInformation.h" 42 41 43 #include <iostream> //debug 42 43 #include "ClientInformation.h"44 44 45 45 namespace network -
code/trunk/src/network/ClientInformation.h
r1056 r1062 41 41 #define _ClientInformation_H__ 42 42 43 #include "NetworkPrereqs.h" 44 43 45 #include <enet/enet.h> 44 45 #include "NetworkPrereqs.h"46 46 47 47 #define GAMESTATEID_INITIAL -1 -
code/trunk/src/network/ConnectionManager.h
r1056 r1062 41 41 #define _ConnectionManager_H__ 42 42 43 #include "NetworkPrereqs.h" 44 43 45 #include <string> 44 46 #include <map> … … 46 48 #include <enet/enet.h> 47 49 48 #include "NetworkPrereqs.h"49 50 #include "PacketBuffer.h" 50 51 #include "PacketManager.h" -
code/trunk/src/network/GameStateClient.cc
r1056 r1062 27 27 */ 28 28 29 #include "GameStateClient.h" 30 29 31 #include <zlib.h> 30 32 31 33 #include "core/CoreIncludes.h" 32 34 #include "Synchronisable.h" 33 #include "GameStateClient.h"34 35 35 36 namespace network -
code/trunk/src/network/GameStateClient.h
r1056 r1062 42 42 43 43 #include "NetworkPrereqs.h" 44 #include "core/CorePrereqs.h" 44 45 #include "GameStateManager.h" 45 46 -
code/trunk/src/network/GameStateManager.cc
r1056 r1062 39 39 // 40 40 41 #include "GameStateManager.h" 42 41 43 #include <utility> 42 44 #include <iostream> … … 44 46 45 47 #include "core/CoreIncludes.h" 46 47 48 #include "ClientInformation.h" 48 49 #include "Synchronisable.h" 49 #include "GameStateManager.h"50 50 51 51 namespace network -
code/trunk/src/network/GameStateManager.h
r1056 r1062 41 41 #define _GameStateManager_H__ 42 42 43 #include "NetworkPrereqs.h" 44 43 45 #include <map> 44 46 45 #include "NetworkPrereqs.h"46 47 #include "PacketTypes.h" 47 48 -
code/trunk/src/network/NetworkFrameListener.h
r1056 r1062 42 42 #define _NetworkFrameListener_H__ 43 43 44 #include "NetworkPrereqs.h" 45 44 46 #include <OgreFrameListener.h> 45 47 46 #include "NetworkPrereqs.h"47 48 #include "Server.h" 48 49 #include "Client.h" -
code/trunk/src/network/NetworkPrereqs.h
r1056 r1062 35 35 #define _NetworkPrereqs_H__ 36 36 37 #include " orxonox/OrxonoxPlatform.h"37 #include "OrxonoxPlatform.h" 38 38 39 39 //----------------------------------------------------------------------- -
code/trunk/src/network/PacketBuffer.cc
r1056 r1062 31 31 // Author Oliver Scheuss 32 32 33 #include "PacketBuffer.h" 34 33 35 #include <iostream> 34 36 #include <queue> … … 36 38 #include <boost/bind.hpp> 37 39 #include <boost/thread/mutex.hpp> 38 39 #include "PacketBuffer.h"40 40 41 41 namespace network -
code/trunk/src/network/PacketBuffer.h
r1056 r1062 42 42 #define _PacketBuffer_H__ 43 43 44 #include "NetworkPrereqs.h" 45 44 46 #include <enet/enet.h> 45 46 #include "NetworkPrereqs.h"47 47 48 48 namespace network -
code/trunk/src/network/PacketDecoder.cc
r1056 r1062 35 35 */ 36 36 37 #include <iostream>38 39 37 #include "PacketTypes.h" 40 38 #include "PacketManager.h" 39 40 #include <iostream> 41 41 42 #include "core/Debug.h" 42 43 -
code/trunk/src/network/PacketGenerator.cc
r1056 r1062 35 35 */ 36 36 37 #include "PacketManager.h" 38 #include "PacketTypes.h" 39 37 40 #include <iostream> 38 41 #include <list> … … 40 43 #include <cstring> 41 44 42 #include "PacketTypes.h"43 #include "PacketManager.h"44 45 45 46 namespace network -
code/trunk/src/network/PacketManager.h
r1056 r1062 30 30 #define _PacketManager_H__ 31 31 32 #include "NetworkPrereqs.h" 33 32 34 #include <string> 33 35 #include <enet/enet.h> 34 36 35 37 #include "core/CoreIncludes.h" 36 37 #include "NetworkPrereqs.h"38 38 39 39 #define CLIENTID_CLIENT -1 -
code/trunk/src/network/Server.cc
r1056 r1062 38 38 // 39 39 // 40 41 #include "Server.h" 40 42 41 43 #include <iostream> … … 47 49 //#include "NetworkFrameListener.h" 48 50 #include "util/Sleep.h" 49 #include "Server.h"50 51 51 52 -
code/trunk/src/network/Server.h
r1056 r1062 42 42 #define _Server_H__ 43 43 44 #include "NetworkPrereqs.h" 45 44 46 #include <string> 45 46 #include "NetworkPrereqs.h"47 47 48 48 #include "core/Tickable.h" -
code/trunk/src/network/Synchronisable.cc
r1056 r1062 39 39 // 40 40 41 #include "Synchronisable.h" 42 41 43 #include <string> 42 44 #include <iostream> 43 45 44 #include "Synchronisable.h"45 46 #include "core/CoreIncludes.h" 46 47 -
code/trunk/src/network/Synchronisable.h
r1056 r1062 41 41 #define _Synchronisable_H__ 42 42 43 #include "NetworkPrereqs.h" 44 43 45 #include <list> 44 45 #include "NetworkPrereqs.h"46 46 #include "core/OrxonoxClass.h" 47 47 -
code/trunk/src/network/dummyclient3.cc
r1056 r1062 27 27 */ 28 28 29 #include "Client.h" 30 29 31 #include <iostream> 30 32 #include <string> … … 33 35 #include "PacketManager.h" 34 36 #include "PacketTypes.h" 35 #include "Client.h"36 37 37 38 using namespace network; -
code/trunk/src/network/dummyserver3.cc
r1056 r1062 27 27 */ 28 28 29 #include "Server.h" 30 29 31 #include <iostream> 30 32 … … 32 34 #include "PacketManager.h" 33 35 #include "PacketTypes.h" 34 #include "Server.h"35 36 36 37 namespace network -
code/trunk/src/orxonox/GraphicsEngine.cc
r1056 r1062 133 133 134 134 // 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(); 140 140 COUT(4) << "*** GraphicsEngine: Ogre LogManager created/assigned" << std::endl; 141 141 142 142 // create our own log that we can listen to 143 Log *myLog;143 Ogre::Log *myLog; 144 144 if (this->ogreLogfile_ == "") 145 145 myLog = logger->createLog("ogre.log", true, false, true); … … 148 148 COUT(4) << "*** GraphicsEngine: Ogre Log created" << std::endl; 149 149 150 myLog->setLogDetail( LL_BOREME);151 myLog->addListener(this); */150 myLog->setLogDetail(Ogre::LL_BOREME); 151 myLog->addListener(this); 152 152 153 153 // Root will detect that we've already created a Log -
code/trunk/src/orxonox/Orxonox.cc
r1056 r1062 448 448 // Iterate through all Tickables and call their tick(dt) function 449 449 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 } 451 454 452 455 // don't forget to call _fireFrameStarted in ogre to make sure -
code/trunk/src/orxonox/objects/weapon/WeaponStation.h
r1056 r1062 31 31 #define _WeaponStation_H__ 32 32 33 #include "OrxonoxPrereqs.h" 34 33 35 #include <OgrePrerequisites.h> 34 35 #include "OrxonoxPrereqs.h"36 36 37 37 -
code/trunk/src/orxonox/tools/Timer.cc
r1056 r1062 28 28 29 29 #include "OrxonoxStableHeaders.h" 30 #include "Timer.h" 31 30 32 #include "core/Executor.h" 31 33 #include "core/CoreIncludes.h" 32 34 #include "core/ConsoleCommand.h" 33 35 #include "core/CommandExecutor.h" 34 #include "Timer.h"35 36 36 37 namespace orxonox -
code/trunk/src/util/ArgReader.cc
r1056 r1062 32 32 */ 33 33 34 #include "ArgReader.h" 35 34 36 #include <iostream> 35 36 #include "ArgReader.h"37 37 38 38 ArgReader::ArgReader(int argc, char** argv) -
code/trunk/src/util/ArgReader.h
r1056 r1062 36 36 #define _ArgReader_H__ 37 37 38 #include "UtilPrereqs.h" 39 38 40 #include <string> 39 40 #include "UtilPrereqs.h"41 41 42 42 class _UtilExport ArgReader -
code/trunk/src/util/Clipboard.h
r1056 r1062 30 30 #define _Clipboard_H__ 31 31 32 #include "UtilPrereqs.h" 33 32 34 #include <string> 33 34 #include "UtilPrereqs.h"35 35 36 36 -
code/trunk/src/util/Convert.h
r1056 r1062 35 35 #define _Convert_H__ 36 36 37 #include "UtilPrereqs.h" 38 37 39 #include <string> 38 40 #include <sstream> 39 41 40 #include "UtilPrereqs.h"41 42 #include "Math.h" 42 43 #include "SubString.h" -
code/trunk/src/util/Math.h
r1056 r1062 30 30 #define _Util_Math_H__ 31 31 32 #include "UtilPrereqs.h" 33 32 34 #include <ostream> 33 34 #include "UtilPrereqs.h"35 35 36 36 #include <OgreMath.h> -
code/trunk/src/util/MultiTypePrimitive.h
r1056 r1062 31 31 #define _MultiTypePrimitive_H__ 32 32 33 #include "UtilPrereqs.h" 34 33 35 #include <ostream> 34 35 #include "UtilPrereqs.h"36 36 37 37 #include "MultiType.h" -
code/trunk/src/util/MultiTypeString.h
r1056 r1062 31 31 #define _MultiTypeString_H__ 32 32 33 #include "UtilPrereqs.h" 34 33 35 #include <string> 34 36 #include <iostream> 35 #include "UtilPrereqs.h"36 37 37 38 #include "MultiTypePrimitive.h" -
code/trunk/src/util/Sleep.h
r1056 r1062 32 32 */ 33 33 34 #include " OrxonoxPlatform.h"34 #include "UtilPrereqs.h" 35 35 36 36 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 -
code/trunk/src/util/String.cc
r1056 r1062 27 27 */ 28 28 29 #include "String.h" 30 29 31 #include <cctype> 30 32 #include <iostream> 31 #include "String.h"32 33 33 34 /** -
code/trunk/src/util/String.h
r1056 r1062 30 30 #define _Util_String_H__ 31 31 32 #include "UtilPrereqs.h" 33 32 34 #include <string> 33 35 #include <sstream> 34 35 #include "UtilPrereqs.h"36 36 37 37 _UtilExport void strip(std::string* str); -
code/trunk/src/util/String2Number.h
r1056 r1062 30 30 #define _String2Number_H__ 31 31 32 #include "UtilPrereqs.h" 33 32 34 #include <string> 33 35 #include <sstream> … … 35 37 36 38 #include "core/Debug.h" 37 #include "UtilPrereqs.h"38 39 39 40 /** -
code/trunk/src/util/SubString.h
r1056 r1062 59 59 #define __SUBSTRING_H__ 60 60 61 #include "UtilPrereqs.h" 62 61 63 #include <vector> 62 64 #include <string> 63 64 #include "UtilPrereqs.h"65 65 66 66 //! A class that can load one string and split it in multipe ones -
code/trunk/src/util/UtilPrereqs.h
r1056 r1062 35 35 #define _UtilPrereqs_H__ 36 36 37 #include " orxonox/OrxonoxPlatform.h"37 #include "OrxonoxPlatform.h" 38 38 39 39 //----------------------------------------------------------------------- -
code/trunk/src/util/XMLIncludes.h
r1056 r1062 26 26 * 27 27 */ 28 29 #include "UtilPrereqs.h" 28 30 29 31 //-----------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.