finally fixed broken main loop

[chaz/yoink] / src / Moof / Timer.hh

diff --git a/src/Moof/Timer.hh b/src/Moof/Timer.hh
index bb0b48334c6b24cab36f8a8e4328f5e8b80186ea..246b4b1e0188974ea4dc3b600dd988a2d5bb95d1 100644 (file)
--- a/src/Moof/Timer.hh
+++ b/src/Moof/Timer.hh
@@ -53,7 +53,7 @@ public:
        {
                INVALID         = -1,
                NORMAL          =  0,
-               ABSOLUTEE       =  1,   // the ABSOLUTE keyword isn't available on win32...
+               ACTUAL          =  1,
                REPEAT          =  2
        };
 
@@ -102,7 +102,7 @@ public:
         * sleep for the requested amount of time (and maybe longer).
         */
 
-       static void sleep(Scalar seconds, bool absolute = false);
+       static void sleep(Scalar seconds, Mode mode = NORMAL);
 
 
        static Scalar getNextFire()
@@ -110,6 +110,7 @@ public:
                return gNextFire;
        }
 
+       static void fireIfExpired();
        static void fireIfExpired(Scalar t);
 
 private:
@@ -124,7 +125,7 @@ private:
        unsigned        mId;
 
        static Scalar                                           gNextFire;
-       static std::map<unsigned,Timer&>        gTimers;
+       static std::map<unsigned,Timer*>        gTimers;
 };