Changeset 6356 for code/branches/presentation2/src/orxonox/worldentities

Timestamp:

Dec 15, 2009, 11:04:39 PM (15 years ago)

Author:

scheusso

Message:

god mode hack for presentation

File:

• code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -168 +168 @@
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
+        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {
             this->damage(damage, originator);
@@ -179 +179 @@
     void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
+        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {
             this->damage(damage, originator);