rewrote time lib using ctime

data/OpenRaider.init

@@ -1,25 +1,32 @@
 # OpenRaider configuration file
 
-set basedir   "~/.OpenRaider"
-set pakdir    "$(basedir)/paks"
-set audiodir  "$(basedir)/music"
-set datadir   "$(basedir)/data"
-set font      "$(datadir)/test.ttf"
+# File locations
+set basedir    "~/.OpenRaider"
+set pakdir     "$(basedir)/paks"
+set audiodir   "$(basedir)/music"
+set datadir    "$(basedir)/data"
+set font       "$(datadir)/test.ttf"
 
-set gldriver  "/usr/lib/libGL.so.1" # Not needed for Mac!
-set size      "1280x720"
+ # Not needed for Mac OS X
+set gldriver   "/usr/lib/libGL.so.1"
 
-set audio     true # Enable Audio Output
-set volume    0.5
+# Windowing
+set size       "1280x720"
+set fullscreen false
 
-set mouse_x   1.0
-set mouse_y   1.0
+# Audio
+set audio      true # Enable Audio Output
+set volume     0.5
 
-bind console  96
-bind forward  119
-bind backward 115
-bind jump     32
-bind crouch   99
-bind left     97
-bind right    100
-# bind attack   122
+# Input
+set mouse_x    1.0
+set mouse_y    1.0
+
+bind console   96
+bind forward   119
+bind backward  115
+bind jump      32
+bind crouch    99
+bind left      97
+bind right     100
+# bind attack    122

include/utils/time.h

@@ -3,21 +3,11 @@
  * \brief Time handling utilities
  *
  * \author xythobuz
- * \author Mongoose
  */
 
 #ifndef _UTILS_TIME_H_
 #define _UTILS_TIME_H_
 
-#if defined(linux) || defined(__APPLE__)
-#include <time.h>
-#include <sys/time.h>
-#endif
-
-extern struct timeval system_timer_start; //!< System timer start time
-extern struct timeval system_timer_stop; //!< System timer last read time
-extern struct timezone system_timer_tz; //!< System timer timezone info
-
 /*!
  * \brief Read the system timer
  * \returns number of ticks

src/utils/time.cpp

@@ -3,31 +3,23 @@
  * \brief Time handling utilities
  *
  * \author xythobuz
- * \author Mongoose
  */
 
-#include "utils/time.h"
-
-struct timeval system_timer_start;
-struct timeval system_timer_stop;
-struct timezone system_timer_tz;
+#include <ctime>
 
-unsigned int systemTimerGet() {
-    gettimeofday(&system_timer_stop, &system_timer_tz);
+#include "utils/time.h"
 
-    if (system_timer_start.tv_usec > system_timer_stop.tv_usec) {
-        system_timer_stop.tv_usec += 1000000;
-        system_timer_stop.tv_sec--;
-    }
+#define CLOCKS_PER_MS (CLOCKS_PER_SEC / 1000)
 
-    system_timer_stop.tv_usec -= system_timer_start.tv_usec;
-    system_timer_stop.tv_sec -= system_timer_start.tv_sec;
+clock_t system_timer_start;
+clock_t system_timer_stop;
 
-    return ((system_timer_stop.tv_sec - system_timer_start.tv_sec) * 1000)
-        + ((system_timer_stop.tv_usec - system_timer_start.tv_usec) / 1000);
+unsigned int systemTimerGet() {
+    system_timer_stop = clock();
+    return (system_timer_stop - system_timer_start) / CLOCKS_PER_MS;
 }
 
 void systemTimerReset() {
-    gettimeofday(&system_timer_start, &system_timer_tz);
+    system_timer_start = clock();
 }