OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed: DEHACKED parsing is disabled now when a user supplied DEHSUPP lump

Browse source 
is found. This mimics the old behavior which also disabled DEHACKED when
  the DEHSUPP lump was incompatible with the current engine. This behavior is
  needed to ensure that WADs that contain a ZDaemon-exclusive DEHSUPP lump
  continue to work as intended.

SVN r1748 (trunk)
This commit is contained in:
Christoph Oelckers 2009-08-02 18:23:05 +00:00
commit 54c4e26f7d
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/d_dehacked.cpp
View file

@ -2258,15 +2258,22 @@ static bool LoadDehSupp ()
{
// Make sure we only get the DEHSUPP lump from zdoom.pk3
// User modifications are not supported!
int lump = Wads.CheckNumForFullName ("dehsupp.txt", 0);
bool gotnames = false;
int i;
int lump = Wads.CheckNumForName("DEHSUPP");
if (lump == -1)
{
return false;
}
if (Wads.GetLumpFile(lump) > 0)
{
Printf("Warning: DEHSUPP no longer supported. DEHACKED patch disabled.\n");
return false;
}
bool gotnames = false;
int i;
if (++DehUseCount > 1)
{
return true;