Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10321 in orxonox.OLD for trunk/src/world_entities/script_trigger.cc


Ignore:
Timestamp:
Jan 24, 2007, 10:28:18 AM (17 years ago)
Author:
patrick
Message:

silvans complete patch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/script_trigger.cc

    r10319 r10321  
    187187  }
    188188
    189   if( !invert && this->distance(target) < radius)
    190   {
    191     executeAction(timestep);
    192     scriptCalled = true;
    193     return;
    194 
    195   }
    196   else if( invert && this->distance(target) > radius)
    197   {
    198     executeAction(timestep);
    199     scriptCalled = true;
    200     return;
     189  if( this->target != NULL)
     190  {
     191    if( !invert && this->distance(target) < radius)
     192    {
     193      executeAction(timestep);
     194      scriptCalled = true;
     195      return;
     196
     197    }
     198    else if( invert && this->distance(target) > radius)
     199    {
     200      executeAction(timestep);
     201      scriptCalled = true;
     202      return;
     203    }
    201204  }
    202205 //else
Note: See TracChangeset for help on using the changeset viewer.