Changeset 1063 for code/trunk/src/orxonox/tools

Timestamp:

Apr 14, 2008, 6:23:52 PM (16 years ago)

Author:

landauf

Message:

fixed an interesting bug in ObjectList/MetaObjectList/Iterator: it's now possible to delete multiple objects in one function-call while iterating through the objects. (and it would have crashed with std::list as well, so no stupid comments please )

added a feature in Timer.cc, allowing timers to tick faster than orxonox. this is from core2-branch but got lost while merging.

File:

• code/trunk/src/orxonox/tools/Timer.cc (modified) (2 diffs)

code/trunk/src/orxonox/tools/Timer.cc

@@ -108 +108 @@
                 // It's time to call the function
                 if (this->bLoop_)
-                    // Q: Why '+=' and not '='? A: Think about it. It's more accurate like that. Seriously.
-                    this->time_ += this->interval_;
+                {
+                    this->time_ += this->interval_; // Q: Why '+=' and not '='? A: Think about it. It's more accurate like that. Seriously.
+                    while (this->time_ <= 0)
+                    {
+                        // The interval was shorter than one tick, so execute the function more than once
+                        this->run();
+                        this->time_ += this->interval_;
+                    }
+                }
                 else
                     this->stopTimer(); // Stop the timer if we don't want to loop
@@ -117 +124 @@
         }
     }
-
 }