^^

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

diff --git a/src/lib/timer.c b/src/lib/timer.c
index 69dd5e9f708a10ecb5478a951f163d8a45ea74ad..b5edff98b892cfd496fe6b05d05fd1a06bada9d4 100755 (executable)
--- a/src/lib/timer.c
+++ b/src/lib/timer.c
@@ -24,24 +24,44 @@
 \r
 clock_t start_timer(global_game_variables_t *gv)\r
 {\r
-       //time(&(this->t));\r
-       gv->t = clock();\r
-       gv->tiku = 0;\r
-       gv->clock = (word far*) 0x046C; /* 18.2hz clock */\r
-       return gv->t;\r
+       gv->kurokku.t = clock();\r
+       gv->kurokku.tiku = 0;\r
+       gv->kurokku.clock_start = *clockw;\r
+       gv->kurokku.clock = clockw;\r
+       gv->kurokku.frames_per_second = 60;\r
+       gv->pee = _nmalloc(sizeof(byte)*2);\r
+       //turn this off if XT\r
+       switch(detectcpu())\r
+       {\r
+               case 0:\r
+                       gv->kurokku.fpscap=0;\r
+               break;\r
+               default:\r
+                       gv->kurokku.fpscap=1;\r
+               break;\r
+       }\r
+       return gv->kurokku.t;\r
 }\r
 \r
 double elapsed_timer(global_game_variables_t *gv)\r
 {\r
-       return (clock() - gv->t) / CLOCKS_PER_SEC;\r
+       return (clock() - gv->kurokku.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
-       return (gv->t) / CLOCKS_PER_SEC;\r
-}*/\r
+       double clocku;\r
+       clocku = (clock() - gv->kurokku.t) / CLOCKS_PER_SEC;\r
+       gv->kurokku.t = clock();\r
+       return clocku;\r
+}\r
 \r
-double time_in_seconds(time_t in_t)\r
+double time_in_seconds(global_game_variables_t *gv)\r
 {\r
-       return (in_t) / CLOCKS_PER_SEC;\r
+       return (gv->kurokku.t) / CLOCKS_PER_SEC;\r
 }\r
+\r
+/*double time_in_seconds(time_t in_t)\r
+{\r
+       return (in_t) / CLOCKS_PER_SEC;\r
+}*/\r