Changeset 59

Timestamp:

10/18/2007 12:09:24 AM (5 years ago)

Author:

art

Message:

nrScript, corrected wrong behaviour on subscripts which are executed with runcomplete parameter

File:

• trunk/src/nrEngine/Script.cpp (modified) (5 diffs)

trunk/src/nrEngine/Script.cpp

@@ -35 +35 @@
                 mFirstRunTimed = true;
                 mScriptStartTime = 0;
+
+        mTimer = Engine::sClock()->createTimer();
+        mTimer->setPause(true);
         }
 
@@ -420 +423 @@
                 mTimer->setPause(false);
                 mTime = mTimer->getTime();
-                
-                //printf("%s (%f - %f)\n", getResourceName().c_str(), mTime, mScriptStartTime);
 
                 // do execute the script only if start time was passed
@@ -427 +428 @@
                 {
                         // if the script is waiting for the start, then it runs in a loop mode 
-                        setRunOnce(false);
+                        //setRunOnce(false);
                         
                         // do nothing at now
@@ -530 +531 @@
         Result Script::fullRun()
         {
+        // check if start time already passed
+        mTimer->setPause(false);
+        mTime = mTimer->getTime();
+
+        // do execute the script only if start time was passed
+        if (mScriptStartTime > mTime)
+        {
+            return OK;
+        }
 
                 // check for looped script
@@ -590 +600 @@
                 
                 // intialize the timer and pause it
-                mTimer = Engine::sClock()->createTimer();
-                mTimer->setPause(true);
+                //mTimer = Engine::sClock()->createTimer();
+                //mTimer->setPause(true);
                 
                 // reset the script, so it can run