Changeset 7102 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 8:56:57 PM (19 years ago)

Author:

bensch

Message:

power ups can only be picked up once

Location:

trunk/src/world_entities

Files:

• npcs/ground_turret.cc (modified) (3 diffs)
• npcs/ground_turret.h (modified) (1 diff)
• power_ups/power_up.cc (modified) (3 diffs)
• power_ups/power_up.h (modified) (1 diff)
• projectiles/guided_missile.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)
• weapons/weapon.h (modified) (1 diff)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -67 +67 @@
   this->setHealth(300);
 
-  /*  left = new Turret();
-  left->setParent(this);
-  left->setRelCoor(0,10,0);
-  right = new Turret();
-  right->setParent(this);
-  right->setRelCoor(0,10,0);*/
+  this->weaponHolder[0].addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+  this->weaponHolder[1].addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+
+  this->weaponHolder[0].setRelCoor(0,25,0);
+  this->weaponHolder[0].setParent(this);
+  this->weaponHolder[1].setParent(this);
 }
 
@@ -101 +101 @@
     this->left->setRelCoor(0,10,-5);
     this->left->requestAction( WA_ACTIVATE);
+    this->left->setParent(&this->weaponHolder[0]);
   }
 
@@ -112 +113 @@
     this->right->setRelCoor(0,10,5);
     this->left->requestAction( WA_ACTIVATE);
+    this->right->setParent(&this->weaponHolder[0]);
   }
 }

trunk/src/world_entities/npcs/ground_turret.h

@@ -34 +34 @@
 
  private:
+   PNode  weaponHolder[2];
    Weapon *left, *right;
 };

trunk/src/world_entities/power_ups/power_up.cc

@@ -47 +47 @@
   this->pickupBuffer = NULL;
   this->respawnBuffer = NULL;
+
+  this->collider = NULL;
 }
 
@@ -120 +122 @@
   if(entity->isA(CL_EXTENDABLE))
   {
+    this->collider = entity;
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
@@ -144 +147 @@
     {
       this->toList(OM_COMMON);
+      this->collider = NULL;
       if (likely(this->respawnBuffer != NULL))
         this->soundSource.play(this->respawnBuffer);

trunk/src/world_entities/power_ups/power_up.h

@@ -53 +53 @@
   float respawnStart;
   static const char* respawnTypes[];
+
+  WorldEntity* collider;
 };
 

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -45 +45 @@
   this->setHealthMax(10);
   this->lifeSpan = 4.0;
-  this->agility = 1;
+  this->agility = 3.5;
   this->maxVelocity = 75;
 

trunk/src/world_entities/weapons/weapon.cc

@@ -115 +115 @@
   WorldEntity::loadParams(root);
 
-  LoadParam(root, "projectile", this, Weapon, setProjectileType)
+  LoadParam(root, "projectile", this, Weapon, setProjectileTypeC)
   .describe("Sets the name of the Projectile to load onto the Entity");
 
@@ -164 +164 @@
  * @param projectile the Name of the Projectile.
  */
-void Weapon::setProjectileType(const char* projectile)
+void Weapon::setProjectileTypeC(const char* projectile)
 {
   if (projectile == NULL)

trunk/src/world_entities/weapons/weapon.h

@@ -111 +111 @@
     inline long getCapability() const { return this->capability; };
     void setProjectileType(ClassID projectile);
-    void setProjectileType(const char* projectile);
+    void setProjectileTypeC(const char* projectile);
     /** @returns The projectile's classID */
     inline ClassID getProjectileType() { return this->projectile; };