Changeset 6814

Timestamp:

May 1, 2010, 6:15:40 PM (15 years ago)

Author:

gnadler

Message:

tried to fix ~RocketController() as well as that the rocket is not visible, but failed

Location:

code/branches/rocket

Files:

• data/levels/includes/weaponsettings3.oxi (modified) (1 diff)
• src/modules/weapons/RocketController.cc (modified) (1 diff)
• src/modules/weapons/RocketController.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (1 diff)

code/branches/rocket/data/levels/includes/weaponsettings3.oxi

@@ -39 +39 @@
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="5,5,5" />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" />
         </Weapon>
       </WeaponPack>

code/branches/rocket/src/modules/weapons/RocketController.cc

@@ -67 +67 @@
     }
 
-        /*
-        I wanted to define the controllable entity with this function but the compiler gives the error: line 80: rocket - unidentified identifier
-        or some similar error.
-        */
+
+        RocketController::~RocketController() {
+
+                delete this->getControllableEntity();
+
+        }
+
+
 
 }

code/branches/rocket/src/modules/weapons/RocketController.h

@@ -48 +48 @@
         public:
             RocketController(BaseObject* creator);
-                        virtual ~RocketController(){};
+                        virtual ~RocketController();
             
             virtual void tick(float dt);

code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -65 +65 @@
 
 
-      /*  this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-        rocket->setOrientation(this->getMuzzleOrientation());
-        rocket->setPosition(this->getMuzzlePosition());
-        rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+        con->getControllableEntity()->setOrientation(this->getMuzzleOrientation());
+        con->getControllableEntity()->setPosition(this->getMuzzlePosition());
+        /* rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
         rocket->scale(2);