X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_timer.c;h=636a071df8006cee290aa39080333467b4c20eeb;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=0b5cf41684b797817425046634d7bd0cac2bde2b;hpb=afebb0aa9e93ca48e0955877d5cbd883e650d35f;p=16.git

diff --git a/src/lib/16_timer.c b/src/lib/16_timer.c
index 0b5cf416..636a071d 100755
--- a/src/lib/16_timer.c
+++ b/src/lib/16_timer.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -22,22 +22,26 @@
 
 #include "src/lib/16_timer.h"
 
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
+
 clock_t start_timer(global_game_variables_t *gv)
 {
 	gv->kurokku.t = clock();
-	gv->kurokku.tiku = 0;
+	gv->kurokku.tiku = 0; gv->video.sfip = 0;
 	gv->kurokku.clock_start = *clockw;
-	gv->kurokku.clock = clockw;
-	gv->kurokku.frames_per_second = 60;
-	gv->pee = _nmalloc(sizeof(byte)*16);
+	gv->kurokku.clock = (word *)clockw;
+	gv->kurokku.wcpu = WCPU_detectcpu();
+
 	//turn this off if XT
-	switch(detectcpu())
+	switch(gv->kurokku.wcpu)
 	{
 		case 0:
 			gv->kurokku.fpscap=0;
+			gv->kurokku.frames_per_second=1;
 		break;
 		default:
 			gv->kurokku.fpscap=1;
+			gv->kurokku.frames_per_second=FPSVALUE;
 		break;
 	}
 	return gv->kurokku.t;
@@ -66,6 +70,7 @@ double time_in_seconds(global_game_variables_t *gv)
 	return (in_t) / CLOCKS_PER_SEC;
 }*/
 
+#if 0
 /*	sync	*/
 void shinkutxt(global_game_variables_t *gv)
 {
@@ -73,25 +78,26 @@ void shinkutxt(global_game_variables_t *gv)
 	if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))
 	{
 		//t=(((*(gv->clock))-gv->clock_start) /18.2);
-		sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-		fprintf(stderr, "%s\n", gv->pee);
+		sprintf(global_temp_status_text, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv));
+		fprintf(stderr, "%s\n", global_temp_status_text);
 		//(gv->clock_start)=*(gv->clock);
 		gv->kurokku.tiku=0;
 	}
 	gv->kurokku.tiku++;
-	switch(gv->kurokku.fpscap)
-	{
-		case 0:
-			gv->kurokku.frames_per_second=1;
-		break;
-		case 1:
-			//turn this off if XT
-			WaitPee();
-			gv->kurokku.frames_per_second=60;
-		break;
-	}
+// 	switch(gv->kurokku.fpscap)
+// 	{
+// 		case 0:
+// 			gv->kurokku.frames_per_second=1;
+// 		break;
+// 		case 1:
+// 			//turn this off if XT
+// 			WaitPee();
+// 			gv->kurokku.frames_per_second=60;
+// 		break;
+// 	}
 }
 
+//#if 0
 void WaitPee()
 {
     while(inp(INPUT_STATUS_1)  & 8)  {
@@ -102,3 +108,4 @@ void WaitPee()
 	/* spin */
     }
 }
+#endif