From 54c4e26f7d675ad7b25c5c34a0f7fbe53b72d90c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 2 Aug 2009 18:23:05 +0000 Subject: [PATCH] - Changed: DEHACKED parsing is disabled now when a user supplied DEHSUPP lump 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) --- docs/rh-log.txt | 5 +++++ src/d_dehacked.cpp | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index a0c38f5c0..6dd36c71f 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,9 @@ August 2, 2009 (Changes by Graf Zahl) +- Changed: DEHACKED parsing is disabled now when a user supplied DEHSUPP lump + 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. - Added A_Mushroom compatibility option for Dehacked. - Added Gez's submission for interhubamount DECORATE property. - Fixed: The big endian version of PalEntry did not add the DWORD d field. diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp index 37d18e6da..dab1e432e 100644 --- a/src/d_dehacked.cpp +++ b/src/d_dehacked.cpp @@ -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;