Changeset 6315 for code/branches/presentation2

Timestamp:

Dec 10, 2009, 8:56:48 PM (15 years ago)

Author:

scheusso

Message:

fixed rocket on client (uninitialised values)

File:

• code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) (6 diffs)

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

@@ -55 +55 @@
 
         this->localAngularVelocity_ = 0;
+        this->bDestroy_ = false;
+        this->lifetime_ = 100;
         
         if (GameMode::isMaster())
@@ -60 +62 @@
             this->setCollisionType(WorldEntity::Kinematic);
             this->setVelocity(0,0,-100);
-            this->lifetime_ = 100;
-            this->bDestroy_ = false;
         
             Model* model = new Model(this);
@@ -82 +82 @@
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
+            
+            this->defSndWpnEngine_ = new WorldSound(this);
+            this->defSndWpnEngine_->setLooping(true);
+            this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
+            this->attach(defSndWpnEngine_);
+
+            this->defSndWpnLaunch_ = new WorldSound(this);
+            this->defSndWpnLaunch_->setLooping(false);
+            this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
+            this->attach(defSndWpnLaunch_);
+        }
+        else
+        {
+            this->defSndWpnEngine_ = 0;
+            this->defSndWpnLaunch_ = 0;
         }
         
@@ -88 +103 @@
         camPosition->setAllowMouseLook(true);
         this->addCameraPosition(camPosition);
-
-        if( GameMode::isMaster() )
-        {
-            this->defSndWpnEngine_ = new WorldSound(this);
-            this->defSndWpnEngine_->setLooping(true);
-            this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
-            this->attach(defSndWpnEngine_);
-
-            this->defSndWpnLaunch_ = new WorldSound(this);
-            this->defSndWpnLaunch_->setLooping(false);
-            this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
-            this->attach(defSndWpnLaunch_);
-        }
-        else
-        {
-            this->defSndWpnEngine_ = 0;
-            this->defSndWpnLaunch_ = 0;
-        }
     }
 
@@ -120 +117 @@
                 this->player_->stopTemporaryControl();
             }
-            if(this->defSndWpnEngine_->isPlaying())
-            {
-                this->defSndWpnEngine_->stop();
-            }
-            if(this->defSndWpnLaunch_->isPlaying())
-            {
-                this->defSndWpnLaunch_->stop();
-            }
-            delete this->defSndWpnEngine_;
-            delete this->defSndWpnLaunch_;
+            if ( this->defSndWpnEngine_ )
+            {
+                if ( this->defSndWpnEngine_->isPlaying() )
+                    this->defSndWpnEngine_->stop();
+                delete this->defSndWpnEngine_;
+            }
+            if ( this->defSndWpnLaunch_ )
+            {
+                if ( this->defSndWpnLaunch_->isPlaying())
+                    this->defSndWpnLaunch_->stop();
+                delete this->defSndWpnLaunch_;
+            }
         }
     }
@@ -150 +149 @@
         this->owner_->getPlayer()->startTemporaryControl(this);
 
-        this->defSndWpnEngine_->play();
-        this->defSndWpnLaunch_->play();
+        if( GameMode::isMaster() )
+        {
+            this->defSndWpnEngine_->play();
+            this->defSndWpnLaunch_->play();
+        }
     }