From: sparky4 <sparky4@cock.li>
Date: Fri, 22 Apr 2016 14:36:51 +0000 (-0500)
Subject: repo sync
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=2c7b0a75b6ce00049173e317fa8636c997ac93eb;p=16.git

repo sync
---

diff --git a/pcx2vrl b/pcx2vrl
index 06179c75..bd947e55 100755
Binary files a/pcx2vrl and b/pcx2vrl differ
diff --git a/pcxsscut b/pcxsscut
index 2ce56d28..1deec74d 100755
Binary files a/pcxsscut and b/pcxsscut differ
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 1780d960..af1a9bff 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -594,22 +594,15 @@ void shinku(global_game_variables_t *gv)
 	//modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);
 	if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))
 	{
-		word x = (16) + gv->video.page[shinku_fps_indicator_page].dx; // follow the screen
-		word y = (16) + gv->video.page[shinku_fps_indicator_page].dy; // follow the screen
+		word x = (0) + gv->video.page[shinku_fps_indicator_page].dx; // follow the screen
+		word y = (0) + gv->video.page[shinku_fps_indicator_page].dy; // follow the screen
 		word col = 7;
 		word bgcol = 0;
 		word type = 0;
-
-		//t=(((*(gv->clock))-gv->clock_start) /18.2);
 		sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-//		printf("%s\n", gv->pee);
-		//FIXME PLEASE!!
 		modexprint(&(gv->video.page[shinku_fps_indicator_page]), x, y, type, col, bgcol, gv->pee);
-//++++	modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
-		//(gv->clock_start)=*(gv->clock);
 		gv->kurokku.tiku=0;
 	}
-	//modexprint(page, 16, 16, 1, 15, 0, pee);
 	gv->kurokku.tiku++;
 	switch(gv->kurokku.fpscap)
 	{
diff --git a/src/scroll.c b/src/scroll.c
index d13d7d01..491610d3 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -379,7 +379,7 @@ void main(int argc, char *argv[])
 				gvar.kurokku.fpscap=0;
 			break;
 		}
-		IN_Ack();
+		//IN_Ack();
 	}
 	//TODO fmemtest into page
 	if(IN_KeyDown(4+1))	//4
diff --git a/vrl2vrs b/vrl2vrs
index cee2d1d5..b67956b7 100755
Binary files a/vrl2vrs and b/vrl2vrs differ
diff --git a/vrsdump b/vrsdump
index a75a903a..dbaba30e 100755
Binary files a/vrsdump and b/vrsdump differ