OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2024-09-11 00:11:39 +08:00
commit fa0a88f85e
41 changed files with 236 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/d_main.cpp
View file

@ -1807,7 +1807,7 @@ bool ConsiderPatches (const char *arg)
if ( (f = BaseFileSearch(args[i].GetChars(), ".deh", false, GameConfig)) ||
(f = BaseFileSearch(args[i].GetChars(), ".bex", false, GameConfig)) )
{
D_LoadDehFile(f);
D_LoadDehFile(f, 0);
}
}
return argc > 0;
@ -3442,7 +3442,7 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
auto numbasesounds = soundEngine->GetNumSounds();
// Load embedded Dehacked patches
D_LoadDehLumps(FromIWAD);
D_LoadDehLumps(FromIWAD, iwad_info->SkipBexStringsIfLanguage ? DEH_SKIP_BEX_STRINGS_IF_LANGUAGE : 0);
// [RH] Add any .deh and .bex files on the command line.
// If there are none, try adding any in the config file.
@ -3459,13 +3459,13 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
if (stricmp (key, "Path") == 0 && FileExists (value))
{
if (!batchrun) Printf ("Applying patch %s\n", value);
D_LoadDehFile(value);
D_LoadDehFile(value, 0);
}
}
}
// Load embedded Dehacked patches
D_LoadDehLumps(FromPWADs);
D_LoadDehLumps(FromPWADs, 0);
// Create replacements for dehacked pickups
FinishDehPatch();