Changeset 12281 for code/branches/OrxoBlox_FS19/src/modules/weapons

Timestamp:

Apr 4, 2019, 4:37:19 PM (6 years ago)

Author:

pomselj

Message:

weapon stuff

Location:

code/branches/OrxoBlox_FS19/src/modules/weapons

Files:

• munitions/BallMunition.cc (added)
• munitions/BallMunition.h (added)
• munitions/CMakeLists.txt (modified) (1 diff)
• projectiles/BallProjectile.cc (added)
• projectiles/BallProjectile.h (added)
• projectiles/BasicProjectile.h (modified) (1 diff)
• projectiles/CMakeLists.txt (modified) (1 diff)
• weaponmodes/BallGun.cc (added)
• weaponmodes/BallGun.h (added)
• weaponmodes/CMakeLists.txt (modified) (1 diff)

code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/CMakeLists.txt

@@ -9 +9 @@
   SplitMunition.cc
   MineMunition.cc
+  BallMunition.cc
 )

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BasicProjectile.h

@@ -117 +117 @@
 
         protected:
-            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
+            virtual bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
             void destroyCheck(void);
             inline void setDestroyAfterCollision(bool destroyAfterCollision)

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/CMakeLists.txt

@@ -15 +15 @@
   MineProjectile.cc
   WagnisProjectile.cc
+  BallProjectile.cc
 )

code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -14 +14 @@
   MineGun.cc
   WagnisGun.cc
+  BallGun.cc
 )