Changeset 673

Timestamp:

Dec 22, 2007, 10:15:06 PM (17 years ago)

Author:

rgrieder

Message:

• deleted obsolete classes: BaseEntity, Entity, Light and SceneNode (please complain if not agreed)
• improved include guard naming consistency

Location:

code/branches/FICN

Files:

• FICN.sln (modified) (2 diffs)
• benixonox.vcproj (modified) (9 diffs)
• src/audio/AudioBuffer.h (modified) (2 diffs)
• src/audio/AudioManager.h (modified) (2 diffs)
• src/audio/AudioSource.h (modified) (2 diffs)
• src/audio/AudioStream.h (modified) (2 diffs)
• src/loader/LevelLoader.h (modified) (5 diffs)
• src/loader/loader_platform.h (modified) (2 diffs)
• src/network/Client.h (modified) (2 diffs)
• src/network/ClientConnection.h (modified) (2 diffs)
• src/network/ClientInformation.h (modified) (2 diffs)
• src/network/ConnectionManager.h (modified) (2 diffs)
• src/network/GameStateClient.h (modified) (2 diffs)
• src/network/GameStateManager.h (modified) (2 diffs)
• src/network/NetworkFrameListener.h (modified) (2 diffs)
• src/network/PacketBuffer.h (modified) (2 diffs)
• src/network/PacketManager.h (modified) (2 diffs)
• src/network/PacketTypes.h (modified) (2 diffs)
• src/network/Server.h (modified) (2 diffs)
• src/network/Synchronisable.h (modified) (2 diffs)
• src/orxonox/AIClass.h (modified) (3 diffs)
• src/orxonox/Arrival.h (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/Flocking.h (modified) (3 diffs)
• src/orxonox/GraphicsEngine.h (modified) (2 diffs)
• src/orxonox/InputManager.h (modified) (2 diffs)
• src/orxonox/Orxonox.cc (modified) (2 diffs)
• src/orxonox/Orxonox.h (modified) (2 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
• src/orxonox/SpaceshipSteering.h (modified) (2 diffs)
• src/orxonox/core/ArgReader.h (modified) (2 diffs)
• src/orxonox/core/ClassFactory.h (modified) (1 diff)
• src/orxonox/core/ConfigValueContainer.h (modified) (1 diff)
• src/orxonox/core/DebugLevel.h (modified) (1 diff)
• src/orxonox/core/Error.h (modified) (2 diffs)
• src/orxonox/core/Factory.h (modified) (1 diff)
• src/orxonox/core/Identifier.h (modified) (1 diff)
• src/orxonox/core/IdentifierList.h (modified) (1 diff)
• src/orxonox/core/Iterator.h (modified) (1 diff)
• src/orxonox/core/MetaObjectList.h (modified) (1 diff)
• src/orxonox/core/ObjectList.h (modified) (1 diff)
• src/orxonox/core/OrxonoxClass.h (modified) (1 diff)
• src/orxonox/core/SignalHandler.h (modified) (1 diff)
• src/orxonox/hud/HUD.h (modified) (2 diffs)
• src/orxonox/objects/Ambient.h (modified) (2 diffs)
• src/orxonox/objects/BaseEntity.cc (deleted)
• src/orxonox/objects/BaseEntity.h (deleted)
• src/orxonox/objects/BaseObject.cc (modified) (1 diff)
• src/orxonox/objects/BaseObject.h (modified) (1 diff)
• src/orxonox/objects/BillboardSet.h (modified) (2 diffs)
• src/orxonox/objects/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/Camera.h (modified) (2 diffs)
• src/orxonox/objects/Entity.cc (deleted)
• src/orxonox/objects/Entity.h (deleted)
• src/orxonox/objects/Explosion.h (modified) (1 diff)
• src/orxonox/objects/Fighter.h (modified) (1 diff)
• src/orxonox/objects/Light.cc (deleted)
• src/orxonox/objects/Light.h (deleted)
• src/orxonox/objects/Mesh.h (modified) (2 diffs)
• src/orxonox/objects/Model.h (modified) (1 diff)
• src/orxonox/objects/NPC.h (modified) (2 diffs)
• src/orxonox/objects/Projectile.h (modified) (1 diff)
• src/orxonox/objects/SceneNode.cc (deleted)
• src/orxonox/objects/SceneNode.h (deleted)
• src/orxonox/objects/Skybox.h (modified) (2 diffs)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)
• src/orxonox/objects/Tickable.h (modified) (1 diff)
• src/orxonox/objects/Timer.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)
• src/orxonox/objects/weapon_system/AmmunitionDump.h (modified) (2 diffs)
• src/orxonox/objects/weapon_system/BarrelGun.h (modified) (2 diffs)
• src/orxonox/objects/weapon_system/BaseWeapon.h (modified) (2 diffs)
• src/orxonox/objects/weapon_system/Bullet.h (modified) (2 diffs)
• src/orxonox/objects/weapon_system/BulletManager.h (modified) (2 diffs)
• src/orxonox/objects/weapon_system/WeaponStation.h (modified) (2 diffs)
• src/orxonox/particle/ParticleInterface.h (modified) (2 diffs)

code/branches/FICN/FICN.sln

@@ -26 +26 @@
                 {E283910F-F911-40FB-A09D-D025CA821912} = {E283910F-F911-40FB-A09D-D025CA821912}
                 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
-        EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weapon", "weapon.vcproj", "{ED1E93A7-5DB2-4417-B684-A8FDD61FB567}"
-        ProjectSection(WebsiteProperties) = preProject
-                Debug.AspNetCompiler.Debug = "True"
-                Release.AspNetCompiler.Debug = "False"
         EndProjectSection
 EndProject
@@ -77 +71 @@
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
-                {ED1E93A7-5DB2-4417-B684-A8FDD61FB567}.Debug|Win32.ActiveCfg = Debug|Win32
-                {ED1E93A7-5DB2-4417-B684-A8FDD61FB567}.Release|Win32.ActiveCfg = Release|Win32
                 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.ActiveCfg = Debug|Win32
                 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.Build.0 = Debug|Win32

code/branches/FICN/benixonox.vcproj

@@ -225 +225 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\orxonox\objects\BaseEntity.cc"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\orxonox\objects\BaseObject.cc"
                                         >
@@ -241 +237 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\orxonox\objects\Entity.cc"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\orxonox\objects\Explosion.cc"
                                         >
@@ -253 +245 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\orxonox\objects\Light.cc"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\orxonox\objects\Mesh.cc"
                                         >
@@ -273 +261 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\orxonox\objects\SceneNode.cc"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\orxonox\objects\Skybox.cc"
                                         >
@@ -282 +266 @@
                                 <File
                                         RelativePath=".\src\orxonox\objects\SpaceShip.cc"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath=".\src\orxonox\objects\test1.cc"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath=".\src\orxonox\objects\test2.cc"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath=".\src\orxonox\objects\test3.cc"
                                         >
                                 </File>
@@ -391 +363 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\orxonox\objects\BaseEntity.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\orxonox\objects\BaseObject.h"
                                         >
@@ -407 +375 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\orxonox\objects\Entity.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\orxonox\objects\Explosion.h"
                                         >
@@ -419 +383 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\orxonox\objects\Light.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath=".\src\orxonox\objects\Mesh.h"
                                         >
@@ -436 +396 @@
                                 <File
                                         RelativePath=".\src\orxonox\objects\Projectile.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath=".\src\orxonox\objects\SceneNode.h"
                                         >
                                 </File>

code/branches/FICN/src/audio/AudioBuffer.h

@@ -1 @@
-#ifndef AUDIOBUFFER_H_
-#define AUDIOBUFFER_H_
+#ifndef _AudioBuffer_H__
+#define _AudioBuffer_H__
 
 #include "AudioIncludes.h"
@@ -27 +27 @@
 }
 
-#endif /*AUDIOBUFFER_H_*/
+#endif /* _AudioBuffer_H__ */

code/branches/FICN/src/audio/AudioManager.h

@@ -1 @@
-#ifndef AUDIOMANAGER_H_
-#define AUDIOMANAGER_H_
+#ifndef _AudioManager_H__
+#define _AudioManager_H__
 
 #include "AudioIncludes.h"
@@ -65 +65 @@
 }
 
-#endif /*AUDIOMANAGER_H_*/
+#endif /* _AudioManager_H__ */

code/branches/FICN/src/audio/AudioSource.h

@@ -1 @@
-#ifndef AUDIOSOURCE_H_
-#define AUDIOSOURCE_H_
+#ifndef _AudioSource_H__
+#define _AudioSource_H__
 
 #include "AudioIncludes.h"
@@ -16 +16 @@
 }
 
-#endif /*AUDIOSOURCE_H_*/
+#endif /* _AudioSource_H__ */

code/branches/FICN/src/audio/AudioStream.h

@@ -1 @@
-#ifndef __ogg_h__
-#define __ogg_h__
+#ifndef _AudioStream_H__
+#define _AudioStream_H__
 
 #include "AudioIncludes.h"
@@ -43 +43 @@
 }
 
-#endif // __ogg_h__
+#endif /* _AudioStream_H__ */

code/branches/FICN/src/loader/LevelLoader.h

@@ -5 +5 @@
 * @author Nicolas Perrenoud <nicolape@ee.ethz.ch>
 */
+
+#ifndef _LevelLoader_H__
+#define _LevelLoader_H__
 
 #include <string>
@@ -15 +18 @@
 //#include "xml/xmlParser.h"
 
-#ifndef __MODULE_LEVELLOADER__
-#define __MODULE_LEVELLOADER__
-
-using namespace std;
 
 namespace loader
@@ -26 +25 @@
   public:
     // Constructors, loads the level file and some information data
-    LevelLoader(string file, string dir="levels");
+    LevelLoader(std::string file, std::string dir="levels");
     // Destructor
     ~LevelLoader();
@@ -33 +32 @@
 
     // Getters
-    inline string name() {return name_; };
-    inline string description() {return description_; };
-    inline string image() {return image_; };
+    inline std::string name() {return name_; };
+    inline std::string description() {return description_; };
+    inline std::string image() {return image_; };
   private:
     //! Level information
@@ -56 +55 @@
     TiXmlElement* rootElement;
 
-
   };
 }
-#endif
+
+#endif /* _LevelLoader_H__ */

code/branches/FICN/src/loader/loader_platform.h

@@ -27 +27 @@
 
 
-#ifndef LOADER_PLATFORM_H
-#define LOADER_PLATFORM_H
+#ifndef _LoaderPlatform_H__
+#define _LoaderPlatform_H__
 
 
@@ -44 +44 @@
 
 
-#endif /* LOADER_PLATFORM_H */
+#endif /* _LoaderPlatform_H__ */

code/branches/FICN/src/network/Client.h

@@ -11 +11 @@
 //
 
-#ifndef NETWORK_CLIENT_H
-#define NETWORK_CLIENT_H
+#ifndef _Client_H__
+#define _Client_H__
 
 #include <string>
@@ -69 +69 @@
 }
 
-#endif
+#endif /* _Client_H__ */

code/branches/FICN/src/network/ClientConnection.h

@@ -10 +10 @@
 //
 //
-#ifndef NETWORK_CLIENTCONNECTION_H
-#define NETWORK_CLIENTCONNECTION_H
+#ifndef _ClientConnection_H__
+#define _ClientConnection_H__
 
 #include <iostream>
@@ -78 +78 @@
 }
 
-#endif
+#endif /* _ClientConnection_H__ */

code/branches/FICN/src/network/ClientInformation.h

@@ -10 +10 @@
 //
 //
-#ifndef NETWORKCLIENTINFORMATION_H
-#define NETWORKCLIENTINFORMATION_H
+#ifndef _ClientInformation_H__
+#define _ClientInformation_H__
 
 #include <enet/enet.h>
@@ -66 +66 @@
 }
 
-#endif
+#endif /* _ClientInformation_H__ */

code/branches/FICN/src/network/ConnectionManager.h

@@ -10 +10 @@
 //
 //
-#ifndef NETWORK_CONNECTIONMANAGER_H
-#define NETWORK_CONNECTIONMANAGER_H
+#ifndef _ConnectionManager_H__
+#define _ConnectionManager_H__
 
 #include <iostream>
@@ -88 +88 @@
 }
 
-#endif
+#endif /* _ConnectionManager_H__ */

code/branches/FICN/src/network/GameStateClient.h

@@ -10 +10 @@
 //
 //
-#ifndef NETWORK_GAMESTATECLIENT_H
-#define NETWORK_GAMESTATECLIENT_H
+#ifndef _GameStateClient_H__
+#define _GameStateClient_H__
 
 #include "zlib.h"
@@ -42 +42 @@
 }
 
-#endif
+#endif /* _GameStateClient_H__ */

code/branches/FICN/src/network/GameStateManager.h

@@ -10 +10 @@
 //
 //
-#ifndef NETWORK_GAMESTATEMANAGER_H
-#define NETWORK_GAMESTATEMANAGER_H
+#ifndef _GameStateManager_H__
+#define _GameStateManager_H__
 
 #include <map>
@@ -66 +66 @@
 }
 
-#endif
+#endif /* _GameStateManager_H__ */

code/branches/FICN/src/network/NetworkFrameListener.h

@@ -11 +11 @@
 //
 
-#ifndef NETWORKFRAMELISTENER_H
-#define NETWORKFRAMELISTENER_H
+#ifndef _NetworkFrameListener_H__
+#define _NetworkFrameListener_H__
 
 #include "OgreFrameListener.h"
@@ -47 +47 @@
 }
 
-#endif
+#endif /* _NetworkFrameListener_H__ */

code/branches/FICN/src/network/PacketBuffer.h

@@ -11 +11 @@
 //
 
-#ifndef NETWORK_PACKETBUFFER_H 
-#define NETWORK_PACKETBUFFER_H
+#ifndef _PacketBuffer_H__ 
+#define _PacketBuffer_H__
 
 #include <queue>
@@ -56 +56 @@
 
 } //namespace
-#endif /* NETWORK_PACKETBUFFER_H */
+#endif /* _PacketBuffer_H__ */

code/branches/FICN/src/network/PacketManager.h

@@ -1 @@
-#ifndef PACKETMANAGER_H_
-#define PACKETMANAGER_H_
+#ifndef _PacketManager_H__
+#define _PacketManager_H__
 
 #include <string>
@@ -81 +81 @@
 }
 
-#endif /*PACKETMANAGER_H_*/
+#endif /* _PacketManager_H__ */

code/branches/FICN/src/network/PacketTypes.h

@@ -11 +11 @@
 //
 
-#ifndef NETWORK_PACKETTYPES_H
-#define NETWORK_PACKETTYPES_H
+#ifndef _PacketTypes_H__
+#define _PacketTypes_H__
 
 namespace network{
@@ -85 +85 @@
 }
 
-#endif
+#endif /* _PacketTypes_H__ */

code/branches/FICN/src/network/Server.h

@@ -11 +11 @@
 //
 
-#ifndef NETWORK_SERVER_H
-#define NETWORK_SERVER_H
+#ifndef _Server_H__
+#define _Server_H__
 
 #include <string>
@@ -60 +60 @@
 }
 
-#endif
+#endif /* _Server_H__ */

code/branches/FICN/src/network/Synchronisable.h

@@ -10 +10 @@
 //
 //
-#ifndef NETWORK_SYNCHRONISABLE_H
-#define NETWORK_SYNCHRONISABLE_H
+#ifndef _Synchronisable_H__
+#define _Synchronisable_H__
 
 #include <list>
@@ -71 +71 @@
 }
 
-#endif
+#endif /* _Synchronisable_H__ */

code/branches/FICN/src/orxonox/AIClass.h

@@ -1 @@
-#ifndef AI_Class
-#define AI_Class
+#ifndef _AIClass_H__
+#define _AIClass_H__
 
 #include <Ogre.h>
@@ -8 +8 @@
 #include <iostream>
 
-
-#endif
-
+// FIXME: using namespace xy; in header files is a very bad idea..
 using namespace std;
 using namespace Ogre;
@@ -98 +96 @@
 
 };
+
+#endif /* _AIClass_H__ */

code/branches/FICN/src/orxonox/Arrival.h

@@ -3 +3 @@
 
 
-#ifndef Arrival_Class
-#define Arrical_Class
+#ifndef _Arrival_H__
+#define _Arrival_H__
 
 // #include <Ogre.h>
@@ -12 +12 @@
 #include <iostream>
 
-
-#endif
-
+// FIXME: using namspace xy; in header files is a bad idea
 using namespace std;
 using namespace Ogre;
@@ -87 +85 @@
   }
 }
+
+#endif /* _Arrival_H__ */

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -25 +25 @@
     objects/Ambient.cc
     objects/Skybox.cc
-    objects/SceneNode.cc
-    objects/Entity.cc
+#    objects/SceneNode.cc
+#    objects/Entity.cc
     objects/Camera.cc
 #    objects/SpaceshipSteeringObject.cc
     objects/Model.cc
     objects/Mesh.cc
-    objects/BaseEntity.cc
+#    objects/BaseEntity.cc
     objects/SpaceShip.cc
     objects/NPC.cc
     objects/BillboardSet.cc
-    objects/Light.cc
+#    objects/Light.cc
     objects/Projectile.cc
     objects/weapon_system/AmmunitionDump.cc

code/branches/FICN/src/orxonox/Flocking.h

@@ -2 +2 @@
 //Headerfile: Flocking.h
 
-#ifndef Flocking_Class
-#define Flocking_Class
+#ifndef _Flocking_H__
+#define _Flocking_H__
 
 // #include <Ogre.h>
@@ -11 +11 @@
 #include <iostream>
 
-
-#endif
 
 
@@ -142 +140 @@
   }
 };     //End of class Element
+
+#endif /* _Flocking_H__*/

code/branches/FICN/src/orxonox/GraphicsEngine.h

@@ -5 +5 @@
  */
 
-#ifndef GRAPHICS_ENGINE_H
-#define GRAPHICS_ENGINE_H
+#ifndef _GraphicsEngine_H__
+#define _GraphicsEngine_H__
 
 #include <OgreRoot.h>
@@ -40 +40 @@
 }
 
-#endif
-
+#endif /* _GraphicsEngine_H__ */

code/branches/FICN/src/orxonox/InputManager.h

@@ -1 @@
-#ifndef InputManager_H
-#define InputManager_H
+#ifndef _InputManager_H__
+#define _InputManager_H__
 
 #ifdef WIN32
@@ -89 +89 @@
     static InputManager *mInputManager;
 };
-#endif
+#endif /* _InputManager_H__ */

code/branches/FICN/src/orxonox/Orxonox.cc

@@ -49 +49 @@
 #include <string>
 #include <iostream>
+#include <exception>
 
 //***** ORXONOX ****
@@ -283 +284 @@
       COUT(3) << "Info: network framelistener added" << std::endl;
     }
-    catch(exception &e)
+    catch(std::exception &e)
     {
       COUT(1) << "Error: There was a problem initialising the server :(" << std::endl;

code/branches/FICN/src/orxonox/Orxonox.h

@@ -5 +5 @@
  */
 
-#ifndef ORXONOX_H
-#define ORXONOX_H
+#ifndef _Orxonox_H__
+#define _Orxonox_H__
 
 #include <OgrePrerequisites.h>
@@ -81 +81 @@
   };
 }
-#endif /* ORXONOX_H */
+#endif /* _Orxonox_H__ */

code/branches/FICN/src/orxonox/OrxonoxPrereqs.h

@@ -31 +31 @@
  */
 
-#ifndef ORXONOX_PREREQ_H
-#define ORXONOX_PREREQ_H
+#ifndef _OrxonoxPrereqs_H__
+#define _OrxonoxPrereqs_H__
 
 // hack for the usleep/Sleep problem
@@ -159 +159 @@
 }
 
-#endif /* ORXONOX_PREREQ_H */
+#endif /* _OrxonoxPrereqs_H__ */

code/branches/FICN/src/orxonox/SpaceshipSteering.h

@@ -1 @@
-#ifndef SPACESHIP_STEERING_H
-#define SPACESHIP_STEERING_H
+#ifndef _SpaceShipSteering_H__
+#define _SpaceShipSteering_H__
 
 #include "OgrePrerequisites.h"
@@ -60 +60 @@
 
 
-#endif
+#endif /* _SpaceShipSteering_H__ */

code/branches/FICN/src/orxonox/core/ArgReader.h

@@ -5 +5 @@
  */
 
-#ifndef __ARGREADER_CLASS__
-#define __ARGREADER_CLASS__
+#ifndef _ArgReader_H__
+#define _ArgReader_H__
 
 #include <string>
@@ -31 +31 @@
 
 }
-#endif
+#endif /* _ArgReader_H__ */

code/branches/FICN/src/orxonox/core/ClassFactory.h

@@ -95 +95 @@
 }
 
-#endif
+#endif /* _ClassFactory_H__ */

code/branches/FICN/src/orxonox/core/ConfigValueContainer.h

@@ -135 +135 @@
 }
 
-#endif
+#endif /* _ConfigValueContainer_H__ */

code/branches/FICN/src/orxonox/core/DebugLevel.h

@@ -19 +19 @@
 }
 
-#endif
+#endif /* _DebugLevel_H__ */

code/branches/FICN/src/orxonox/core/Error.h

@@ -1 @@
-#ifndef __ERROR_CLASS__
-#define __ERROR_CLASS__
+#ifndef _Error_H__
+#define _Error_H__
 
 #include <iostream>
@@ -18 +18 @@
 }
 
-#endif
+#endif /* _Error_H__ */

code/branches/FICN/src/orxonox/core/Factory.h

@@ -61 +61 @@
 }
 
-#endif
+#endif /* _Factory_H__ */

code/branches/FICN/src/orxonox/core/Identifier.h

@@ -370 +370 @@
 }
 
-#endif
+#endif /* _Identifier_H__ */

code/branches/FICN/src/orxonox/core/IdentifierList.h

@@ -41 +41 @@
 }
 
-#endif
+#endif /* _IdentifierList_H__ */

code/branches/FICN/src/orxonox/core/Iterator.h

@@ -161 +161 @@
 }
 
-#endif
+#endif /* _Iterator_H__ */

code/branches/FICN/src/orxonox/core/MetaObjectList.h

@@ -109 +109 @@
 }
 
-#endif
+#endif /* _MetaObjectList_H__ */

code/branches/FICN/src/orxonox/core/ObjectList.h

@@ -264 +264 @@
 }
 
-#endif
+#endif /* _ObjectList_H__ */

code/branches/FICN/src/orxonox/core/OrxonoxClass.h

@@ -131 +131 @@
 }
 
-#endif
+#endif /* _OrxonoxClass_H__ */

code/branches/FICN/src/orxonox/core/SignalHandler.h

@@ -72 +72 @@
 
 #endif /* _SignalHandler_H__ */
-

code/branches/FICN/src/orxonox/hud/HUD.h

@@ -26 +26 @@
  */
 
-#ifndef MODULE_HUD_H
-#define MODULE_HUD_H
+#ifndef _HUD_H__
+#define _HUD_H__
 
 #include <OgrePrerequisites.h>
@@ -108 +108 @@
 }
 
-#endif
+#endif /* _HUD_H__ */

code/branches/FICN/src/orxonox/objects/Ambient.h

@@ -1 @@
-#ifndef _OBJECT_AMBIENT_H__
-#define _OBJECT_AMBIENT_H__
+#ifndef _Ambient_H__
+#define _Ambient_H__
 
 #include "BaseObject.h"
@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Ambient_H__ */

code/branches/FICN/src/orxonox/objects/BaseObject.cc

@@ -59 +59 @@
         if (xmlElem->Attribute("name"))
         {
-            this->setName(xmlElem->Attribute("mesh"));
+            this->setName(xmlElem->Attribute("name"));
         }
     }

code/branches/FICN/src/orxonox/objects/BaseObject.h

@@ -24 +24 @@
 }
 
-#endif
+#endif /* _BaseObject_H__ */

code/branches/FICN/src/orxonox/objects/BillboardSet.h

@@ +1 @@
+#ifndef _BillboardSet_H__
+#define _BillboardSet_H__
+
 #include <string>
 
 #include "OgreBillboardSet.h"
-
-#ifndef _BillboardSet_H__
-#define _BillboardSet_H__
 
 namespace orxonox
@@ -27 +27 @@
 }
 
-#endif
+#endif /* _BillboardSet_H__ */

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -9 +9 @@
   Ambient.cc
   Skybox.cc
-  SceneNode.cc
+#  SceneNode.cc
   BaseEntity.cc
-  Entity.cc
+#  Entity.cc
   Camera.cc
 #  SpaceshipSteeringObject.cc
@@ -19 +19 @@
   NPC.cc
   BillboardSet.cc
-  Light.cc
+#  Light.cc
   Projectile.cc
   weapon_system/AmmunitionDump.cc

code/branches/FICN/src/orxonox/objects/Camera.h

@@ -1 @@
-#ifndef _OBJECT_CAMERA_H__
-#define _OBJECT_CAMERA_H__
+#ifndef _Camera_H__
+#define _Camera_H__
 
 #include "BaseObject.h"
@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Camera_H__ */

code/branches/FICN/src/orxonox/objects/Explosion.h

@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Explosion_H__ */

code/branches/FICN/src/orxonox/objects/Fighter.h

@@ -92 +92 @@
 }
 
-#endif
+#endif /* _Fighter_H__ */

code/branches/FICN/src/orxonox/objects/Mesh.h

@@ +1 @@
+#ifndef _Mesh_H__
+#define _Mesh_H__
+
 #include <string>
 
 #include "OgreEntity.h"
-
-#ifndef _Mesh_H__
-#define _Mesh_H__
 
 namespace orxonox
@@ -27 +27 @@
 }
 
-#endif
+#endif /* _Mesh_H__ */

code/branches/FICN/src/orxonox/objects/Model.h

@@ -23 +23 @@
 }
 
-#endif
+#endif /* _Model_H__ */

code/branches/FICN/src/orxonox/objects/NPC.h

@@ -5 +5 @@
  */
 
-#ifndef MODULE_NPC_H
-#define MODULE_NPC_H
+#ifndef _NPC_H__
+#define _NPC_H__
 
 // includes
@@ -43 +43 @@
 
 }
-#endif
+#endif /* _NPC_H__ */

code/branches/FICN/src/orxonox/objects/Projectile.h

@@ -26 +26 @@
 }
 
-#endif
+#endif /* _Projectile_H__ */

code/branches/FICN/src/orxonox/objects/Skybox.h

@@ -1 @@
-#ifndef _OBJECT_SKYBOX_H__
-#define _OBJECT_SKYBOX_H__
+#ifndef _Skybox_H__
+#define _Skybox_H__
 
 #include "BaseObject.h"
@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Skybox_H__ */

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -123 +123 @@
 }
 
-#endif
+#endif /* _SpaceShip_H__ */

code/branches/FICN/src/orxonox/objects/Tickable.h

@@ -81 +81 @@
 }
 
-#endif
+#endif /* _Tickable_H__ */

code/branches/FICN/src/orxonox/objects/Timer.h

@@ -192 +192 @@
 }
 
-#endif
+#endif /* _Timer_H__ */

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -146 +146 @@
 }
 
-#endif
+#endif /* _WorldEntity_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h

@@ -27 +27 @@
 
 
-#ifndef AmmunitionDump_H
-#define AmmunitionDump_H
+#ifndef _AmmunitionDump_H__
+#define _AmmunitionDump_H__
 
 #include <OgrePrerequisites.h>
@@ -66 +66 @@
 }
 
-#endif /* AmmunitionDump_H */
+#endif /* _AmmunitionDump_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.h

@@ -27 +27 @@
 
 
-#ifndef BARREL_GUN_H
-#define BARREL_GUN_H
+#ifndef _BarrelGun_H__
+#define _BarrelGun_H__
 
 #include <OgrePrerequisites.h>
@@ -62 +62 @@
 }
 
-#endif /* BARREL_GUN_H */
+#endif /* _BarrelGun_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.h

@@ -27 +27 @@
 
 
-#ifndef BASE_WEAPON_H
-#define BASE_WEAPON_H
+#ifndef _BaseWeapon_H__
+#define _BaseWeapon_H__
 
 #include <OgrePrerequisites.h>
@@ -124 +124 @@
 }
 
-#endif /* BASE_WEAPON_H */
+#endif /* _BaseWeapon_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/Bullet.h

@@ -27 +27 @@
 
 
-#ifndef BULLET_H
-#define BULLET_H
+#ifndef _Bullet_H__
+#define _Bullet_H__
 
 #include <OgrePrerequisites.h>
@@ -49 +49 @@
 }
 
-#endif /* BULLET_H */
+#endif /* _Bullet_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h

@@ -27 +27 @@
 
 
-#ifndef BULLET_MANAGER_H
-#define BULLET_MANAGER_H
+#ifndef _BulletManager_H__
+#define _BulletManager_H__
 
 #include <OgrePrerequisites.h>
@@ -67 +67 @@
 }
 
-#endif /* BULLET_MANAGER_H */
+#endif /* _BulletManager_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.h

@@ -27 +27 @@
 
 
-#ifndef WEAPON_STATION_H
-#define WEAPON_STATION_H
+#ifndef _WeaponStation_H__
+#define _WeaponStation_H__
 
 #include <OgrePrerequisites.h>
@@ -63 +63 @@
 }
 
-#endif /* WEAPON_STATION_H */
+#endif /* _WeaponStation_H__ */

code/branches/FICN/src/orxonox/particle/ParticleInterface.h

@@ -1 @@
-#ifndef MODULE_ParticleInterface_H
-#define MODULE_ParticleInterface_H
+#ifndef _ParticleInterface_H__
+#define _ParticleInterface_H__
 
 // #include "ParticleInterface.h"
@@ -64 +64 @@
 
 }
-#endif
+#endif /* _ParticleInterface_H__ */