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

Timestamp:

Dec 20, 2011, 10:03:15 PM (13 years ago)

Author:

jo

Message:

Quick fix for the rocket. Taking care of this issue later.

Location:

code/branches/presentation2011/src/modules/weapons/projectiles

Files:

• Rocket.cc (modified) (1 diff)
• Rocket.h (modified) (1 diff)

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

@@ -161 +161 @@
         
         this->player_ = this->getShooter()->getPlayer();
-        this->getShooter()->getPlayer()->startTemporaryControl(this);
+        if(this->player_)
+            this->player_->startTemporaryControl(this);
 
         if( GameMode::isMaster() )

code/branches/presentation2011/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.