zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in r6184. 

git-svn-id: https://svn.eduke32.com/eduke32@6191 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-06-17 21:53:28 +00:00
parent 8deddc19b0
commit 97a9d67148
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/duke3d/src/config.cpp
View File

@ -114,24 +114,22 @@ const char *CONFIG_AnalogNumToName(int32_t func)
void CONFIG_SetDefaultKeys(const char (*keyptr)[MAXGAMEFUNCLEN]) void CONFIG_SetDefaultKeys(const char (*keyptr)[MAXGAMEFUNCLEN])
{ {
int32_t f;
Bmemset(ud.config.KeyboardKeys, 0xff, sizeof(ud.config.KeyboardKeys)); Bmemset(ud.config.KeyboardKeys, 0xff, sizeof(ud.config.KeyboardKeys));
CONTROL_ClearAllBinds(); CONTROL_ClearAllBinds();
for (size_t i=0; i < ARRAY_SIZE(keydefaults); i+=2) for (size_t i=0; i < ARRAY_SIZE(gamefunctions); ++i)
{ {
if (gamefunctions[i][0] == '\0') if (gamefunctions[i][0] == '\0')
continue; continue;
f = CONFIG_FunctionNameToNum(gamefunctions[i>>1]); ud.config.KeyboardKeys[i][0] = KB_StringToScanCode(keyptr[i<<1]);
if (f == -1) continue; ud.config.KeyboardKeys[i][1] = KB_StringToScanCode(keyptr[(i<<1)+1]);
ud.config.KeyboardKeys[f][0] = KB_StringToScanCode(keyptr[i]);
ud.config.KeyboardKeys[f][1] = KB_StringToScanCode(keyptr[i+1]);
if (f == gamefunc_Show_Console) OSD_CaptureKey(ud.config.KeyboardKeys[f][0]); if (i == gamefunc_Show_Console)
else CONFIG_MapKey(f, ud.config.KeyboardKeys[f][0], 0, ud.config.KeyboardKeys[f][1], 0); OSD_CaptureKey(ud.config.KeyboardKeys[i][0]);
else
CONFIG_MapKey(i, ud.config.KeyboardKeys[i][0], 0, ud.config.KeyboardKeys[i][1], 0);
} }
} }