Commit MetaInfo

Revision1c023949a6ba587f5db7d1baa5ab93f86668f4b4 (tree)
Time2021-09-21 21:32:31
Authorsparky4 <sparky4@cock...>
Commitersparky4

Log Message

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

Change Summary

Incremental Difference

--- a/16/vgmtools
+++ b/16/vgmtools
@@ -1 +1 @@
1-Subproject commit 057e0126a66a4d287508d79f9a407a0a30293c5f
1+Subproject commit 227be76a9543731cef28e46d2cf690064256515c
Binary files a/palllist.exe and /dev/null differ
Binary files a/sdtest.exe and /dev/null differ
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -52,12 +52,20 @@
5252 if(gvar.in.inst->Keyboard[88]){ panswitch=!panswitch; IN_UserInput(1, &gvar); } \
5353 TAIL_FUNCTIONKEYFUNCTIONS0EXE
5454
55+
5556 #define RFDEBUGFUNCTIONS
5657 #ifdef __DEBUG_RF__
5758 #undef RFDEBUGFUNCTIONS
5859 #define RFDEBUGFUNCTIONS \
59- if(gvar.in.inst->Keyboard[sc_F11]){ dbg_pagedelayrendermap=!dbg_pagedelayrendermap; IN_UserInput(1, &gvar); } \
60- if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap; IN_UserInput(1, &gvar); }
60+ switch(gvar.in.inst->CurCode) \
61+ { \
62+ case sc_F11: \
63+ dbg_pagedelayrendermap=!dbg_pagedelayrendermap; IN_UserInput(1, &gvar); \
64+ break; \
65+ case sc_F9: \
66+ dbg_pagenorendermap=!dbg_pagenorendermap; IN_UserInput(1, &gvar); \
67+ break; \
68+ }
6169 #endif
6270
6371 /*#define MAPDEBUGFUNCTIONS
@@ -75,20 +83,47 @@
7583 #endif*/
7684
7785 #define TAIL_FUNCTIONKEYFUNCTIONS0EXE \
78- if(gvar.in.inst->Keyboard[sc_F4]){ turboXT(12); IN_UserInput(1, &gvar); } \
79- if(gvar.in.inst->Keyboard[68/*sc_F10*/]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } \
80- if(gvar.in.inst->Keyboard[sc_F8]){ gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps; IN_UserInput(1, &gvar); } \
81- if(gvar.in.inst->Keyboard[sc_F7]){ VL_ShowPage(&gvar.video.page, 0, 1); IN_UserInput(1, &gvar); } \
82- if(gvar.in.inst->Keyboard[sc_F6]){ VL_ShowPage(&gvar.video.page, 0, 0); IN_UserInput(1, &gvar); } \
83- if(gvar.in.inst->Keyboard[sc_T]){ gvar.video.vga_state.rss=!gvar.video.vga_state.rss; IN_UserInput(1, &gvar); } \
84- if(gvar.in.inst->Keyboard[sc_P]){ modexpdump(0, &gvar); IN_UserInput(1, &gvar); } \
85- if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation; IN_UserInput(1, &gvar); } \
86- if(gvar.in.inst->Keyboard[sc_Q]){ VL_modexPrintTextBox(&gvar); IN_UserInput(1, &gvar); } \
87- if(gvar.in.inst->Keyboard[sc_W]){ VL_MemToScreen((byte __far *)&gvar, 64, 64, 16, 16, &gvar); IN_UserInput(1, &gvar); } \
88- if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar); IN_UserInput(1, &gvar); } \
89- if(gvar.in.inst->Keyboard[sc_M]){ MM_ShowMemory(&gvar); MM_DumpData (&gvar); IN_UserInput(1, &gvar); } \
86+ switch(gvar.in.inst->CurCode) \
87+ { \
88+ case sc_F4: \
89+ turboXT(12); IN_UserInput(1, &gvar); \
90+ break; \
91+ case sc_F10: \
92+ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); \
93+ break; \
94+ case sc_F8: \
95+ gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps; IN_UserInput(1, &gvar); \
96+ break; \
97+ case sc_F7: \
98+ VL_ShowPage(&gvar.video.page, 0, 1); IN_UserInput(1, &gvar); \
99+ break; \
100+ case sc_F6: \
101+ VL_ShowPage(&gvar.video.page, 0, 0); IN_UserInput(1, &gvar); \
102+ break; \
103+ case sc_T: \
104+ gvar.video.vga_state.rss=!gvar.video.vga_state.rss; IN_UserInput(1, &gvar); \
105+ break; \
106+ case sc_P: \
107+ modexpdump(0, &gvar); IN_UserInput(1, &gvar); \
108+ break; \
109+ case sc_Y: \
110+ dbg_delayanimation=!dbg_delayanimation; IN_UserInput(1, &gvar); \
111+ break; \
112+ case sc_Q: \
113+ VL_modexPrintTextBox(&gvar); IN_UserInput(1, &gvar); \
114+ break; \
115+ case sc_W: \
116+ VL_MemToScreen((byte __far *)&gvar, 64, 64, 16, 16, &gvar); IN_UserInput(1, &gvar); \
117+ break; \
118+ case sc_LBrkt: \
119+ ShowPalVal (&gvar); IN_UserInput(1, &gvar); \
120+ break; \
121+ case sc_M: \
122+ MM_ShowMemory(&gvar); MM_DumpData (&gvar); IN_UserInput(1, &gvar); \
123+ break; \
124+ } \
90125 RFDEBUGFUNCTIONS
91-//FIZZLEFADEFUNCTION
126+ //FIZZLEFADEFUNCTION
92127
93128 #define TAIL_PANKEYFUN \
94129 TAIL_PANKEYFUNZC \
Show on old repository browser