Changeset 10098 for code/branches

Timestamp:

Oct 22, 2014, 4:13:29 PM (10 years ago)

Author:

flsueess

Message:

new files

Location:

code/branches/weaponupdateHS14

Files:

• data/levels/FPS_Level_HS14.oxw (added)
• data/levels/includes/weaponSettingsFPS_HS14.oxi (added)
• data/levels/pirateAttack.oxw (modified) (2 diffs)
• data/levels/templates/FPS_HS14.oxt (added)
• src/modules/weapons/RocketController.cc (modified) (4 diffs)
• src/modules/weapons/RocketController.h (modified) (2 diffs)

code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw

@@ -424 +424 @@
         ?>
     
-        <?lua
+<--     <?lua
         for i = 1,2, 1
         do
@@ -443 +443 @@
         end
         ?>
+        -->
     
     <!-- Pirates at the end of wrong Navi line (get visible when you get near them)-->

code/branches/weaponupdateHS14/src/modules/weapons/RocketController.cc

@@ -41 +41 @@
 namespace orxonox
 {
+        RegisterClass(RocketController);
     /**
     @brief
@@ -48 +49 @@
     {
         RegisterObject(RocketController);
-//        orxout() << "RocketController constructed" << endl;
+        //orxout() << "RocketController constructed" << endl;
 
         // Create a rocket for the controller.
@@ -73 +74 @@
     RocketController::~RocketController()
     {
-//        orxout() << "RocketController destroyed" << endl;
+        orxout() << "RocketController destroyed" << endl;
     }
 
@@ -97 +98 @@
         if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
             this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
-        if (distance <1000) this->rocket_->setAcceleration(0,0,0);
+        if (distance < 1000) this->rocket_->setAcceleration(0,0,0);
 
         this->rocket_->rotateYaw(-sgn(coord.x)*coord.x*coord.x);

code/branches/weaponupdateHS14/src/modules/weapons/RocketController.h

@@ -39 +39 @@
 #include "tools/interfaces/Tickable.h"
 #include "controllers/Controller.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox
@@ -78 +79 @@
             Vector3 targetPosition_; //!< The position of the target.
             WeakPtr<PlayerInfo> player_; //!< The player the rocket belongs to.
+            //WeakPtr<Pawn> pawn_;
 
             WeakPtr<WorldEntity> target_; //!< The target.