From e55e4f09320b404cf9a0da2239d64ce99c35c96c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 11 Dec 2006 11:18:04 +0000 Subject: [PATCH] - Fixed: When a DehackedPickup replacement object is created it must copy the state labels of the parent object. SVN r410 (trunk) --- docs/rh-log.txt | 4 ++++ src/d_dehacked.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 34d5eea63..2badebb89 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,7 @@ +December 10, 2006 (Changes by Graf Zahl) +- Fixed: When a DehackedPickup replacement object is created it must copy + the state labels of the parent object. + December 9, 2006 (Changes by Graf Zahl) - Fixed: P_LookForTid should abort its search when it discovers that it has cycled through the entire list of actors. diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp index 7f3fc76a0..a788e6fbc 100644 --- a/src/d_dehacked.cpp +++ b/src/d_dehacked.cpp @@ -2581,6 +2581,9 @@ void FinishDehPatch () subclass->ActorInfo->GameFilter = type->ActorInfo->GameFilter; subclass->ActorInfo->SpawnID = type->ActorInfo->SpawnID; subclass->ActorInfo->DoomEdNum = type->ActorInfo->DoomEdNum; + // Make a copy the state labels + MakeStateDefines(type->ActorInfo->StateList); + InstallStates(subclass->ActorInfo, defaults2); // Alter the original class so that it just spawns the new one //memcpy (defaults1, GetDefault(), sizeof(AActor));