Changeset 10443 in orxonox.OLD

Timestamp:

Jan 28, 2007, 3:06:13 PM (17 years ago)

Author:

patrick

Message:

weapon now added to the main model

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (2 diffs)
• world_entities/weapons/weapon.cc (modified) (4 diffs)
• world_entities/weapons/weapon.h (modified) (3 diffs)

trunk/src/story_entities/game_world.cc

@@ -250 +250 @@
   if ( this->dataTank->localPlayer != NULL)
     this->dataTank->localPlayer->hud().notifyUser(text);
-  PRINTF(0)("===============\n==========\n========\n");
 }
 

trunk/src/world_entities/npcs/npc.cc

@@ -185 +185 @@
     if( obj != NULL && obj->isA( Weapon::staticClassID()))
     {
+      Weapon* w = dynamic_cast<Weapon*>(obj);
       PRINTF(0)("created a weapon\n");
+      int preferedSlot = w->getPreferedSlot();
+      int preferedSide = w->getPreferedSide();
+
+      this->addWeapon( w, preferedSide, preferedSlot);
     }
   }
@@ -210 +215 @@
   {
     if (weapon != NULL)
-      PRINTF(2)("Unable to add Weapon (%s::%s) to %s::%s\n",
+      PRINTF(1)("Unable to add Weapon (%s::%s) to %s::%s\n",
                 weapon->getClassCName(), weapon->getCName(), this->getClassCName(), this->getCName());
     else
-      PRINTF(2)("No weapon defined\n");
+      PRINTF(1)("No weapon defined\n");
     return false;
 

trunk/src/world_entities/weapons/weapon.cc

@@ -124 +124 @@
   this->segs = 1;
 
+  this->preferedSide = -1;
+  this->preferedSlot = -1;
+
   this->shootAnim = new Animation3D**[this->getBarrels()];
   for (int i = 0; i < this->getBarrels(); i++)
@@ -159 +162 @@
  * needed, if there are more than one barrel or segments
  */
-void Weapon::init2() 
+void Weapon::init2()
 {
   if (this->barrels == 1 && this->segs == 1)
@@ -206 +209 @@
   LoadParam(root, "projectile", this, Weapon, setProjectileTypeC)
   .describe("Sets the name of the Projectile to load onto the Entity");
+
+  LoadParam(root, "energy", this, Weapon, setEnergyMax)
+  .describe("number of shoots/ energy whatever");
+
+  LoadParam(root, "slot", this, Weapon, setPreferedSlot)
+  .describe("slot this weapon will be added");
 /*
   LoadParam(root, "emission-point", this, Weapon, setEmissionPoint)
@@ -463 +472 @@
     return energyToAdd - maxAddEnergy;
   }
-  
+
 }
 

trunk/src/world_entities/weapons/weapon.h

@@ -187 +187 @@
     void deconstr();
 
+    inline int getPreferedSide() { return this->preferedSide; }
+    inline int getPreferedSlot() { return this->preferedSlot; }
+
+
   protected:
     //! ACTION: these functions are handled by the Weapon itself, and must be called by requestAction(WeaponAction);
@@ -202 +206 @@
     static const char*   stateToChar(WeaponState state);
 
+    void setPreferedSlot(int slot, int side) { this->preferedSlot = slot; this->preferedSide = side; }
 
 
@@ -261 +266 @@
     Animation3D***         shootAnim;
 
+    int                    preferedSlot;                    //!< prefered slot to add
+    int                    preferedSide;                    //!< prefered side (left/right) to be added
+
   };