added fps system ^^

[16.git] / src / lib / timer.c

diff --git a/src/lib/timer.c b/src/lib/timer.c
old mode 100644 (file)
new mode 100755 (executable)
index 69dd5e9..cd900d1
--- a/src/lib/timer.c
+++ b/src/lib/timer.c
@@ -27,7 +27,12 @@ clock_t start_timer(global_game_variables_t *gv)
        //time(&(this->t));\r
        gv->t = clock();\r
        gv->tiku = 0;\r
-       gv->clock = (word far*) 0x046C; /* 18.2hz clock */\r
+       gv->clock_start = *clockdw;\r
+       gv->clock = clockdw;\r
+       gv->frames_per_second = 60;\r
+       //turn this off if XT\r
+       if(detectcpu() > 0) gv->fpscap=1;\r
+       else gv->fpscap=0;\r
        return gv->t;\r
 }\r
 \r
@@ -36,12 +41,20 @@ double elapsed_timer(global_game_variables_t *gv)
        return (clock() - gv->t) / CLOCKS_PER_SEC;\r
 }\r
 \r
-/*double time_in_seconds(global_game_variables_t *gv)\r
+double ticktock(global_game_variables_t *gv)\r
+{\r
+       double clocku;\r
+       clocku = (clock() - gv->t) / CLOCKS_PER_SEC;\r
+       gv->t = clock();\r
+       return clocku;\r
+}\r
+\r
+double time_in_seconds(global_game_variables_t *gv)\r
 {\r
        return (gv->t) / CLOCKS_PER_SEC;\r
-}*/\r
+}\r
 \r
-double time_in_seconds(time_t in_t)\r
+/*double time_in_seconds(time_t in_t)\r
 {\r
        return (in_t) / CLOCKS_PER_SEC;\r
-}\r
+}*/\r