Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 19, 2007, 4:06:51 PM (18 years ago)
Author:
snellen
Message:

Merged inputdevice-branch back to trunk: New ScriptTrigger (ActionTrigger) available

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/script_triggers/space_trigger.cc

    r10622 r10638  
    128128  if(triggerRemains && scriptCalled )
    129129  {
    130     executeAction(timestep);
     130    executeScriptFunction(timestep);
    131131    return;
    132132  }
    … …  
    136136    if( !invert && this->distance(target) < radius)
    137137    {
    138     //printf("Distance is %f \n", this->distance(target));
    139       executeAction(timestep);
     138      executeScriptFunction(timestep);
    140139      scriptCalled = true;
    141140      return;
    … …  
    144143    else if( invert && this->distance(target) > radius)
    145144    {
    146       executeAction(timestep);
     145      executeScriptFunction(timestep);
    147146      scriptCalled = true;
    148147      return;
Note: See TracChangeset for help on using the changeset viewer.