From: sparky4 <sparky4@cock.li>
Date: Thu, 2 Jun 2016 13:57:35 +0000 (-0500)
Subject: added stuff ww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=c3cf8aaefd82b331a4da8e3fbfe4d96dd3804410;p=16.git

added stuff ww
---

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/fontgfx.c b/src/fontgfx.c
index 90e6a869..4c4c0443 100755
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -100,7 +100,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 	chx=0;
 	chy=0;
 	colpee=32;
-//	bios_cls();
 	/* position the cursor to home */
 //	vga_moveto(0,0);
 //	vga_sync_bios_cursor();
diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
old mode 100644
new mode 100755
diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
old mode 100644
new mode 100755
diff --git a/src/scroll.c b/src/scroll.c
index 8f8c27f5..6d6f0723 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -221,7 +221,6 @@ void main(int argc, char *argv[])
 		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
 	}
 
-
 	//the scripting stuff....
 	//if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
 	if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
@@ -235,31 +234,33 @@ void main(int argc, char *argv[])
 	}
 	if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
 	//debugging binds!
-	if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
-	if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; }
-	if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
-	if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
+	if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; IN_UserInput(1,1); }
+	if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; IN_UserInput(1,1); }
+	if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; IN_UserInput(1,1); }
+	if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; IN_UserInput(1,1); }
 	if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
-		//IN_Ack();
+		 IN_UserInput(1,1);
 	}	//p
 #ifdef MODEX
 #ifdef FADE
-	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); }
+	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }
 	if(IN_KeyDown(22)){
 	paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
-	 modexpdump(mv[0].page); modexpdump(mv[1].page); }
+	 modexpdump(mv[0].page); modexpdump(mv[1].page);
+		 IN_UserInput(1,1);
+	}
 #endif
 #endif
 	//pan switch
-	if(IN_KeyDown(88)){panswitch=!panswitch;}	//f12
+	if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}	//f12
 	//TSR
 	if(IN_KeyDown(87))	//f11
 	{
 		pageflipflop=!pageflipflop;
-		//IN_Ack();
+		IN_UserInput(1,1);
 // 		VGAmodeX(0, 0, &gvar);
 // 		IN_Shutdown();
 // 		__asm
@@ -271,7 +272,7 @@ void main(int argc, char *argv[])
 	if(IN_KeyDown(68))	//s
 	{
 		gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
-		//IN_Ack();
+		 IN_UserInput(1,1);
 	}
 	//TODO fmemtest into page
 	/*if(IN_KeyDown(4+1))	//4
@@ -282,7 +283,7 @@ void main(int argc, char *argv[])
 	}*/
 
 	//9
-	if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
+	if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); IN_UserInput(1,1); }
 	//if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); }
 	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
 	}
diff --git a/src/test.c b/src/test.c
index bb3792ae..6a443a9c 100755
--- a/src/test.c
+++ b/src/test.c
@@ -171,12 +171,13 @@ void main(int argc, char *argv[])
 // 				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
 // 			}
 		//}
-		if(IN_KeyDown(1+1)) pan.pn=0;
-		if(IN_KeyDown(2+1)) pan.pn=1;
-		if(IN_KeyDown(3+1)) pan.pn=2;
-		if(IN_KeyDown(4+1)) pan.pn=3;
+		if(IN_KeyDown(1+1)){ pan.pn=0; }
+		if(IN_KeyDown(2+1)){ pan.pn=1; }
+		if(IN_KeyDown(3+1)){ pan.pn=2; }
+		if(IN_KeyDown(4+1)){ pan.pn=3; }
 		if(IN_KeyDown(25)){
 			modexpdump(&gvar.video.page[pan.pn]);
+			IN_UserInput(1,1);
 		}//p
 		modexShowPage(&gvar.video.page[pan.pn]);
 	}
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