- 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

@@ -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.

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);

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