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

diff --git a/src/lib/16_in_.c b/src/lib/16_in_.c
index 6a2602e4aa6f01cf81b0b6db861cfc38d37ec956..9b6bc7a92e6c3733fa428a66a8189b3919974a12 100755 (executable)
--- a/src/lib/16_in_.c
+++ b/src/lib/16_in_.c
@@ -659,10 +659,10 @@ IN_Startup()
        inpu.MousePresent = checkmouse? INL_StartMouse() : false;\r
 \r
        for (i = 0;i < MaxJoys;i++)\r
-               inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;\r
+               ININFO_JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;\r
 \r
        for (i = 0;i < MaxKbds;i++)\r
-               inpu.KbdDefs = {{0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51}};\r
+               ININFO_KbdDefs[i] = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/};\r
 \r
        inst.IN_Started = true;\r
 \r
@@ -685,15 +685,15 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
        ||      ((nt == ctrl_Mouse) && !inpu.MousePresent)\r
        )\r
                nt = ctrl_Keyboard1;\r
-       inpu.KbdDefs[0].button0 = 0x1c;\r
-       inpu.KbdDefs[0].button1 = 0x38;\r
+       ININFO_KbdDefs[0].button0 = 0x1c;\r
+       ININFO_KbdDefs[0].button1 = 0x38;\r
        //in.KbdDefs[0].upleft = 0x47;\r
-       inpu.KbdDefs[0].up = 0x48;\r
+       ININFO_KbdDefs[0].up = 0x48;\r
        //in.KbdDefs[0].upright = 0x49;\r
-       inpu.KbdDefs[0].left = 0x4b;\r
-       inpu.KbdDefs[0].right = 0x4d;\r
+       ININFO_KbdDefs[0].left = 0x4b;\r
+       ININFO_KbdDefs[0].right = 0x4d;\r
        //in.KbdDefs[0].downleft = 0x4f;\r
-       inpu.KbdDefs[0].down = 0x50;\r
+       ININFO_KbdDefs[0].down = 0x50;\r
        //in.KbdDefs[0].downright = 0x51;\r
        IN_SetControlType(0,player,nt);\r
        for(i=0; i>MaxPlayers;i++)\r
@@ -852,7 +852,7 @@ register    KeyboardDef     *def;
                {\r
                case ctrl_Keyboard1:\r
                case ctrl_Keyboard2:\r
-                       def = &(inpu.KbdDefs[type - ctrl_Keyboard]);\r
+                       def = &(ININFO_KbdDefs[type - ctrl_Keyboard]);\r
 \r
 /*                     if (Keyboard[def->upleft])\r
                                mx = motion_Left,my = motion_Up;\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index be166c7e4fb77aaf3845b51355febf10faa7d8dc..3aa8e1452c8b3d93fa5ab08d696efbbd1819a7e2 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -287,6 +287,7 @@ typedef struct// inconfig
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
 } in_info_t;\r
+#define ININFO_                        gvar->in.\r
 \r
 //==========================================================================\r
 \r
@@ -618,7 +619,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
 //==== word far*       clockw;         /* 18.2hz clock */\r
 } global_game_variables_t;\r