From 2054ff3725d60adcec235977f48b91eb25f8db42 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 10 Mar 2017 11:11:10 -0600 Subject: [PATCH] __seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd.c ][ ca needs huge amounts of work and i should remember what needs to be done soon also i should reverify 16_in.c to make sure it can work with other code of id engine ][ added 1.9 support wwww and fixed 16_vlpal.obj compile error\~ [it was a 8.3 file name extention error it was a simple issue wwww] [going to work on more on 16_in.c] --- src/lib/16_in_.c | 18 +++++++++--------- src/lib/16_tdef.h | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/lib/16_in_.c b/src/lib/16_in_.c index 6a2602e4..9b6bc7a9 100755 --- a/src/lib/16_in_.c +++ b/src/lib/16_in_.c @@ -659,10 +659,10 @@ IN_Startup() inpu.MousePresent = checkmouse? INL_StartMouse() : false; for (i = 0;i < MaxJoys;i++) - inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false; + ININFO_JoysPresent[i] = checkjoys? INL_StartJoy(i) : false; for (i = 0;i < MaxKbds;i++) - inpu.KbdDefs = {{0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51}}; + ININFO_KbdDefs[i] = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/}; inst.IN_Started = true; @@ -685,15 +685,15 @@ IN_Default(boolean gotit,player_t *player,ControlType nt) || ((nt == ctrl_Mouse) && !inpu.MousePresent) ) nt = ctrl_Keyboard1; - inpu.KbdDefs[0].button0 = 0x1c; - inpu.KbdDefs[0].button1 = 0x38; + ININFO_KbdDefs[0].button0 = 0x1c; + ININFO_KbdDefs[0].button1 = 0x38; //in.KbdDefs[0].upleft = 0x47; - inpu.KbdDefs[0].up = 0x48; + ININFO_KbdDefs[0].up = 0x48; //in.KbdDefs[0].upright = 0x49; - inpu.KbdDefs[0].left = 0x4b; - inpu.KbdDefs[0].right = 0x4d; + ININFO_KbdDefs[0].left = 0x4b; + ININFO_KbdDefs[0].right = 0x4d; //in.KbdDefs[0].downleft = 0x4f; - inpu.KbdDefs[0].down = 0x50; + ININFO_KbdDefs[0].down = 0x50; //in.KbdDefs[0].downright = 0x51; IN_SetControlType(0,player,nt); for(i=0; i>MaxPlayers;i++) @@ -852,7 +852,7 @@ register KeyboardDef *def; { case ctrl_Keyboard1: case ctrl_Keyboard2: - def = &(inpu.KbdDefs[type - ctrl_Keyboard]); + def = &(ININFO_KbdDefs[type - ctrl_Keyboard]); /* if (Keyboard[def->upleft]) mx = motion_Left,my = motion_Up; diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index be166c7e..3aa8e145 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -287,6 +287,7 @@ typedef struct// inconfig KeyboardDef KbdDefs[MaxKbds]; JoystickDef JoyDefs[MaxJoys]; } in_info_t; +#define ININFO_ gvar->in. //========================================================================== @@ -618,7 +619,7 @@ typedef struct loghandle_t handle; //handles for file logging kurokku_t kurokku; //clock struct mminfo_t mm; mminfotype mmi; // mm stuff -//++++ in_info_t in; // 16_in info + in_info_t in; // 16_in info player_t player[MaxPlayers]; // player vars //==== word far* clockw; /* 18.2hz clock */ } global_game_variables_t; -- 2.39.5