Changeset 2983 for code/branches

Timestamp:

May 18, 2009, 4:29:40 PM (16 years ago)

Author:

Hagen

Message:

MuzzleFlash finally there, EnergyDrink weapon

Location:

code/branches/weapons/src/orxonox/objects/weaponsystem

Files:

• CMakeLists.txt~ (added)
• MuzzleFlash.cc (added)
• MuzzleFlash.h (added)
• MuzzleFlash.h~ (added)
• weaponmodes/CMakeLists.txt (modified) (1 diff)
• weaponmodes/CMakeLists.txt~ (added)
• weaponmodes/EnergyDrink.cc (added)
• weaponmodes/EnergyDrink.cc~ (added)
• weaponmodes/EnergyDrink.h (added)
• weaponmodes/EnergyDrink.h~ (added)
• weaponmodes/HsW01.cc (modified) (1 diff)
• weaponmodes/HsW01.cc~ (added)
• weaponmodes/HsW01.h~ (added)

code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  EnergyDrink.cc
   FusionFire.cc
   LaserFire.cc
-<<<<<<< .mine
   HsW01.cc
-=======
   LightningGun.cc
->>>>>>> .r2978
 )

code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc

@@ -34 +34 @@
 #include "objects/weaponsystem/projectiles/ParticleProjectile.h"
 #include "objects/worldentities/Model.h"
-#include "objects/worldentities/MuzzleFlash.h"
+#include "objects/weaponsystem/MuzzleFlash.h"
 
 #include "objects/weaponsystem/Weapon.h"