Changeset 5574 in orxonox.OLD

Timestamp:

Nov 15, 2005, 9:29:57 PM (18 years ago)

Author:

bensch

Message:

branches/world_entity: sync state

Location:

branches/world_entities/src/world_entities

Files:

• player.cc (modified) (3 diffs)
• weapons/aim.cc (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (2 diffs)
• weapons/weapon_manager.cc (modified) (1 diff)
• weapons/weapon_manager.h (modified) (1 diff)

branches/world_entities/src/world_entities/player.cc

@@ -133 +133 @@
 
   this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(10);
+  this->weaponMan->setSlotCount(6);
 
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
@@ -152 +152 @@
   this->weaponMan->setSlotPosition(5, Vector(-1.5, -.5, -.5));
   this->weaponMan->setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(6, Vector(-2.0, 0.1, -2.0));
-  this->weaponMan->setSlotPosition(7, Vector(-2.0, 0.1, 2.0));
-
-  this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
-  this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
-  this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));
+//
+//   this->weaponMan->setSlotPosition(6, Vector(-2.0, 0.1, -2.0));
+//   this->weaponMan->setSlotPosition(7, Vector(-2.0, 0.1, 2.0));
+//
+//   this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
+//   this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
+//
+//   this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
+//   this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
 
 }
@@ -342 +342 @@
 {
   Weapon* turret = NULL;
+
+  printf("free slot: %d\n", this->weaponMan->getNextFreeSlot(3, WTYPE_TURRET | WTYPE_ALLDIRS));
+
   if ((float)rand()/RAND_MAX < .1)
   {

branches/world_entities/src/world_entities/weapons/aim.cc

@@ -107 +107 @@
   while (likely(entity != NULL))
   {
-    if (entity->isA(CL_NPC) &&(source->getAbsCoor() - entity->getAbsCoor()).len() < 100)
+    if (entity->isA(CL_NPC) && source->getAbsCoor().x < entity->getAbsCoor().x && (source->getAbsCoor() - entity->getAbsCoor()).len() < 100)
     {
       if (this->getParent() != entity)
       {
         this->anim->replay();
-        this->setParentSoft(entity, 3);
+        this->setParentSoft(entity, 5);
       }
       delete iterator;

branches/world_entities/src/world_entities/weapons/aiming_turret.cc

@@ -24 +24 @@
 
 #include "null_parent.h"
-#include "state.h"
-#include "list.h"
+
 #include "animation3d.h"
 #include "sound_engine.h"
@@ -67 +66 @@
 {
   // model will be deleted from WorldEntity-destructor
-  delete this->target;
+//  delete this->target;
 }
 

branches/world_entities/src/world_entities/weapons/weapon_manager.cc

@@ -472 +472 @@
         (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
         (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
+        {
+        printf("%d %d %d %d\n", currentSlotConfig[i].capability, capability,  WTYPE_ALLKINDS, WTYPE_ALLDIRS);
+
       return i;
-  }
-  printf("SHIT\n");
+      }
+  }
   return -1;
 }

branches/world_entities/src/world_entities/weapons/weapon_manager.h

@@ -92 +92 @@
     void debug() const;
 
-  private:
+ // private:
     int getNextFreeSlot(int configID, long capability = WTYPE_ALL);