Changeset 2106 for code/trunk

Timestamp:

Nov 2, 2008, 1:01:06 AM (16 years ago)

Author:

landauf

Message:

moved WeaponSystem.h and .cc into the objects/weaponSystem directory

Location:

code/trunk/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• objects/weaponSystem/Munition.h (modified) (1 diff)
• objects/weaponSystem/Weapon.h (modified) (1 diff)
• objects/weaponSystem/WeaponSet.h (modified) (1 diff)
• objects/weaponSystem/WeaponSlot.h (modified) (1 diff)
• objects/weaponSystem/WeaponSystem.cc (moved) (moved from code/trunk/src/orxonox/objects/WeaponSystem.cc) (2 props)
• objects/weaponSystem/WeaponSystem.h (moved) (moved from code/trunk/src/orxonox/objects/WeaponSystem.h) (1 prop)
• objects/weaponSystem/munitions/LaserGunMunition.h (modified) (1 diff)
• objects/weaponSystem/weapons/LaserGun.h (modified) (1 diff)
• objects/weaponSystem/weapons/Missile.h (modified) (1 diff)
• objects/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/trunk/src/orxonox/CMakeLists.txt

@@ -68 +68 @@
   objects/worldentities/ParticleSpawner.cc
 #  objects/worldentities/Backlight.cc
-  
+
   objects/quest/AddQuest.cc
   objects/quest/AddQuestHint.cc
@@ -85 +85 @@
   objects/quest/Rewardable.cc
 
-  objects/WeaponSystem.cc
+  objects/weaponSystem/WeaponSystem.cc
   objects/weaponSystem/WeaponSet.cc
   objects/weaponSystem/WeaponSlot.cc

code/trunk/src/orxonox/objects/weaponSystem/Munition.h

@@ -52 +52 @@
 }
 
-#endif /* _WeaponSystem_H__ */
+#endif /* _Munition_H__ */

code/trunk/src/orxonox/objects/weaponSystem/Weapon.h

@@ -57 +57 @@
 }
 
-#endif /* _WeaponSystem_H__ */
+#endif /* _Weapon_H__ */

code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.h

@@ -63 +63 @@
 }
 
-#endif /* _WeaponSystem_H__ */
+#endif /* _WeaponSet_H__ */

code/trunk/src/orxonox/objects/weaponSystem/WeaponSlot.h

@@ -67 +67 @@
 }
 
-#endif /* _WeaponSystem_H__ */
+#endif /* _WeaponSlot_H__ */

code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h

@@ -56 +56 @@
 }
 
-#endif /* _WeaponSystem_H__ */
+#endif /* _LaserGunMunition_H__ */

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -58 +58 @@
 }
 
-#endif /* _WeaponSystem_H__ */
+#endif /* _LaserGun_H__ */

code/trunk/src/orxonox/objects/weaponSystem/weapons/Missile.h

@@ -52 +52 @@
 }
 
-#endif /* _WeaponSystem_H__ */
+#endif /* _Missile_H__ */

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -35 +35 @@
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
-#include "objects/WeaponSystem.h"
+#include "objects/weaponSystem/WeaponSystem.h"
 
 namespace orxonox