Changeset 6137 in orxonox.OLD for branches

Timestamp:

Dec 16, 2005, 6:10:59 PM (19 years ago)

Author:

bensch

Message:

om: linkage-fixes in the WeaponManager

Location:

branches/objectmanager/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• world_entities/weapons/weapon_manager.cc (modified) (3 diffs)

branches/objectmanager/src/lib/collision_detection/cd_engine.cc

@@ -116 +116 @@
   while (pre1 != list1.end())
   {
-    entity1 = pre1;
-    pre1++;
+    entity1 = pre1++;
     if( likely((*entity1) != this->terrain))
     {
@@ -123 +122 @@
       while (pre2 != list2.end())
       {
-        entity2 = pre2;
-        pre2++;
+        entity2 = pre2++;
         if( likely((*entity2) != this->terrain))
         {

branches/objectmanager/src/lib/coord/p_node.h

@@ -79 +79 @@
 
   // ACTIVATION //
-  inline void activateNode() { this->bActive = true; };
+  inline void activateNode() { this->bActive = this->bRelCoorChanged = this->bRelDirChanged = true; };
   inline void deactivateNode() { this->bActive = false; };
   inline bool getNodeActiveState() { return this->bActive; };

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

@@ -244 +244 @@
   //! @todo check if the weapon is already assigned to another config in another slot
   this->configs[configID][slotID] = weapon;
-  weapon->toList(parent->getOMListNumber());
   if (this->parent != NULL)
+  {
     this->parent->addChild(weapon);
+  }
   PRINTF(3)("Added a new Weapon to the WeaponManager: config %i/ slot %i\n", configID, slotID);
 }
@@ -372 +373 @@
       else
       {
+        if (this->currentSlotConfig[i].currentWeapon != NULL)
+          this->currentSlotConfig[i].currentWeapon->toList(OM_NULL);
         tickWeapon = this->currentSlotConfig[i].currentWeapon = this->currentSlotConfig[i].nextWeapon;
         if (tickWeapon != NULL)
@@ -377 +380 @@
           tickWeapon->requestAction(WA_ACTIVATE);
           tickWeapon->setParent(&this->currentSlotConfig[i].position);
+          tickWeapon->toList(this->parent->getOMListNumber());
           this->currentSlotConfig[i].position.activateNode();
         }