Changeset 6803

Timestamp:

Apr 29, 2010, 2:10:18 PM (14 years ago)

Author:

gnadler

Message:

 

Location:

code/branches/rocket/src

Files:

• modules/weapons/CMakeLists.txt (modified) (1 diff)
• modules/weapons/RocketController.cc (added)
• modules/weapons/RocketController.h (added)
• modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• modules/weapons/projectiles/SimpleRocket.cc (modified) (3 diffs)
• orxonox/controllers/RocketController.cc (deleted)
• orxonox/controllers/RocketController.h (deleted)

code/branches/rocket/src/modules/weapons/CMakeLists.txt

@@ -1 +1 @@
 SET_SOURCE_FILES(WEAPONS_SRC_FILES
   MuzzleFlash.cc
+  RocketController.cc
 )
 

code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt

@@ -5 +5 @@
   LightningGunProjectile.cc
   Rocket.cc
+  SimpleRocket.cc
 )

code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -39 +39 @@
 #include "infos/PlayerInfo.h"
 #include "controllers/Controller.h"
-#include "controllers/RocketController.h"
+#include "weapons/RocketController.h"
 #include "sound/WorldSound.h"
 
@@ -59 +59 @@
         this->lifetime_ = 100;
                 //this->camera_ = null;
-                RocketController* myController = new RocketController();
-                this->setController(myController));
-                myController->setControllableEntity(this);
+                RocketController* myRController = new RocketController(this);
+                this->setController(myRController);
+                myRController->setRocket(this, myRController);
+                
+                //this->getController()->setControllableEntity(this);
+                //myController->setControllableEntity(this);
                 //this->getController()->setControllableEntity(this);
         //this->controllableEntity_->setController(this->controller_);
@@ -90 +93 @@
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
         }
-                this->
 
     }