From: sparky4 <sparky4@cock.li>
Date: Tue, 21 Sep 2021 12:32:31 +0000 (-0500)
Subject: fixed a merge issue i plan on cleaning TAIL and working on 16 core
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=1c023949a6ba587f5db7d1baa5ab93f86668f4b4;p=16.git

fixed a merge issue i plan on cleaning TAIL and working on 16 core
---

diff --git a/16/vgmtools b/16/vgmtools
index 057e0126..227be76a 160000
--- a/16/vgmtools
+++ b/16/vgmtools
@@ -1 +1 @@
-Subproject commit 057e0126a66a4d287508d79f9a407a0a30293c5f
+Subproject commit 227be76a9543731cef28e46d2cf690064256515c
diff --git a/palllist.exe b/palllist.exe
deleted file mode 100755
index ae114a66..00000000
Binary files a/palllist.exe and /dev/null differ
diff --git a/sdtest.exe b/sdtest.exe
deleted file mode 100755
index 014b54db..00000000
Binary files a/sdtest.exe and /dev/null differ
diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 536aea9e..d308ffac 100755
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -52,12 +52,20 @@
 	if(gvar.in.inst->Keyboard[88]){ panswitch=!panswitch;							IN_UserInput(1, &gvar); } \
 	TAIL_FUNCTIONKEYFUNCTIONS0EXE
 
+
 #define RFDEBUGFUNCTIONS
 #ifdef __DEBUG_RF__
 #undef RFDEBUGFUNCTIONS
 #define RFDEBUGFUNCTIONS \
-	if(gvar.in.inst->Keyboard[sc_F11]){ dbg_pagedelayrendermap=!dbg_pagedelayrendermap;		IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap;			IN_UserInput(1, &gvar); }
+	switch(gvar.in.inst->CurCode) \
+	{ \
+		case sc_F11: \
+			dbg_pagedelayrendermap=!dbg_pagedelayrendermap;		IN_UserInput(1, &gvar); \
+		break; \
+		case sc_F9: \
+			dbg_pagenorendermap=!dbg_pagenorendermap;			IN_UserInput(1, &gvar); \
+		break; \
+	}
 #endif
 
 /*#define MAPDEBUGFUNCTIONS
@@ -75,20 +83,47 @@
 #endif*/
 
 #define TAIL_FUNCTIONKEYFUNCTIONS0EXE \
-	if(gvar.in.inst->Keyboard[sc_F4]){ turboXT(12);									IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[68/*sc_F10*/]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;			IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_F8]){ gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps;		IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_F7]){ VL_ShowPage(&gvar.video.page, 0, 1);						IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_F6]){ VL_ShowPage(&gvar.video.page, 0, 0);						IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_T]){ gvar.video.vga_state.rss=!gvar.video.vga_state.rss;			IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_P]){ modexpdump(0, &gvar);							IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;				IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_Q]){ VL_modexPrintTextBox(&gvar);						IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_W]){ VL_MemToScreen((byte __far *)&gvar, 64, 64, 16, 16, &gvar);	IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);							IN_UserInput(1, &gvar); } \
-	if(gvar.in.inst->Keyboard[sc_M]){ MM_ShowMemory(&gvar);	MM_DumpData (&gvar);			IN_UserInput(1, &gvar); } \
+	switch(gvar.in.inst->CurCode) \
+	{ \
+		case sc_F4: \
+			turboXT(12);												IN_UserInput(1, &gvar); \
+		break; \
+		case sc_F10: \
+			gvar.kurokku.fpscap=!gvar.kurokku.fpscap;					IN_UserInput(1, &gvar); \
+		break; \
+		case sc_F8: \
+			gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps;		IN_UserInput(1, &gvar); \
+		break; \
+		case sc_F7: \
+			VL_ShowPage(&gvar.video.page, 0, 1);						IN_UserInput(1, &gvar); \
+		break; \
+		case sc_F6: \
+			VL_ShowPage(&gvar.video.page, 0, 0);						IN_UserInput(1, &gvar); \
+		break; \
+		case sc_T: \
+			gvar.video.vga_state.rss=!gvar.video.vga_state.rss;			IN_UserInput(1, &gvar); \
+		break; \
+		case sc_P: \
+			modexpdump(0, &gvar);										IN_UserInput(1, &gvar); \
+		break; \
+		case sc_Y: \
+			dbg_delayanimation=!dbg_delayanimation;						IN_UserInput(1, &gvar); \
+		break; \
+		case sc_Q: \
+			VL_modexPrintTextBox(&gvar);								IN_UserInput(1, &gvar); \
+		break; \
+		case sc_W: \
+			VL_MemToScreen((byte __far *)&gvar, 64, 64, 16, 16, &gvar);	IN_UserInput(1, &gvar); \
+		break; \
+		case sc_LBrkt: \
+			ShowPalVal (&gvar);											IN_UserInput(1, &gvar); \
+		break; \
+		case sc_M: \
+			MM_ShowMemory(&gvar);		MM_DumpData (&gvar);			IN_UserInput(1, &gvar); \
+		break; \
+	} \
 	RFDEBUGFUNCTIONS
-//FIZZLEFADEFUNCTION
+	//FIZZLEFADEFUNCTION
 
 #define TAIL_PANKEYFUN \
 	TAIL_PANKEYFUNZC \