Changeset 11690 for code/branches/Presentation_HS17/src/orxonox/items

Timestamp:

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

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/orxonox/items/ShipPart.cc (modified) (2 diffs)

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

@@ -42 +42 @@
 #include "items/PartDestructionEvent.h"
 #include "chat/ChatManager.h"
-#include "Level.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 
@@ -217 +215 @@
             }
         }
-
-        // 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();