Changeset 6079 for code/branches/particles2/src/modules/weapons

Timestamp:

Nov 17, 2009, 10:59:25 AM (15 years ago)

Author:

scheusso

Message:

trying to make CE change possible

Location:

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

Files:

• Rocket.cc (modified) (4 diffs)
• Rocket.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #include "graphics/Model.h"
 #include "objects/collisionshapes/ConeCollisionShape.h"
+#include "infos/PlayerInfo.h"
+#include "controllers/Controller.h"
+#include "worldentities/CameraPosition.h"
 
 namespace orxonox
@@ -69 +72 @@
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
         }
+        
+        this->camPosition_ = new CameraPosition(this);
+        this->camPosition_->setPosition(0,0,0);
+        this->attach( this->camPosition_ );
+        this->addCameraPosition( this->camPosition_ );
     }
 
@@ -81 +89 @@
             this->collisionShape_->destroy();
             this->model_->destroy();
+            
+            if (GameMode::isMaster() && this->owner_)
+                this->owner_->getPlayer()->startControl(this->originalControllableEntity_);
+            this->camPosition_->destroy();
         }
     }
@@ -97 +109 @@
     {
         this->owner_ = owner;
+            
+        this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
+        this->owner_->getPlayer()->startControl(this);
     }
 

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

@@ -110 +110 @@
             inline float getDamage() const
                 { return this->damage_; }
+            virtual void fire(unsigned int firemode) {}
             
         private:
@@ -116 +117 @@
             float damage_;
             bool bDestroy_;
+            ControllableEntity* originalControllableEntity_;
             
             Model* model_;
+            CameraPosition* camPosition_;
             ConeCollisionShape* collisionShape_;
             Timer destroyTimer_;