Changeset 12016 for code/branches/PresentationFS18/src/orxonox/items
- Timestamp:
- May 30, 2018, 2:37:02 PM (7 years ago)
- Location:
- code/branches/PresentationFS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/PresentationFS18
- Property svn:mergeinfo changed
-
code/branches/PresentationFS18/src/orxonox/items/ShipPart.cc
r11099 r12016 42 42 #include "items/PartDestructionEvent.h" 43 43 #include "chat/ChatManager.h" 44 #include "Level.h" 45 #include "scriptablecontroller/scriptable_controller.h" 44 46 45 47 … … 215 217 } 216 218 } 219 220 // This is a bit hacky, but it takes away damage control from the pawn, so it has to handle 221 // that as well. 222 this->getLevel()->getScriptableController()->pawnHit(parent_, originator, parent_->getHealth(), parent_->getShieldHealth()); 223 217 224 if (this->health_ < 0) 218 225 this->death();
Note: See TracChangeset
for help on using the changeset viewer.