Changeset 6891 for code/branches/ai/src/modules/pickup

Timestamp:

May 10, 2010, 4:40:44 PM (15 years ago)

Author:

gasserlu

Message:

DroneController modified, sameTeam() mod. hack

File:

• code/branches/ai/src/modules/pickup/items/DronePickup.cc (modified) (2 diffs)

code/branches/ai/src/modules/pickup/items/DronePickup.cc

@@ -134 +134 @@
                 
                 //Attach to pawn
-                Drone* drone = new Drone(this);
+                Drone* drone = new Drone(pawn->getCreator()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
                 drone->addTemplate(this->getDroneTemplate());
-                pawn->attach(drone);
+
                 Controller* controller = drone->getController();
                 DroneController* droneController = dynamic_cast<DroneController*>(controller);
@@ -143 +143 @@
                     droneController->setOwner(pawn);
                 }
-
+                
+                Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(30,0,-30);
+                drone->setPosition(spawnPosition);
+                
                 //! The pickup has been used up.
                 this->setUsed(false);