Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 15, 2009, 11:04:39 PM (14 years ago)
Author:
scheusso
Message:

god mode hack for presentation

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc

    r6295 r6356  
    168168    void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
    169169    {
    170         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
     170        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
    171171        {
    172172            this->damage(damage, originator);
    … …  
    179179    void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
    180180    {
    181         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
     181        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
    182182        {
    183183            this->damage(damage, originator);
Note: See TracChangeset for help on using the changeset viewer.