Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (8 diffs)

code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -30 +30 @@
 #include "Pawn.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -63 +63 @@
         this->getPickUp().setPlayer(this);
 
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             this->weaponSystem_ = new WeaponSystem(this);
@@ -133 +133 @@
     }
 
-    void Pawn::setPlayer(PlayerInfo* player)
-    {
-        ControllableEntity::setPlayer(player);
-
-        if (this->getGametype())
-            this->getGametype()->playerStartsControllingPawn(player, this);
-    }
-
-    void Pawn::removePlayer()
-    {
-        if (this->getGametype())
-            this->getGametype()->playerStopsControllingPawn(this->getPlayer(), this);
-
-        ControllableEntity::removePlayer();
-    }
-
     void Pawn::setHealth(float health)
     {
@@ -156 +140 @@
     void Pawn::damage(float damage, Pawn* originator)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
-        {
-            this->setHealth(this->health_ - damage);
-            this->lastHitOriginator_ = originator;
-
-            // play damage effect
-        }
+        this->setHealth(this->health_ - damage);
+        this->lastHitOriginator_ = originator;
+
+        // play damage effect
     }
 
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
-        {
-            this->damage(damage, originator);
-            this->setVelocity(this->getVelocity() + force);
-
-            // play hit effect
-        }
+        this->damage(damage, originator);
+        this->setVelocity(this->getVelocity() + force);
+
+        // play hit effect
     }
 
@@ -198 +176 @@
     void Pawn::death()
     {
-        if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
-        {
-            // Set bAlive_ to false and wait for PawnManager to do the destruction
-            this->bAlive_ = false;
-
-            this->setDestroyWhenPlayerLeft(false);
-
-            if (this->getGametype())
-                this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
-
-            if (this->getPlayer())
-                this->getPlayer()->stopControl(this);
-
-            if (GameMode::isMaster())
-                this->deatheffect();
-        }
-        else
-            this->setHealth(1);
+        // Set bAlive_ to false and wait for PawnManager to do the destruction
+        this->bAlive_ = false;
+
+        this->setDestroyWhenPlayerLeft(false);
+
+        if (this->getGametype())
+            this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
+
+        if (this->getPlayer())
+            this->getPlayer()->stopControl(this);
+
+        if (Core::isMaster())
+            this->deatheffect();
     }
 
@@ -249 +222 @@
             ExplosionChunk* chunk = new ExplosionChunk(this->getCreator());
             chunk->setPosition(this->getPosition());
+
         }
     }
@@ -260 +234 @@
     {
         this->setHealth(this->initialHealth_);
-        if (GameMode::isMaster())
+        if (Core::isMaster())
             this->spawneffect();
     }
@@ -269 +243 @@
     }
 
-
-    /* WeaponSystem:
-    *   functions load Slot, Set, Pack from XML and make sure all parent-pointers are set.
-    *   with setWeaponPack you can not just load a Pack from XML but if a Pack already exists anywhere, you can attach it.
-    *       --> e.g. Pickup-Items
-    */
     void Pawn::setWeaponSlot(WeaponSlot * wSlot)
     {