Changeset 6956 for code/branches

Timestamp:

May 21, 2010, 1:06:59 PM (15 years ago)

Author:

scheusso

Message:

further improvements

Location:

code/branches/rocket2/src/modules/weapons

Files:

• RocketController.cc (modified) (2 diffs)
• projectiles/SimpleRocket.cc (modified) (1 diff)
• weaponmodes/SimpleRocketFire.cc (modified) (1 diff)

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

@@ -94 +94 @@
     {
         this->target_ = target;
-        COUT(0)<<"got target\n";
+        CCOUT(4) << "got target" << endl;
     }
 
@@ -118 +118 @@
         //COUT(0)<<"  ";
         //COUT(0)<<coord.y;
-        this->getControllableEntity()->rotateYaw(-0.8f*sgn(coord.x)*coord.x*coord.x);
-        this->getControllableEntity()->rotatePitch(0.8f*sgn(coord.y)*coord.y*coord.y);
+        this->getControllableEntity()->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
+        this->getControllableEntity()->rotatePitch(sgn(coord.y)*coord.y*coord.y);
 //         this->getControllableEntity()->rotateYaw(10);
 //         this->getControllableEntity()->rotatePitch(0);

code/branches/rocket2/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -64 +64 @@
         if (GameMode::isMaster())
        {
-           this->setCollisionType(WorldEntity::Kinematic);
-            this->setVelocity(0,0,100);
+            this->setCollisionType(WorldEntity::Kinematic);
+            //this->setVelocity(0,0,100);
 
             Model* model = new Model(this);

code/branches/rocket2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -49 +49 @@
         this->bParallelReload_ = false;
         this->damage_ = 100;
-        this->speed_ = 100;
+        this->speed_ = 300;
 
         this->setMunitionName("LaserMunition");