Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 5, 2009, 11:27:54 PM (15 years ago)
Author:
landauf
Message:

merged weaponsystem branch back to trunk

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r2826 r2893  
    249249            ExplosionChunk* chunk = new ExplosionChunk(this->getCreator());
    250250            chunk->setPosition(this->getPosition());
    251 
    252251        }
    253252    }
    … …  
    270269    }
    271270
     271
     272    /* WeaponSystem:
     273    *   functions load Slot, Set, Pack from XML and make sure all parent-pointers are set.
     274    *   with setWeaponPack you can not just load a Pack from XML but if a Pack already exists anywhere, you can attach it.
     275    *       --> e.g. Pickup-Items
     276    */
    272277    void Pawn::setWeaponSlot(WeaponSlot * wSlot)
    273278    {
Note: See TracChangeset for help on using the changeset viewer.