Changeset 9016 for code/trunk/src/modules/weapons/projectiles

Timestamp:

Feb 15, 2012, 11:51:58 PM (13 years ago)

Author:

jo

Message:

Merging presentation2011 branch to trunk. Please check for possible bugs.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/Rocket.cc (modified) (3 diffs)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)

code/trunk/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())
             {
@@ -163 +161 @@
         
         this->player_ = this->getShooter()->getPlayer();
-        this->getShooter()->getPlayer()->startTemporaryControl(this);
+        if(this->player_)
+            this->player_->startTemporaryControl(this);
 
         if( GameMode::isMaster() )

code/trunk/src/modules/weapons/projectiles/Rocket.h

@@ -122 +122 @@
 
             WeakPtr<PlayerInfo> player_; //!< The player that controls the Rocket.
+            //WeakPtr<Pawn> pawn_; //!< The pawn that controls the Rocket. TODO
             Timer destroyTimer_; //!< Timer to destroy the projectile after its lifetime has run out.
             float lifetime_; //!< The time the projectile exists.