Changeset 1039 for code/trunk/src/orxonox/objects/weapon

Timestamp:

Apr 13, 2008, 8:02:38 PM (17 years ago)

Author:

rgrieder

Message:

• train riding doesn't have to be boring
• added some license notes
• removed certain header dependencies in audio
• changed order of header file inclusion in orxonox and audio (coding style guide will be updated)

Location:

code/trunk/src/orxonox/objects/weapon

Files:

• AmmunitionDump.cc (modified) (2 diffs)
• AmmunitionDump.h (modified) (1 diff)
• BarrelGun.cc (modified) (2 diffs)
• BarrelGun.h (modified) (1 diff)
• BaseWeapon.cc (modified) (2 diffs)
• BaseWeapon.h (modified) (1 diff)
• Bullet.cc (modified) (1 diff)
• Bullet.h (modified) (1 diff)
• BulletManager.cc (modified) (1 diff)
• BulletManager.h (modified) (1 diff)
• WeaponStation.cc (modified) (1 diff)
• WeaponStation.h (modified) (1 diff)

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "AmmunitionDump.h"
 
 #include "orxonox/Orxonox.h"
@@ -32 +33 @@
 #include "util/tinyxml/tinyxml.h"
 #include "core/CoreIncludes.h"
-
-#include "AmmunitionDump.h"
 
 

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -30 +30 @@
 #define _AmmunitionDump_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "network/Synchronisable.h"

code/trunk/src/orxonox/objects/weapon/BarrelGun.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BarrelGun.h"
 
 #include <OgreStringConverter.h>
@@ -39 +40 @@
 #include "BaseWeapon.h"
 #include "core/CoreIncludes.h"
-
-#include "BarrelGun.h"
 
 

code/trunk/src/orxonox/objects/weapon/BarrelGun.h

@@ -30 +30 @@
 #define _BarrelGun_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "BaseWeapon.h"

code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BaseWeapon.h"
 
 #include <OgreStringConverter.h>
@@ -39 +40 @@
 #include "AmmunitionDump.h"
 #include "core/CoreIncludes.h"
-
-#include "BaseWeapon.h"
 
 

code/trunk/src/orxonox/objects/weapon/BaseWeapon.h

@@ -30 +30 @@
 #define _BaseWeapon_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "../Model.h"

code/trunk/src/orxonox/objects/weapon/Bullet.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Bullet.h"
+
 #include "core/CoreIncludes.h"
 
-#include "Bullet.h"
 
 namespace orxonox {

code/trunk/src/orxonox/objects/weapon/Bullet.h

@@ -30 +30 @@
 #define _Bullet_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "../Model.h"

code/trunk/src/orxonox/objects/weapon/BulletManager.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BulletManager.h"
 
-#include "BulletManager.h"
 #include "Bullet.h"
 #include "core/CoreIncludes.h"

code/trunk/src/orxonox/objects/weapon/BulletManager.h

@@ -30 +30 @@
 #define _BulletManager_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "network/Synchronisable.h"

code/trunk/src/orxonox/objects/weapon/WeaponStation.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "WeaponStation.h"
 
 #include "BaseWeapon.h"
-#include "WeaponStation.h"
 
 

code/trunk/src/orxonox/objects/weapon/WeaponStation.h

@@ -32 +32 @@
 #include <OgrePrerequisites.h>
 
-#include "../../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"