X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftimer.c;h=b5edff98b892cfd496fe6b05d05fd1a06bada9d4;hb=2184d00753936aa3d8b74e7afb047220beec834e;hp=69dd5e9f708a10ecb5478a951f163d8a45ea74ad;hpb=f1605e99959acfb32b36ae875601fc14dd670742;p=16.git

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