Changeset 11606 for code/branches/ScriptableController_HS17/src/orxonox/items

Timestamp:

Nov 27, 2017, 4:38:50 PM (7 years ago)

Author:

kohlia

Message:

Pawn killing works too now

File:

• code/branches/ScriptableController_HS17/src/orxonox/items/ShipPart.cc (modified) (2 diffs)

code/branches/ScriptableController_HS17/src/orxonox/items/ShipPart.cc

@@ -42 +42 @@
 #include "items/PartDestructionEvent.h"
 #include "chat/ChatManager.h"
+#include "Level.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 
@@ -215 +217 @@
             }
         }
+
+        // This is a bit hacky, but it takes away damage control from the pawn, so it has to handle
+        // that as well.
+        this->getLevel()->getScriptableController()->pawnHit(parent_, originator, parent_->getHealth(), parent_->getShieldHealth());
+
         if (this->health_ < 0)
             this->death();