OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Backend update from Raze.

Browse source 
* TArray extensions
* MSVC setup so that [[deprecated]] emits warnings.
This commit is contained in:
Christoph Oelckers 2021-11-12 09:36:19 +01:00
commit c598d9bab7
20 changed files with 348 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -686,6 +686,17 @@ void ReadBindings(int lump, bool override)
FKeyBindings* dest = &Bindings;
int key;
if (sc.Compare("unbind"))
{
sc.MustGetString();
if (override)
{
// This is only for games to clear unsuitable base defaults, not for mods.
dest->UnbindKey(sc.String);
}
continue;
}
// bind destination is optional and is the same as the console command
if (sc.Compare("bind"))
{
@ -722,7 +733,18 @@ void ReadBindings(int lump, bool override)
void C_SetDefaultKeys(const char* baseconfig)
{
auto lump = fileSystem.CheckNumForFullName("engine/commonbinds.txt");
if (lump >= 0) ReadBindings(lump, true);
if (lump >= 0)
{
// Bail out if a mod tries to override this. Main game resources are allowed to do this, though.
auto fileno2 = fileSystem.GetFileContainer(lump);
if (fileno2 > fileSystem.GetMaxIwadNum())
{
I_FatalError("File %s is overriding core lump %s.",
fileSystem.GetResourceFileFullName(fileno2), "engine/commonbinds.txt");
}
ReadBindings(lump, true);
}
int lastlump = 0;
while ((lump = fileSystem.FindLumpFullName(baseconfig, &lastlump)) != -1)