X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftimer.c;h=b5edff98b892cfd496fe6b05d05fd1a06bada9d4;hb=80c0c07d5db1fc37fe3bf2919235b1baa612e35f;hp=cd900d1c03a308ef99fc76786107840640e8bde4;hpb=24c3f5a38faeaac043c74761e9f9dd63f15291e1;p=16.git

diff --git a/src/lib/timer.c b/src/lib/timer.c
index cd900d1c..b5edff98 100755
--- a/src/lib/timer.c
+++ b/src/lib/timer.c
@@ -24,34 +24,41 @@
 
 clock_t start_timer(global_game_variables_t *gv)
 {
-	//time(&(this->t));
-	gv->t = clock();
-	gv->tiku = 0;
-	gv->clock_start = *clockdw;
-	gv->clock = clockdw;
-	gv->frames_per_second = 60;
+	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
-	if(detectcpu() > 0) gv->fpscap=1;
-	else gv->fpscap=0;
-	return gv->t;
+	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 ticktock(global_game_variables_t *gv)
 {
 	double clocku;
-	clocku = (clock() - gv->t) / CLOCKS_PER_SEC;
-	gv->t = clock();
+	clocku = (clock() - gv->kurokku.t) / CLOCKS_PER_SEC;
+	gv->kurokku.t = clock();
 	return clocku;
 }
 
 double time_in_seconds(global_game_variables_t *gv)
 {
-	return (gv->t) / CLOCKS_PER_SEC;
+	return (gv->kurokku.t) / CLOCKS_PER_SEC;
 }
 
 /*double time_in_seconds(time_t in_t)