From dc9d75685e80483db72485812cb64cc08e58c9d2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 2 Nov 2019 20:13:00 +0100 Subject: [PATCH] - fixed keybind setup. --- source/common/gameconfigfile.cpp | 7 ++-- source/common/gamecontrol.cpp | 33 ++++++++++--------- source/duke3d/src/gameexec.cpp | 6 ++-- source/mact/include/keyboard.h | 2 +- .../filter/blood/demolition/defbinds.txt | 8 ++--- .../filter/blood/demolition/leftbinds.txt | 8 ++--- .../filter/blood/demolition/origbinds.txt | 8 ++--- .../filter/duke/demolition/defbinds.txt | 8 ++--- .../filter/duke/demolition/leftbinds.txt | 8 ++--- .../filter/duke/demolition/origbinds.txt | 8 ++--- .../filter/ionfury/demolition/defbinds.txt | 8 ++--- .../filter/ionfury/demolition/leftbinds.txt | 8 ++--- .../filter/ionfury/demolition/origbinds.txt | 8 ++--- .../static/filter/nam/demolition/defbinds.txt | 8 ++--- .../filter/nam/demolition/leftbinds.txt | 8 ++--- .../filter/nam/demolition/origbinds.txt | 8 ++--- .../filter/redneck/demolition/defbinds.txt | 8 ++--- .../filter/redneck/demolition/leftbinds.txt | 8 ++--- .../filter/redneck/demolition/origbinds.txt | 8 ++--- .../shadowwarrior/demolition/defbinds.txt | 6 ++-- .../shadowwarrior/demolition/leftbinds.txt | 8 ++--- .../shadowwarrior/demolition/origbinds.txt | 8 ++--- .../filter/ww2gi/demolition/defbinds.txt | 8 ++--- .../filter/ww2gi/demolition/leftbinds.txt | 8 ++--- .../filter/ww2gi/demolition/origbinds.txt | 8 ++--- 25 files changed, 107 insertions(+), 107 deletions(-) diff --git a/source/common/gameconfigfile.cpp b/source/common/gameconfigfile.cpp index 8b47fbabc..91fbd0187 100644 --- a/source/common/gameconfigfile.cpp +++ b/source/common/gameconfigfile.cpp @@ -351,13 +351,10 @@ void FGameConfigFile::DoKeySetup(const char *gamename) { const char* key; const char* value; + OSD_Dispatch("unbindall"); while (NextInSection(key, value)) { - // The unbind here is necessary because the Build console can do multiple assignments and would not lose the original binding. - FStringf cmd("unbind %s", key); - OSD_Dispatch(cmd); - - cmd.Format("bind %s \"%s\"", key, value); + FStringf cmd("bind %s \"%s\"", key, value); OSD_Dispatch(cmd); } } diff --git a/source/common/gamecontrol.cpp b/source/common/gamecontrol.cpp index 016f33782..2cbf9edcb 100644 --- a/source/common/gamecontrol.cpp +++ b/source/common/gamecontrol.cpp @@ -448,19 +448,6 @@ int CONFIG_Init() currentGame.Truncate(currentGame.IndexOf(".")); CheckFrontend(g_gameType); - G_ReadConfig(currentGame); - if (!GameConfig->IsInitialized()) - { - CONFIG_ReadCombatMacros(); - CONFIG_SetDefaultKeys(cl_defaultconfiguration == 1 ? "demolition/origbinds.txt" : cl_defaultconfiguration == 2 ? "demolition/leftbinds.txt" : "demolition/defbinds.txt"); - } - - if (userConfig.CommandName.IsNotEmpty()) - { - playername = userConfig.CommandName; - } - - int index = 0; for(auto &gf : gamefuncs) { @@ -475,11 +462,27 @@ int CONFIG_Init() index += 2; } - SetupButtonFunctions(); + InitFileSystem(usedgroups); + CONTROL_ClearAssignments(); CONFIG_InitMouseAndController(); CONFIG_SetGameControllerDefaultsStandard(); - InitFileSystem(usedgroups); + CONFIG_SetDefaultKeys(cl_defaultconfiguration == 1 ? "demolition/origbinds.txt" : cl_defaultconfiguration == 2 ? "demolition/leftbinds.txt" : "demolition/defbinds.txt"); + SetupButtonFunctions(); + + G_ReadConfig(currentGame); + if (!GameConfig->IsInitialized()) + { + CONFIG_ReadCombatMacros(); + } + + if (userConfig.CommandName.IsNotEmpty()) + { + playername = userConfig.CommandName; + } + + + return gi->app_main(); } diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp index db5949985..dedd0fdb2 100644 --- a/source/duke3d/src/gameexec.cpp +++ b/source/duke3d/src/gameexec.cpp @@ -5617,7 +5617,7 @@ badindex: int const quoteFilename = *insptr++; VM_ASSERT((unsigned)quoteFilename < MAXQUOTES && apStrings[quoteFilename], "invalid quote %d\n", quoteFilename); - FStringf IniSection("UserStrings.%s", LumpFilter.GetChars()); + FStringf IniSection("%s.UserStrings", LumpFilter.GetChars()); auto IniKey = apStrings[quoteFilename]; if (!GameConfig->SetSection(IniSection)) { @@ -5696,7 +5696,7 @@ badindex: // No, we are not writing stuff to an arbitrary file on the hard drive! This is a first grade exploit for doing serious damage. // Instead, encode the data as BASE64 and write it to the config file, // which doesn't create a wide open door for exploits. - FStringf IniSection("UserStrings.%s", LumpFilter.GetChars()); + FStringf IniSection("%s.UserStrings", LumpFilter.GetChars()); auto IniKey = apStrings[quoteFilename]; BufferWriter bw; @@ -5720,7 +5720,7 @@ badindex: default: bw.Write(aGameArrays[arrayNum].pValues, Gv_GetArrayAllocSize(arrayNum)); break; } auto base64 = base64_encode(bw.GetBuffer()->Data(), bw.GetBuffer()->Size()); - if (GameConfig->SetSection(IniSection)) + if (GameConfig->SetSection(IniSection, true)) { GameConfig->SetValueForKey(IniKey, base64.c_str()); } diff --git a/source/mact/include/keyboard.h b/source/mact/include/keyboard.h index 027f7080a..963e638ee 100644 --- a/source/mact/include/keyboard.h +++ b/source/mact/include/keyboard.h @@ -44,7 +44,7 @@ static struct { "Tab", 0xf }, { "Q", 0x10 }, { "W", 0x11 }, { "E", 0x12 }, { "R", 0x13 }, { "T", 0x14 }, { "Y", 0x15 }, { "U", 0x16 }, { "I", 0x17 }, { "O", 0x18 }, { "P", 0x19 }, { "LeftBrk", 0x1a }, { "RightBrk", 0x1b }, { "Enter", 0x1c }, { "LCtrl", 0x1d }, { "A", 0x1e }, { "S", 0x1f }, { "D", 0x20 }, { "F", 0x21 }, { "G", 0x22 }, { "H", 0x23 }, - { "J", 0x24 }, { "K", 0x25 }, { "L", 0x26 }, { ";", 0x27 }, { "'", 0x28 }, { "`", 0x29 }, { "LShift", 0x2a }, + { "J", 0x24 }, { "K", 0x25 }, { "L", 0x26 }, { "Semi", 0x27 }, { "'", 0x28 }, { "`", 0x29 }, { "LShift", 0x2a }, { "Backslash", 0x2b }, { "Z", 0x2c }, { "X", 0x2d }, { "C", 0x2e }, { "V", 0x2f }, { "B", 0x30 }, { "N", 0x31 }, { "M", 0x32 }, { ",", 0x33 }, { ".", 0x34 }, { "/", 0x35 }, { "RShift", 0x36 }, { "Kpad*", 0x37 }, { "LAlt", 0x38 }, { "Space", 0x39 }, { "CapLck", 0x3a }, { "F1", 0x3b }, { "F2", 0x3c }, { "F3", 0x3d }, { "F4", 0x3e }, { "F5", 0x3f }, diff --git a/wadsrc/static/filter/blood/demolition/defbinds.txt b/wadsrc/static/filter/blood/demolition/defbinds.txt index b98b05a24..f5811a345 100644 --- a/wadsrc/static/filter/blood/demolition/defbinds.txt +++ b/wadsrc/static/filter/blood/demolition/defbinds.txt @@ -31,19 +31,19 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Map", "Tab" "Map_Follow_Mode", "F" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Send_Message", "T" "See_Coop_View", "K" "See_Chase_View", "F7" "Mouse_Aiming", "U" "Toggle_Crosshair", "I" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "Y" "BeastVision", "B" diff --git a/wadsrc/static/filter/blood/demolition/leftbinds.txt b/wadsrc/static/filter/blood/demolition/leftbinds.txt index a7b60d0ae..a737be7eb 100644 --- a/wadsrc/static/filter/blood/demolition/leftbinds.txt +++ b/wadsrc/static/filter/blood/demolition/leftbinds.txt @@ -31,19 +31,19 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Map", "Tab" "Map_Follow_Mode", "F" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Send_Message", "T" "See_Coop_View", "K" "See_Chase_View", "F7" "Mouse_Aiming", "U" "Toggle_Crosshair", "I" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" "BeastVision", "B" diff --git a/wadsrc/static/filter/blood/demolition/origbinds.txt b/wadsrc/static/filter/blood/demolition/origbinds.txt index a8a36da7d..df6df2267 100644 --- a/wadsrc/static/filter/blood/demolition/origbinds.txt +++ b/wadsrc/static/filter/blood/demolition/origbinds.txt @@ -31,19 +31,19 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Map", "Tab" "Map_Follow_Mode", "F" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Send_Message", "T" "See_Coop_View", "K" "See_Chase_View", "F7" "Mouse_Aiming", "U" "Toggle_Crosshair", "I" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" "BeastVision", "B" diff --git a/wadsrc/static/filter/duke/demolition/defbinds.txt b/wadsrc/static/filter/duke/demolition/defbinds.txt index 9fa2a639d..e896d75de 100644 --- a/wadsrc/static/filter/duke/demolition/defbinds.txt +++ b/wadsrc/static/filter/duke/demolition/defbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "Y" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "Q" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/duke/demolition/leftbinds.txt b/wadsrc/static/filter/duke/demolition/leftbinds.txt index e3627baa5..d562864d1 100644 --- a/wadsrc/static/filter/duke/demolition/leftbinds.txt +++ b/wadsrc/static/filter/duke/demolition/leftbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Center_View" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "Q" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/duke/demolition/origbinds.txt b/wadsrc/static/filter/duke/demolition/origbinds.txt index 2de61941e..b44ba3840 100644 --- a/wadsrc/static/filter/duke/demolition/origbinds.txt +++ b/wadsrc/static/filter/duke/demolition/origbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "`" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "C" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/ionfury/demolition/defbinds.txt b/wadsrc/static/filter/ionfury/demolition/defbinds.txt index 11c0dbca5..666089f8b 100644 --- a/wadsrc/static/filter/ionfury/demolition/defbinds.txt +++ b/wadsrc/static/filter/ionfury/demolition/defbinds.txt @@ -28,13 +28,13 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "TurnAround", "BakSpc" "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "Y" @@ -43,7 +43,7 @@ "Mouse_Aiming" "Toggle_Crosshair" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/ionfury/demolition/leftbinds.txt b/wadsrc/static/filter/ionfury/demolition/leftbinds.txt index d3b9bb963..21f127674 100644 --- a/wadsrc/static/filter/ionfury/demolition/leftbinds.txt +++ b/wadsrc/static/filter/ionfury/demolition/leftbinds.txt @@ -28,13 +28,13 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "TurnAround", "BakSpc" "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Center_View" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -43,7 +43,7 @@ "Mouse_Aiming", "U" "Toggle_Crosshair", "I" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/ionfury/demolition/origbinds.txt b/wadsrc/static/filter/ionfury/demolition/origbinds.txt index a50bee894..07def9a28 100644 --- a/wadsrc/static/filter/ionfury/demolition/origbinds.txt +++ b/wadsrc/static/filter/ionfury/demolition/origbinds.txt @@ -28,13 +28,13 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "TurnAround", "BakSpc" "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -43,7 +43,7 @@ "Mouse_Aiming", "U" "Toggle_Crosshair", "I" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "C" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/nam/demolition/defbinds.txt b/wadsrc/static/filter/nam/demolition/defbinds.txt index 9fa2a639d..e896d75de 100644 --- a/wadsrc/static/filter/nam/demolition/defbinds.txt +++ b/wadsrc/static/filter/nam/demolition/defbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "Y" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "Q" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/nam/demolition/leftbinds.txt b/wadsrc/static/filter/nam/demolition/leftbinds.txt index a4d408a97..4e5359fbf 100644 --- a/wadsrc/static/filter/nam/demolition/leftbinds.txt +++ b/wadsrc/static/filter/nam/demolition/leftbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Center_View" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "Q" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/nam/demolition/origbinds.txt b/wadsrc/static/filter/nam/demolition/origbinds.txt index 2de61941e..b44ba3840 100644 --- a/wadsrc/static/filter/nam/demolition/origbinds.txt +++ b/wadsrc/static/filter/nam/demolition/origbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "`" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "C" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/redneck/demolition/defbinds.txt b/wadsrc/static/filter/redneck/demolition/defbinds.txt index 4afdb34ae..99ae84f7d 100644 --- a/wadsrc/static/filter/redneck/demolition/defbinds.txt +++ b/wadsrc/static/filter/redneck/demolition/defbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "B" "Jetpack", "C" "NightVision", "Y" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "E" @@ -49,7 +49,7 @@ "Steroids", "M" "Quick_Kick", "Q" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select",+ diff --git a/wadsrc/static/filter/redneck/demolition/leftbinds.txt b/wadsrc/static/filter/redneck/demolition/leftbinds.txt index 876f99d04..ff41ecc23 100644 --- a/wadsrc/static/filter/redneck/demolition/leftbinds.txt +++ b/wadsrc/static/filter/redneck/demolition/leftbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "B" "Jetpack", "C" "NightVision", "Y" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Center_View" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "E" @@ -49,7 +49,7 @@ "Steroids", "M" "Quick_Kick", "`" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/redneck/demolition/origbinds.txt b/wadsrc/static/filter/redneck/demolition/origbinds.txt index 758eb6574..c911762fa 100644 --- a/wadsrc/static/filter/redneck/demolition/origbinds.txt +++ b/wadsrc/static/filter/redneck/demolition/origbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "B" "Jetpack", "C" "NightVision", "Y" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "E" @@ -49,7 +49,7 @@ "Steroids", "M" "Quick_Kick", "`" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "V" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt b/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt index 94f54df9a..939e5ffc0 100644 --- a/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt +++ b/wadsrc/static/filter/shadowwarrior/demolition/defbinds.txt @@ -26,8 +26,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "MedKit", "M" "Smoke_Bomb", "B" "Nightvision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Center_View" "Holster_Weapon", "H" "Map_Follow_Mode", "F" diff --git a/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt b/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt index e49401ae6..b978beb05 100644 --- a/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt +++ b/wadsrc/static/filter/shadowwarrior/demolition/leftbinds.txt @@ -26,8 +26,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "MedKit", "M" "Smoke_Bomb", "S" "Nightvision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Center_View" "Holster_Weapon", "ScrLck" "Map_Follow_Mode", "F" @@ -46,5 +46,5 @@ "Mouse_Aiming", "U" "Toggle_Crosshair", "I" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" diff --git a/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt b/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt index 5541a745a..a0db1dd6c 100644 --- a/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt +++ b/wadsrc/static/filter/shadowwarrior/demolition/origbinds.txt @@ -26,8 +26,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "MedKit", "M" "Smoke_Bomb", "S" "Nightvision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Map_Follow_Mode", "F" @@ -46,5 +46,5 @@ "Mouse_Aiming", "U" "Toggle_Crosshair", "I" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "NumLck" diff --git a/wadsrc/static/filter/ww2gi/demolition/defbinds.txt b/wadsrc/static/filter/ww2gi/demolition/defbinds.txt index 9fa2a639d..e896d75de 100644 --- a/wadsrc/static/filter/ww2gi/demolition/defbinds.txt +++ b/wadsrc/static/filter/ww2gi/demolition/defbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "Y" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "Q" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt b/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt index a4d408a97..4e5359fbf 100644 --- a/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt +++ b/wadsrc/static/filter/ww2gi/demolition/leftbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-" -"Enlarge_Screen", "=" +"Enlarge_Screen", "Equal" "Center_View" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "Q" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "`" "Show_DukeMatch_Scores" "Dpad_Select" diff --git a/wadsrc/static/filter/ww2gi/demolition/origbinds.txt b/wadsrc/static/filter/ww2gi/demolition/origbinds.txt index 2de61941e..b44ba3840 100644 --- a/wadsrc/static/filter/ww2gi/demolition/origbinds.txt +++ b/wadsrc/static/filter/ww2gi/demolition/origbinds.txt @@ -28,8 +28,8 @@ "Weapon_9", "9" "Weapon_10", "0" "Inventory", "Enter", "KpdEnt" -"Inventory_Left", "[" -"Inventory_Right", "]" +"Inventory_Left", "LeftBrk" +"Inventory_Right", "RightBrk" "Holo_Duke", "H" "Jetpack", "J" "NightVision", "N" @@ -38,7 +38,7 @@ "SendMessage", "T" "Map", "Tab" "Shrink_Screen", "-", "Kpad-" -"Enlarge_Screen", "=", "Kpad+" +"Enlarge_Screen", "Equal", "Kpad+" "Center_View", "KPad5" "Holster_Weapon", "ScrLck" "Show_Opponents_Weapon", "W" @@ -49,7 +49,7 @@ "Steroids", "R" "Quick_Kick", "`" "Next_Weapon", "'" -"Previous_Weapon", ";" +"Previous_Weapon", "Semi" "Show_Console", "C" "Show_DukeMatch_Scores" "Dpad_Select"