From d718827ec1d8414b5f8b1d876f0c68c94a9c2599 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 23 Dec 2006 23:09:23 +0000 Subject: [PATCH] - Fixed: The Cacodemon doesn't have a melee attack defined as I mistakenly assumed when writing its DECORATE code. SVN r423 (trunk) --- docs/rh-log.txt | 2 ++ src/p_maputl.cpp | 1 + wadsrc/decorate/doom/cacodemon.txt | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index c7444a598..8a4ada307 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ December 23, 2006 (Changes by Graf Zahl) +- Fixed: The Cacodemon doesn't have a melee attack defined as I mistakenly + assumed when writing its DECORATE code. - Fixed: Commander Keen's death sequence had one state duplicated. - Fixed: Due to the changes for custom states the internal weapons shouldn't define a holdatk state unless it differs from the attack state. diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp index 04b81af01..14b4983c7 100644 --- a/src/p_maputl.cpp +++ b/src/p_maputl.cpp @@ -582,6 +582,7 @@ sector_t *AActor::LinkToWorldForMapThing () distance = radius - distance; x += FixedMul(distance, finecosine[finean]); y += FixedMul(distance, finesine[finean]); + ssec = R_PointInSubsector (x, y); break; } #else diff --git a/wadsrc/decorate/doom/cacodemon.txt b/wadsrc/decorate/doom/cacodemon.txt index ff3cfe7c6..89761e014 100644 --- a/wadsrc/decorate/doom/cacodemon.txt +++ b/wadsrc/decorate/doom/cacodemon.txt @@ -29,7 +29,6 @@ ACTOR Cacodemon 3005 See: HEAD A 3 A_Chase Loop - Melee: Missile: HEAD B 5 A_FaceTarget HEAD C 5 A_FaceTarget