Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9278


Ignore:
Timestamp:
Jun 4, 2012, 10:14:08 PM (12 years ago)
Author:
landauf
Message:

forgot that originator can be NULL

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc

    r9277 r9278  
    232232    {
    233233        // Applies multiplier given by the DamageBoost Pickup.
    234         damage *= originator->getDamageMultiplier();
     234        if (originator)
     235            damage *= originator->getDamageMultiplier();
    235236
    236237        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
Note: See TracChangeset for help on using the changeset viewer.