From b34f3637abeeecafaab5e8c3bc04c42973f2d26b Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:42:11 +0100
Subject: [PATCH] - restored keybinds setup to the original procedure as
 defined by ZDoom.

Looks like some parts were missed when this was integrated piece by piece.
---
 source/common/console/c_bind.cpp | 2 --
 source/common/gameconfigfile.cpp | 2 +-
 source/common/gamecontrol.cpp    | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/source/common/console/c_bind.cpp b/source/common/console/c_bind.cpp
index 368fb335d..459c6b08a 100644
--- a/source/common/console/c_bind.cpp
+++ b/source/common/console/c_bind.cpp
@@ -703,12 +703,10 @@ void C_BindDefaults()
 	CONFIG_SetDefaultKeys(cl_defaultconfiguration == 1 ? "engine/origbinds.txt" : cl_defaultconfiguration == 2 ? "engine/leftbinds.txt" : "engine/defbinds.txt");
 }
 
-#if 0
 CCMD(binddefaults)
 {
 	C_BindDefaults();
 }
-#endif
 
 void C_SetDefaultBindings()
 {
diff --git a/source/common/gameconfigfile.cpp b/source/common/gameconfigfile.cpp
index 3868cdfce..64bb2b221 100644
--- a/source/common/gameconfigfile.cpp
+++ b/source/common/gameconfigfile.cpp
@@ -319,7 +319,7 @@ void FGameConfigFile::DoKeySetup(const char *gamename)
 	subsection = section + countof(section) - sublen - 1;
 	section[countof(section) - 1] = '\0';
 
-	//C_SetDefaultBindings ();
+	C_SetDefaultBindings ();
 
 	const char* key, * value;
 	for (int i = 0; binders[i].label != NULL; ++i)
diff --git a/source/common/gamecontrol.cpp b/source/common/gamecontrol.cpp
index e0c5f56d3..91a36d605 100644
--- a/source/common/gamecontrol.cpp
+++ b/source/common/gamecontrol.cpp
@@ -589,7 +589,6 @@ int RunGame()
 	TileFiles.AddArt(addArt);
 
 	inputState.ClearAllInput();
-	CONFIG_SetDefaultKeys(cl_defaultconfiguration == 1 ? "engine/origbinds.txt" : cl_defaultconfiguration == 2 ? "engine/leftbinds.txt" : "engine/defbinds.txt");
 	
 	if (!GameConfig->IsInitialized())
 	{