Changeset 10631 in orxonox.OLD for branches/inputdevice/src/world_entities/script_triggers/action_trigger.cc

Timestamp:

Apr 12, 2007, 7:10:23 PM (18 years ago)

Author:

snellen

Message:

Action Trigger finished

File:

• branches/inputdevice/src/world_entities/script_triggers/action_trigger.cc (modified) (3 diffs)

branches/inputdevice/src/world_entities/script_triggers/action_trigger.cc

@@ -51 +51 @@
   radius = 10;
   invert = false;
+  actionScheduled = false;
  
   if(root != NULL)
@@ -117 +118 @@
 
 
-void ActionTrigger::tick(float timestep)
+void ActionTrigger::tick( float timestep )
 {
-  if( scriptFinished ) return;
+  if( scriptFinished || !actionScheduled ) return;
 
   if( this->target != NULL)
@@ -125 +126 @@
     if( !invert && this->distance(target) < radius && actionScheduled)
     {
-    //printf("Distance is %f \n", this->distance(target));
-      executeAction(timestep);
+      executeScriptFunction(timestep);
       scriptCalled = true;
       return;
-
     }
     else if( invert && this->distance(target) > radius  && actionScheduled)
     {
-      executeAction(timestep);
+      executeScriptFunction(timestep);
       scriptCalled = true;
       return;