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

Timestamp:

Jan 25, 2007, 11:27:47 PM (17 years ago)

Author:

patrick

Message:

merged branche gui

File:

• trunk/src/world_entities/script_trigger.cc (modified) (3 diffs)

trunk/src/world_entities/script_trigger.cc

@@ -181 +181 @@
    }
 
-  if(triggerRemains && scriptCalled)
+ if(triggerRemains && scriptCalled)
   {
     executeAction(timestep);
@@ -190 +190 @@
   {
     if( !invert && this->distance(target) < radius)
+    {
+    //printf("Distance is %f \n", this->distance(target));
+    executeAction(timestep);
+    scriptCalled = true;
+    return;
+
+    }
+    else if( invert && this->distance(target) > radius)
     {
       executeAction(timestep);
       scriptCalled = true;
       return;
-
-    }
-    else if( invert && this->distance(target) > radius)
-    {
-      executeAction(timestep);
-      scriptCalled = true;
-      return;
-    }
-  }
- //else
-   //printf("SCRIPTTRIGGER: target out of range\n");
-
+    }
+  }
 }
 
@@ -211 +209 @@
 void ScriptTrigger::executeAction(float timestep)
 {
-
   if(scriptIsOk)
   {