From c745c635dbed131618f5e62545f9aed28960c23e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 2 Nov 2006 07:23:08 +0000 Subject: [PATCH] - Fixed: The Cacodemon had a FastSpeed definition even though it shouldn't. - Fixed: FastSpeed was used unconditionally when defined. SVN r372 (trunk) --- docs/rh-log.txt | 4 ++++ src/p_mobj.cpp | 3 ++- wadsrc/decorate/doom/cacodemon.txt | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 6e7f7f169..1bb6571e2 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,7 @@ +November 1, 2006 (Changes by Graf Zahl) +- Fixed: The Cacodemon had a FastSpeed definition even though it shouldn't. +- Fixed: FastSpeed was used unconditionally when defined. + October 31, 2006 (Changes by Graf Zahl) - Fixed: SetActorPitch with a 0-tid (i.e. affect the activator) set the angle instead of the pitch. diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 1a2738b03..491e3f893 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -3110,7 +3110,8 @@ AActor *AActor::StaticSpawn (const PClass *type, fixed_t ix, fixed_t iy, fixed_t actor->frame = st->GetFrame(); actor->renderflags = (actor->renderflags & ~RF_FULLBRIGHT) | st->GetFullbright(); actor->touching_sectorlist = NULL; // NULL head of sector list // phares 3/13/98 - actor->Speed = actor->GetClass()->Meta.GetMetaFixed(AMETA_FastSpeed, actor->Speed); + if (gameskill == sk_nightmare || (dmflags & DF_FAST_MONSTERS)) + actor->Speed = actor->GetClass()->Meta.GetMetaFixed(AMETA_FastSpeed, actor->Speed); // set subsector and/or block links actor->LinkToWorld (SpawningMapThing); diff --git a/wadsrc/decorate/doom/cacodemon.txt b/wadsrc/decorate/doom/cacodemon.txt index 5c665edf4..5b47083fb 100644 --- a/wadsrc/decorate/doom/cacodemon.txt +++ b/wadsrc/decorate/doom/cacodemon.txt @@ -12,7 +12,6 @@ ACTOR Cacodemon 3005 Height 56 Mass 400 Speed 8 - FastSpeed 20 PainChance 128 Monster +FLOAT +NOGRAVITY