__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

diff --git a/makefile b/makefile
index 0b4e1f974353fb2e7cc2b0f7c8718f0f3c9707ef..fb475d5d279b947097a4b9b0abdbb26868b65f0c 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -135,7 +135,8 @@ LIBFLAGS=$(WLIBQ) -b -n
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 #OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) $(OLDLIBOBJS)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_in.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+16LIBNOINOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = $(16LIBNOINOBJS) 16_in.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -195,7 +196,8 @@ TESTEXEC = &
        zcroll.exe &
        inputest.exe &
        vrstest.exe &
-       maptest.exe
+       maptest.exe &
+       inntest.exe
 TESTEXEC2 = &
        pcxtest.exe &
        scroll.exe &
@@ -261,6 +263,7 @@ fonttest.exe:        fonttest.$(OBJ) gfx.lib
 #fonttes0.exe: fonttes0.$(OBJ) $(16LIB)
 fontgfx.exe:   fontgfx.$(OBJ) gfx.lib $(DOSLIB)
 inputest.exe:   inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
+inntest.exe:           inntest.$(OBJ)  $(16LIBNOINOBJS) 16_in_1.$(OBJ)
 #sountest.exe: sountest.$(OBJ) $(16LIB)
 pcxtest.exe:   pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:   vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -301,6 +304,7 @@ fonttest.$(OBJ):$(SRC)/fonttest.c
 #fonttes0.$(OBJ): $(SRC)/fonttes0.c
 fontgfx.$(OBJ):$(SRC)/fontgfx.c
 inputest.$(OBJ):$(SRC)/inputest.c
+inntest.$(OBJ):$(SRC)/inntest.c
 #sountest.$(OBJ): $(SRC)/sountest.c
 #miditest.$(OBJ): $(SRC)/miditest.c
 #testemm.$(OBJ):$(SRC)/testemm.c
@@ -355,6 +359,7 @@ mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
 16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h
 16_in.$(OBJ):   $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h
+16_in_1.$(OBJ):         $(SRCLIB)/16_in_1.c $(SRCLIB)/16_in_1.h
 16_rf.$(OBJ):   $(SRCLIB)/16_rf.c      $(SRCLIB)/16_rf.h
 16_mm.$(OBJ):   $(SRCLIB)/16_mm.c      $(SRCLIB)/16_mm.h
 16_pm.$(OBJ):   $(SRCLIB)/16_pm.c      $(SRCLIB)/16_pm.h

diff --git a/src/.16.c.kate-swp b/src/.16.c.kate-swp
deleted file mode 100755 (executable)
index e3e59ca..0000000
Binary files a/src/.16.c.kate-swp and /dev/null differ

diff --git a/src/inntest.c b/src/inntest.c
index 3742f87f66189c8ed8329b4044361dc4ef9aed5d..598303a6e7c9aeac2cef350922e93590755ffb77 100755 (executable)
--- a/src/inntest.c
+++ b/src/inntest.c
@@ -22,7 +22,7 @@
 /*\r
        input test\r
 */\r
-#include "src/lib/16_in_.h"\r
+#include "src/lib/16_in_1.h"\r
 \r
 void probe_dos(){}\r
 void cpu_probe(){}\r
@@ -41,8 +41,8 @@ main(int argc, char *argv[])
        IN_Startup(&gvar);\r
        //IN_Default(0,&gvar.player,ctrl_Joystick1);\r
        //IN_SetControlType(0,&gvar.player,ctrl_Joystick1);\r
-       IN_Default(0,&gvar.player,ctrl_Keyboard1, &gvar);\r
-       IN_SetControlType(0,&gvar.player,ctrl_Keyboard1);\r
+       IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
+       IN_SetControlType(&gvar.player[0],ctrl_Keyboard1);\r
 \r
        gvar.player[0].enti.q=1;\r
        gvar.player[0].enti.d=2;\r
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
        while(!IN_KeyDown(sc_Escape, &gvar))\r
        {\r
 //0000         shinkutxt(&gvar);\r
-               IN_ReadControl(0, &gvar.player, &gvar);\r
+               IN_ReadControl(&gvar.player[0], &gvar);\r
                switch(gvar.player[0].enti.d)\r
                {\r
                //right movement\r

diff --git a/src/lib/16_in_1.c b/src/lib/16_in_1.c
index e7ed19edafbe81620eadfbd47dac839280a916a9..84e1266e050a6ad9e618bd026044ba6b6ede5f2c 100755 (executable)
--- a/src/lib/16_in_1.c
+++ b/src/lib/16_in_1.c
@@ -51,7 +51,7 @@ static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 \r
 =============================================================================\r
 */\r
-struct inconfig\r
+/*struct inconfig\r
 {\r
        boolean         MousePresent;\r
        boolean         JoysPresent[MaxJoys];\r
@@ -62,7 +62,7 @@ struct inconfig
 \r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-} inpu;\r
+} inpu;*/\r
 \r
 //inpu.KbdDefs = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/};\r
 \r
@@ -78,11 +78,11 @@ struct inconfig
 extern "C" {\r
 #endif\r
 \r
-static struct instat {\r
+/*static struct instat {\r
        boolean         IN_Started;\r
        boolean         CapsLock;\r
        ScanCode        CurCode,LastCode;\r
-} inst;\r
+} inst;*/\r
 \r
 static byte        far ASCIINames[] =          // Unshifted ASCII for scan codes\r
                                        {\r
@@ -168,7 +168,7 @@ static      char                    *ParmStringsIN[] = {"nojoys","nomouse",nil};
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 /*static */void interrupt\r
-INL_KeyService(void)\r
+INL_KeyService(void)//!\r
 {\r
 static boolean special;\r
                byte    k,c,\r
@@ -376,7 +376,7 @@ done:
 //             joystick (from +/-127)\r
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
-void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/)\r
+void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/)//!\r
 {\r
        word            x,y;\r
        word TimeCount = *clockw;\r
@@ -578,7 +578,7 @@ INL_SetJoyScale(word joy)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_SetupJoy(word joy,word minx,word maxx,word miny,word maxy)\r
+IN_SetupJoy(word joy,word minx,word maxx,word miny,word maxy)//!\r
 {\r
        word            d,r;\r
        JoystickDef     *def;\r
@@ -634,7 +634,7 @@ INL_StartJoy(word joy)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 static void\r
-INL_ShutJoy(word joy)\r
+INL_ShutJoy(word joy)//!\r
 {\r
        inpu.JoysPresent[joy] = false;\r
 }\r
@@ -647,7 +647,7 @@ INL_ShutJoy(word joy)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_Startup()\r
+IN_Startup()//!\r
 {\r
        boolean checkjoys,checkmouse;\r
        word    i;\r
@@ -686,7 +686,7 @@ IN_Startup()
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_Default(boolean gotit,player_t *player,ControlType nt)\r
+IN_Default(boolean gotit,player_t *player,ControlType nt)//!\r
 {\r
        int i;\r
        if\r
@@ -718,7 +718,7 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_Shutdown(void)\r
+IN_Shutdown(void)//!\r
 {\r
        word    i;\r
 \r
@@ -751,7 +751,7 @@ IN_SetKeyHook(void (*hook)())
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_ClearKeysDown(void)\r
+IN_ClearKeysDown(void)//!\r
 {\r
        //int   i;\r
 \r
@@ -784,7 +784,7 @@ INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_ReadCursor(CursorInfo *info)\r
+IN_ReadCursor(CursorInfo *info)//!\r
 {\r
        word    i,\r
                        buttons;\r
@@ -824,7 +824,7 @@ IN_ReadCursor(CursorInfo *info)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 void\r
-IN_ReadControl(player_t *player)\r
+IN_ReadControl(player_t *player)//!\r
 {\r
                        boolean         realdelta;\r
 #if DEMO0\r
@@ -1108,7 +1108,7 @@ IN_GetScanName(ScanCode scan)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 ScanCode\r
-IN_WaitForKey(void)\r
+IN_WaitForKey(void)//!\r
 {\r
        ScanCode        result;\r
 \r
@@ -1125,7 +1125,7 @@ IN_WaitForKey(void)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 char\r
-IN_WaitForASCII(void)\r
+IN_WaitForASCII(void)//!\r
 {\r
        char            result;\r
 \r
@@ -1144,7 +1144,7 @@ IN_WaitForASCII(void)
 \r
 boolean        btnstate[8];\r
 \r
-void IN_StartAck(void)\r
+void IN_StartAck(void)//!\r
 {\r
        unsigned        i,buttons;\r
 \r
@@ -1164,7 +1164,7 @@ void IN_StartAck(void)
 }\r
 \r
 \r
-boolean IN_CheckAck (void)\r
+boolean IN_CheckAck (void)//!\r
 {\r
        unsigned        i,buttons;\r
 \r
@@ -1206,7 +1206,7 @@ void IN_Ack (void)
 //\r
 ///////////////////////////////////////////////////////////////////////////\r
 boolean\r
-IN_IsUserInput()\r
+IN_IsUserInput()//!\r
 {\r
        boolean result;\r
        word    i;\r
@@ -1258,7 +1258,7 @@ boolean IN_UserInput(word delay)
 ===================\r
 */\r
 \r
-byte   IN_MouseButtons (void)\r
+byte   IN_MouseButtons (void)//!\r
 {\r
        union REGS CPURegs;\r
        if (inpu.MousePresent)\r
@@ -1290,7 +1290,7 @@ byte      IN_JoyButtons (void)
        return joybits;\r
 }\r
 \r
-boolean IN_KeyDown(byte code)\r
+boolean IN_KeyDown(byte code)//!\r
 {\r
 #ifdef __DEBUG_InputMgr__\r
        if(!dbg_nointest)\r
@@ -1305,14 +1305,14 @@ boolean IN_KeyDown(byte code)
 #endif\r
 }\r
 \r
-void IN_ClearKey(byte code)\r
+void IN_ClearKey(byte code)//!\r
 {\r
        inpu.Keyboard[code] = false;\r
        if(code == inpu.LastScan)\r
                inpu.LastScan = sc_None;\r
        }\r
 \r
-boolean IN_qb(byte kee)\r
+boolean IN_qb(byte kee)//!\r
 {\r
 #ifdef __DEBUG_InputMgr__\r
        if(dbg_testkeyin) printf("%u\n", inpu.Keyboard[kee]);\r
@@ -1321,12 +1321,12 @@ boolean IN_qb(byte kee)
        else return 0;\r
 }\r
 \r
-ScanCode IN_GetLastScan()\r
+ScanCode IN_GetLastScan()//!\r
 {\r
        return inpu.LastScan;\r
 }\r
 \r
-ScanCode IN_GetCurCode()\r
+ScanCode IN_GetCurCode()//!\r
 {\r
        return inst.CurCode;\r
 }\r

diff --git a/src/lib/16_in_1.h b/src/lib/16_in_1.h
index eb8048bcef255ad9b2fe285e58828e6702f56869..c6115bf0bda373877a7a1fcea862c681b45df600 100755 (executable)
--- a/src/lib/16_in_1.h
+++ b/src/lib/16_in_1.h
@@ -34,10 +34,10 @@
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/16_dbg.h"\r
-#ifdef __WATCOMC__     //borland C BCEXMM.EXE\r
+/*#ifdef __WATCOMC__   //borland C BCEXMM.EXE\r
 #include "src/lib/16_spri.h"\r
 #include "src/lib/16_enti.h"\r
-#endif\r
+#endif*/\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r
@@ -213,12 +213,12 @@ typedef   struct          {
 #endif\r
 \r
 //     Internal routines\r
-extern void            IN_Startup(void),IN_Shutdown(void),\r
-                                       IN_Default(boolean gotit,player_t *player,ControlType nt),\r
+extern void            IN_Startup(global_game_variables_t *gvar),IN_Shutdown(global_game_variables_t *gvar),\r
+                                       IN_Default(boolean gotit,player_t *player,ControlType nt, global_game_variables_t *gvar),\r
                                        IN_SetKeyHook(void (*)()),\r
                                        IN_ClearKeysDown(void),\r
                                        IN_ReadCursor(CursorInfo *),\r
-                                       IN_ReadControl(player_t *player),\r
+                                       IN_ReadControl(player_t *player, global_game_variables_t *gvar),\r
                                        IN_SetControlType(player_t *player,ControlType type),\r
                                        IN_GetJoyAbs(word joy,word *xp,word *yp),\r
                                        IN_SetupJoy(word joy,word minx,word maxx,\r
@@ -250,8 +250,8 @@ void IN_StopDemo(void);
 void IN_FreeDemoBuffer(void);\r
 #endif\r
 \r
-boolean        IN_KeyDown(byte code),\r
-               IN_qb(byte kee);\r
+boolean        IN_KeyDown(byte code, global_game_variables_t *gvar),\r
+               IN_qb(byte kee, global_game_variables_t *gvar);\r
 void           IN_ClearKey(byte code),\r
                IN_KbdLED();\r
 ScanCode       IN_GetLastScan(),\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index d7350bb29934b8f235ddac109251ec40235a15d5..e386f1fb981de6ee0f8400dc60237189c72568fe 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -287,7 +287,7 @@ typedef     struct          {
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\r
 \r
-/*typedef struct// inconfig\r
+typedef struct// inconfig\r
 {\r
        boolean         IN_Started;\r
        boolean         CapsLock;\r
@@ -307,7 +307,7 @@ typedef     struct          {
 \r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-} in_info_t;*/\r
+} in_info_t;\r
 \r
 //==========================================================================\r
 \r
@@ -654,7 +654,7 @@ typedef struct
        loghandle_t     handle; //handles for file logging\r
        kurokku_t       kurokku;        //clock struct\r
        mminfo_t        mm; mminfotype  mmi;    // mm stuff\r
-//++++ in_info_t       in;             // 16_in info\r
+       in_info_t       in;             // 16_in info\r
        player_t        player[MaxPlayers];     // player vars\r
        map_view_t      mv[4];\r
 } global_game_variables_t;\r