Changeset 9009 for code/branches

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

Files:

• data/levels/presentationHS11.oxw (modified) (3 diffs)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)

code/branches/presentation2011/data/levels/presentationHS11.oxw

@@ -16 +16 @@
 ?>
 
-<Level>
+<Level
+ gametype = "TeamGametype"
+>
   <templates>
     <Template link=lodtemplate_default />
@@ -28 +30 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
 
     <Script code="formationcontroller formationflight true" onLoad="true">
@@ -36 +38 @@
     </Script> <!-- make bots "friendly", doesn't work yet :-( -->
 
-    <SpaceShip position="3000,0,5000" lookat="-1300,-600,900" name="attacker" visible="true">
+    <SpaceShip position="1000,-500,2000" lookat="-1300,-600,900" name="attacker" visible="true">
         <!--events>
             <visibility>

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.