Changeset 6101 for code/branches/particles2/src/modules

Timestamp:

Nov 20, 2009, 1:02:09 AM (15 years ago)

Author:

scheusso

Message:

rocket now steerable also on client
AIController shoots again now
fire network function is now in CE instead of Pawn
some changes in PlayerInfo that allow controlling of temporary objects (such as Rocket)

Location:

code/branches/particles2/src/modules/weapons/projectiles

Files:

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

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

@@ -137 +137 @@
         SUPER(Rocket, tick, dt);
         
-        if( GameMode::isMaster() )
+        if( this->hasLocalController() )
         {
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
@@ -196 +196 @@
     }
     
-    void Rocket::fire(unsigned int firemode)
+    void Rocket::fired(unsigned int firemode)
     {
         if (this->owner_)

code/branches/particles2/src/modules/weapons/projectiles/Rocket.h

@@ -110 +110 @@
             inline float getDamage() const
                 { return this->damage_; }
-            virtual void fire(unsigned int firemode);
+            virtual void fired(unsigned int firemode);
             
         private: