many improvements for testing have been added ^^

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

diff --git a/src/lib/timer.c b/src/lib/timer.c
index cd900d1c03a308ef99fc76786107840640e8bde4..cdf54801a5040cf99ea52b3f8d0c6299a829cec2 100755 (executable)
--- a/src/lib/timer.c
+++ b/src/lib/timer.c
@@ -24,34 +24,40 @@
 \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_start = *clockdw;\r
-       gv->clock = clockdw;\r
-       gv->frames_per_second = 60;\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
        //turn this off if XT\r
-       if(detectcpu() > 0) gv->fpscap=1;\r
-       else gv->fpscap=0;\r
-       return gv->t;\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 ticktock(global_game_variables_t *gv)\r
 {\r
        double clocku;\r
-       clocku = (clock() - gv->t) / CLOCKS_PER_SEC;\r
-       gv->t = clock();\r
+       clocku = (clock() - gv->kurokku.t) / CLOCKS_PER_SEC;\r
+       gv->kurokku.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
+       return (gv->kurokku.t) / CLOCKS_PER_SEC;\r
 }\r
 \r
 /*double time_in_seconds(time_t in_t)\r