Changeset 7127 for code/branches/presentation3/src/modules/weapons

Timestamp:

Jun 9, 2010, 9:32:58 PM (14 years ago)

Author:

rgrieder

Message:

Removed excess white space at the end of lines.

Location:

code/branches/presentation3/src/modules/weapons

Files:

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

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

@@ -28 +28 @@
 
 #include "RocketController.h"
-#include "projectiles/SimpleRocket.h" 
+#include "projectiles/SimpleRocket.h"
 #include "util/Math.h"
 #include "weapons/projectiles/SimpleRocket.h"
@@ -66 +66 @@
             this->moveToTargetPosition();
         }
-        
-        
+
+
     }
 
@@ -102 +102 @@
 
 
-        if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000) 
+        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);

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

@@ -50 +50 @@
             RocketController(BaseObject* creator);
             virtual ~RocketController();
-            
+
             virtual void tick(float dt);
             SimpleRocket* getRocket() const
@@ -64 +64 @@
             Vector3 targetPosition_;
             WeakPtr<PlayerInfo> player_;
-                        
+
             WeakPtr<WorldEntity> target_;
 

code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc

@@ -167 +167 @@
             this->localAngularVelocity_ = 0;
         }
-        
+
         if( GameMode::isMaster() )
         {
             if( this->bDestroy_ )
                 this->destroy();
-            
+
         }
     }

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

@@ -71 +71 @@
             this->fire_ = new ParticleEmitter(this);
             this->attach(this->fire_);
-           
+
             this->fire_->setOrientation(this->getOrientation());
             this->fire_->setSource("Orxonox/simplerocketfire");
@@ -90 +90 @@
 
 
-    
+
     /**
     * @brief updates state of rocket, disables fire if no fuel
@@ -107 +107 @@
             this->localAngularVelocity_ = 0;
 
-        
+
             if (this->fuel_)
             {
-                if (this->destroyTimer_.getRemainingTime()<  (static_cast<float>(this->FUEL_PERCENTAGE)/100) *this->lifetime_ ) 
+                if (this->destroyTimer_.getRemainingTime()<  (static_cast<float>(this->FUEL_PERCENTAGE)/100) *this->lifetime_ )
                     this->fuel_=false;
             } else
                 this->disableFire();
 
-            if( this->bDestroy_ ) 
+            if( this->bDestroy_ )
                 this->destroy();
         }
-                
+
     }
 
@@ -127 +127 @@
     void SimpleRocket::disableFire()
     {
-        this->setAcceleration(0,0,0);        
+        this->setAcceleration(0,0,0);
         this->fire_->detachFromParent();
     }
@@ -137 +137 @@
     SimpleRocket::~SimpleRocket()
     {
-        if (this->isInitialized()) 
+        if (this->isInitialized())
         {
             if( GameMode::isMaster() )

code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h

@@ -98 +98 @@
             */
             inline void rotatePitch(float value)
-            {   
+            {
                 this->rotatePitch(Vector2(value, 0)); }
             /**
@@ -105 +105 @@
             */
             inline void rotateRoll(float value)
-            { 
+            {
                 this->rotateRoll(Vector2(value, 0)); }
 
@@ -124 +124 @@
             Vector3 localAngularVelocity_;
             float damage_;
-            bool bDestroy_; 
+            bool bDestroy_;
             bool fuel_; //!< Bool is true while the rocket "has fuel"
 

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

@@ -54 +54 @@
 
             this->setMunitionName("TargetSeeking Rockets");
-            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4); 
+            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }