Changeset 8980 for code/branches/presentation2011/src/modules/weapons

Timestamp:

Dec 14, 2011, 2:38:37 PM (13 years ago)

Author:

jo

Message:

teamgametype merged into trunk

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• src/modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)

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

@@ -66 +66 @@
         this->localAngularVelocity_ = 0;
         this->lifetime_ = 100.0f;
-        this->bIsRocket_= true;
 
         if (GameMode::isMaster())
@@ -135 +134 @@
         if(this->isInitialized())
         {
-            this->bIsRocket_= false;
             if (GameMode::isMaster())
             {

code/branches/presentation2011/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -52 +52 @@
         this->reloadTime_ = 1.0f;
         this->damage_ = 0.0f;
-        this->speed_ = 250.0f;
+        this->speed_ = 700.0f;
 
         this->setMunitionName("LaserMunition");