Changeset 12028 for code/branches/mergeFS18/src/orxonox/worldentities/pawns
- Timestamp:
- Oct 10, 2018, 3:16:51 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 5 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/orxonox/worldentities/pawns/CMakeLists.txt
r11783 r12028 4 4 Pawn.cc 5 5 SpaceShip.cc 6 ScriptableControllerDrone.cc 6 7 ModularSpaceShip.cc 7 8 TeamBaseMatchBase.cc -
code/branches/mergeFS18/src/orxonox/worldentities/pawns/Pawn.cc
r11783 r12028 50 50 #include "sound/WorldSound.h" 51 51 #include "core/object/ObjectListIterator.h" 52 #include "Level.h" 53 #include "scriptablecontroller/scriptable_controller.h" 52 54 53 55 #include "controllers/FormationController.h" … … 160 162 161 163 XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode ); 164 165 if(!this->id_.empty() && this->getLevel() != nullptr) 166 this->getLevel()->getScriptableController()->registerPawn(this->id_, this); 162 167 } 163 168 … … 282 287 { 283 288 // Health-damage cannot be absorbed by shields. 284 // Shield-damage only reduces shield health. 289 // Shield-damage only reduces shield health. 285 290 // Normal damage can be (partially) absorbed by shields. 286 291 … … 302 307 this->setHealth(this->health_ - (damage - shielddamage) - healthdamage); 303 308 } 309 this->getLevel()->getScriptableController()->pawnHit(this, originator, this->health_, this->shieldHealth_); 304 310 305 311 this->lastHitOriginator_ = originator; … … 402 408 } 403 409 } 410 411 this->getLevel()->getScriptableController()->pawnKilled(this); 404 412 } 405 413 void Pawn::goWithStyle() … … 625 633 { 626 634 // delete all debug models 627 for(Model* model : debugWeaponSlotModels_) 635 for(Model* model : debugWeaponSlotModels_) 628 636 { 629 637 model->destroy(); -
code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc
r11083 r12028 163 163 engine->run(dt); 164 164 165 if (this->hasLocalController() )165 if (this->hasLocalController() || true) 166 166 { 167 167 // If not in mouse look apply the angular movement to the ship. -
code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h
r11052 r12028 117 117 { this->steering_.y += value.x; } 118 118 119 inline void moveFrontBack(float value) 120 { this->moveFrontBack(Vector2(value, 0)); } 121 inline void moveRightLeft(float value) 122 { this->moveRightLeft(Vector2(value, 0)); } 123 inline void moveUpDown(float value) 124 { this->moveUpDown(Vector2(value, 0)); } 125 119 126 virtual void rotateYaw(const Vector2& value); // Rotate in yaw direction. 120 127 virtual void rotatePitch(const Vector2& value); // Rotate in pitch direction.
Note: See TracChangeset
for help on using the changeset viewer.