Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6137 in orxonox.OLD for branches


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/objectmanager/src/lib/collision_detection/cd_engine.cc

    r6135 r6137  
    116116  while (pre1 != list1.end())
    117117  {
    118     entity1 = pre1;
    119     pre1++;
     118    entity1 = pre1++;
    120119    if( likely((*entity1) != this->terrain))
    121120    {
     
    123122      while (pre2 != list2.end())
    124123      {
    125         entity2 = pre2;
    126         pre2++;
     124        entity2 = pre2++;
    127125        if( likely((*entity2) != this->terrain))
    128126        {
  • branches/objectmanager/src/lib/coord/p_node.h

    r6078 r6137  
    7979
    8080  // ACTIVATION //
    81   inline void activateNode() { this->bActive = true; };
     81  inline void activateNode() { this->bActive = this->bRelCoorChanged = this->bRelDirChanged = true; };
    8282  inline void deactivateNode() { this->bActive = false; };
    8383  inline bool getNodeActiveState() { return this->bActive; };
  • branches/objectmanager/src/world_entities/weapons/weapon_manager.cc

    r6123 r6137  
    244244  //! @todo check if the weapon is already assigned to another config in another slot
    245245  this->configs[configID][slotID] = weapon;
    246   weapon->toList(parent->getOMListNumber());
    247246  if (this->parent != NULL)
     247  {
    248248    this->parent->addChild(weapon);
     249  }
    249250  PRINTF(3)("Added a new Weapon to the WeaponManager: config %i/ slot %i\n", configID, slotID);
    250251}
     
    372373      else
    373374      {
     375        if (this->currentSlotConfig[i].currentWeapon != NULL)
     376          this->currentSlotConfig[i].currentWeapon->toList(OM_NULL);
    374377        tickWeapon = this->currentSlotConfig[i].currentWeapon = this->currentSlotConfig[i].nextWeapon;
    375378        if (tickWeapon != NULL)
     
    377380          tickWeapon->requestAction(WA_ACTIVATE);
    378381          tickWeapon->setParent(&this->currentSlotConfig[i].position);
     382          tickWeapon->toList(this->parent->getOMListNumber());
    379383          this->currentSlotConfig[i].position.activateNode();
    380384        }
Note: See TracChangeset for help on using the changeset viewer.