Finally fixed problems with demo mode.

[stargem2] / src / timing.cpp

diff --git a/src/timing.cpp b/src/timing.cpp
old mode 100755 (executable)
new mode 100644 (file)
index e7ac35f..2246e47
--- a/src/timing.cpp
+++ b/src/timing.cpp
@@ -1,10 +1,10 @@
 //
 // System time handlers
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2005 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
 // ---  ----------  ------------------------------------------------------------
@@ -20,119 +20,111 @@
 #include <stdint.h>
 #include "log.h"
 
-#define EVENT_LIST_SIZE       512
+#define EVENT_LIST_SIZE                512
 
 // NOTE ABOUT TIMING SYSTEM DATA STRUCTURES:
-
-// A queue won't work for this system because we can't guarantee that an event will go
-// in with a time that is later than the ones already queued up. So we just use a simple
-// list.
-
-// Although if we used an insertion sort we could, but it wouldn't work for adjusting
-// times...
+//
+// A queue won't work for this system because we can't guarantee that an event
+// will go in with a time that is later than the ones already queued up. So we
+// just use a simple list.
+//
+// Although if we used an insertion sort we could, but it wouldn't work for
+// adjusting times...
 // [In that case, we could pull the event out, close the gap, then do insertion sort]
 
 struct Event
 {
-    bool valid;
-    double eventTime;
-    void (* timerCallback)(void);
+       bool valid;
+       double eventTime;
+       void (* timerCallback)(void);
 };
 
-
 static Event eventList[EVENT_LIST_SIZE];
 static uint32_t nextEvent;
 
-
 void InitializeEventList(void)
 {
-    for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
-        eventList[i].valid = false;
+       for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
+               eventList[i].valid = false;
 }
 
-
 //We just slap the next event into the list, no checking, no nada...
 void SetCallbackTime(void (* callback)(void), double time)
 {
-    for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
-    {
-        if (!eventList[i].valid)
-        {
+       for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
+       {
+               if (!eventList[i].valid)
+               {
 //WriteLog("SCT: Found callback slot #%u...\n", i);
-            eventList[i].timerCallback = callback;
-            eventList[i].eventTime = time;
-            eventList[i].valid = true;
+                       eventList[i].timerCallback = callback;
+                       eventList[i].eventTime = time;
+                       eventList[i].valid = true;
 
-            return;
-        }
-    }
+                       return;
+               }
+       }
 
-    WriteLog("SetCallbackTime() failed to find an empty slot in the list!\n");
+       WriteLog("SetCallbackTime() failed to find an empty slot in the list!\n");
 }
 
-
 void RemoveCallback(void (* callback)(void))
 {
-    for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
-    {
-        if (eventList[i].valid && eventList[i].timerCallback == callback)
-        {
-            eventList[i].valid = false;
-
-            return;
-        }
-    }
+       for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
+       {
+               if (eventList[i].valid && eventList[i].timerCallback == callback)
+               {
+                       eventList[i].valid = false;
+
+                       return;
+               }
+       }
 }
 
-
 void AdjustCallbackTime(void (* callback)(void), double time)
 {
-    for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
-    {
-        if (eventList[i].valid && eventList[i].timerCallback == callback)
-        {
-            eventList[i].eventTime = time;
-
-            return;
-        }
-    }
+       for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
+       {
+               if (eventList[i].valid && eventList[i].timerCallback == callback)
+               {
+                       eventList[i].eventTime = time;
+
+                       return;
+               }
+       }
 }
 
-
 double GetTimeToNextEvent(void)
 {
-    double time = 0;
-    bool firstTime = true;
-
-    for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
-    {
-        if (eventList[i].valid)
-        {
-            if (firstTime)
-                time = eventList[i].eventTime, nextEvent = i, firstTime = false;
-            else
-            {
-                if (eventList[i].eventTime < time)
-                    time = eventList[i].eventTime, nextEvent = i;
-            }
-        }
-    }
-
-    return time;
+       double time = 0;
+       bool firstTime = true;
+
+       for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
+       {
+               if (eventList[i].valid)
+               {
+                       if (firstTime)
+                               time = eventList[i].eventTime, nextEvent = i, firstTime = false;
+                       else
+                       {
+                               if (eventList[i].eventTime < time)
+                                       time = eventList[i].eventTime, nextEvent = i;
+                       }
+               }
+       }
+
+       return time;
 }
 
-
 void HandleNextEvent(void)
 {
-    double elapsedTime = eventList[nextEvent].eventTime;
-    void (* event)(void) = eventList[nextEvent].timerCallback;
+       double elapsedTime = eventList[nextEvent].eventTime;
+       void (* event)(void) = eventList[nextEvent].timerCallback;
 
-    for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
-        if (eventList[i].valid)
-            eventList[i].eventTime -= elapsedTime;
+       for(uint32_t i=0; i<EVENT_LIST_SIZE; i++)
+               if (eventList[i].valid)
+                       eventList[i].eventTime -= elapsedTime;
 
-    eventList[nextEvent].valid = false;      // Remove event from list...
+       eventList[nextEvent].valid = false;      // Remove event from list...
 
-    (*event)();
+       (*event)();
 }
-