Changeset 11690 for code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Dec 18, 2017, 12:40:00 PM (6 years ago)

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

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

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

@@ -50 +50 @@
 #include "sound/WorldSound.h"
 #include "core/object/ObjectListIterator.h"
-#include "Level.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 #include "controllers/FormationController.h"
@@ -162 +160 @@
 
         XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode );
-
-        if(!this->id_.empty() && this->getLevel() != nullptr)
-            this->getLevel()->getScriptableController()->registerPawn(this->id_, this);
     }
 
@@ -287 +282 @@
         {
             // Health-damage cannot be absorbed by shields.
-            // Shield-damage only reduces shield health.
+            // Shield-damage only reduces shield health. 
             // Normal damage can be (partially) absorbed by shields.
 
@@ -307 +302 @@
                 this->setHealth(this->health_ - (damage - shielddamage) - healthdamage);
             }
-            this->getLevel()->getScriptableController()->pawnHit(this, originator, this->health_, this->shieldHealth_);
 
             this->lastHitOriginator_ = originator;
@@ -408 +402 @@
             }
         }
-
-        this->getLevel()->getScriptableController()->pawnKilled(this);
     }
     void Pawn::goWithStyle()
@@ -633 +625 @@
         {
             // delete all debug models
-            for(Model* model : debugWeaponSlotModels_)
+            for(Model* model : debugWeaponSlotModels_) 
             {
                 model->destroy();