Changeset 10098 for code/branches/weaponupdateHS14
- Timestamp:
- Oct 22, 2014, 4:13:29 PM (10 years ago)
- Location:
- code/branches/weaponupdateHS14
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw
r9939 r10098 424 424 ?> 425 425 426 426 <-- <?lua 427 427 for i = 1,2, 1 428 428 do … … 443 443 end 444 444 ?> 445 --> 445 446 446 447 <!-- Pirates at the end of wrong Navi line (get visible when you get near them)--> -
code/branches/weaponupdateHS14/src/modules/weapons/RocketController.cc
r9667 r10098 41 41 namespace orxonox 42 42 { 43 RegisterClass(RocketController); 43 44 /** 44 45 @brief … … 48 49 { 49 50 RegisterObject(RocketController); 50 //orxout() << "RocketController constructed" << endl;51 //orxout() << "RocketController constructed" << endl; 51 52 52 53 // Create a rocket for the controller. … … 73 74 RocketController::~RocketController() 74 75 { 75 //orxout() << "RocketController destroyed" << endl;76 orxout() << "RocketController destroyed" << endl; 76 77 } 77 78 … … 97 98 if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000) 98 99 this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20)); 99 if (distance < 1000) this->rocket_->setAcceleration(0,0,0);100 if (distance < 1000) this->rocket_->setAcceleration(0,0,0); 100 101 101 102 this->rocket_->rotateYaw(-sgn(coord.x)*coord.x*coord.x); -
code/branches/weaponupdateHS14/src/modules/weapons/RocketController.h
r9667 r10098 39 39 #include "tools/interfaces/Tickable.h" 40 40 #include "controllers/Controller.h" 41 #include "worldentities/ControllableEntity.h" 41 42 42 43 namespace orxonox … … 78 79 Vector3 targetPosition_; //!< The position of the target. 79 80 WeakPtr<PlayerInfo> player_; //!< The player the rocket belongs to. 81 //WeakPtr<Pawn> pawn_; 80 82 81 83 WeakPtr<WorldEntity> target_; //!< The target.
Note: See TracChangeset
for help on using the changeset viewer.