Changeset 8386 for code/branches/gameimmersion/src/orxonox/controllers

Timestamp:

May 2, 2011, 5:17:20 PM (14 years ago)

Author:

simonmie

Message:

New shielddamage implemented, depending functions changed, bugs fixed.

LightningGun →fire changed
Other weapons still need to be edited

File:

• code/branches/gameimmersion/src/orxonox/controllers/Controller.h (modified) (1 diff)

code/branches/gameimmersion/src/orxonox/controllers/Controller.h

@@ -52 +52 @@
             virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
 
+/* Override needed for different visual effects (e.g. in "NewHumanController.cc") depending on
+   the DIFFERENT AMOUNT OF DAMAGE done to the shield and to the health of "victim" (see Projectile.cc, Pawn.cc)
+
+//            virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage, float healthdamage, float shielddamage) {};
+*/
+
             void setGodMode( bool mode ){ this->bGodMode_ = mode; }
             bool getGodMode(){ return this->bGodMode_; }