OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- backend changes from Raze, mainly to properly load keyboard presets.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-07 15:09:10 +02:00
commit 3fc0d0d794
6 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/common/console/c_bind.cpp
View file

@ -716,13 +716,8 @@ void C_SetDefaultKeys(const char* baseconfig)
while ((lump = fileSystem.FindLumpFullName(baseconfig, &lastlump)) != -1)
{
if (fileSystem.GetFileContainer(lump) > 0) break;
// [SW] - We need to check to see the origin of the DEFBINDS... if it
// Comes from an IWAD/IPK3/IPK7 allow it to override the users settings...
// If it comes from a user mod however, don't.
if (fileSystem.GetFileContainer(lump) > fileSystem.GetMaxIwadNum())
ReadBindings(lump, false);
else
// Read this only from the main game resources.
if (fileSystem.GetFileContainer(lump) <= fileSystem.GetMaxIwadNum())
ReadBindings(lump, true);
}
@ -752,6 +747,13 @@ void C_BindDefaults()
C_SetDefaultKeys(cl_defaultconfiguration == 1 ? "engine/origbinds.txt" : cl_defaultconfiguration == 2 ? "engine/leftbinds.txt" : "engine/defbinds.txt");
}
void C_SetDefaultBindings()
{
C_UnbindAll();
C_BindDefaults();
}
CCMD(controlpreset)
{
if (argv.argc() < 2)
@ -762,7 +764,7 @@ CCMD(controlpreset)
int v = atoi(argv[1]);
if (v < 0 || v > 2) return;
cl_defaultconfiguration = v;
C_BindDefaults();
C_SetDefaultBindings();
}
CCMD(binddefaults)
@ -770,12 +772,6 @@ CCMD(binddefaults)
C_BindDefaults();
}
void C_SetDefaultBindings()
{
C_UnbindAll();
C_BindDefaults();
}
//=============================================================================
//
//