Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10098


Ignore:
Timestamp:
Oct 22, 2014, 4:13:29 PM (10 years ago)
Author:
flsueess
Message:

new files

Location:
code/branches/weaponupdateHS14
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw

    r9939 r10098  
    424424        ?>
    425425   
    426         <?lua
     426<--     <?lua
    427427        for i = 1,2, 1
    428428        do
     
    443443        end
    444444        ?>
     445        -->
    445446   
    446447    <!-- 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  
    4141namespace orxonox
    4242{
     43        RegisterClass(RocketController);
    4344    /**
    4445    @brief
     
    4849    {
    4950        RegisterObject(RocketController);
    50 //        orxout() << "RocketController constructed" << endl;
     51        //orxout() << "RocketController constructed" << endl;
    5152
    5253        // Create a rocket for the controller.
     
    7374    RocketController::~RocketController()
    7475    {
    75 //        orxout() << "RocketController destroyed" << endl;
     76        orxout() << "RocketController destroyed" << endl;
    7677    }
    7778
     
    9798        if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
    9899            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);
    100101
    101102        this->rocket_->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
  • code/branches/weaponupdateHS14/src/modules/weapons/RocketController.h

    r9667 r10098  
    3939#include "tools/interfaces/Tickable.h"
    4040#include "controllers/Controller.h"
     41#include "worldentities/ControllableEntity.h"
    4142
    4243namespace orxonox
     
    7879            Vector3 targetPosition_; //!< The position of the target.
    7980            WeakPtr<PlayerInfo> player_; //!< The player the rocket belongs to.
     81            //WeakPtr<Pawn> pawn_;
    8082
    8183            WeakPtr<WorldEntity> target_; //!< The target.
Note: See TracChangeset for help on using the changeset viewer.