diff --git a/docs/rh-log.txt b/docs/rh-log.txt index c02531079..32d3847ac 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,6 @@ +December 31, 2006 (Changes by Graf Zahl) +- Fixed: Several actors for Doom were missing their spawn ID. + December 29, 2006 - Fixed: APlayerPawn::GiveDefaultInventory() used two different variables both named item. diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 9feb4535c..6c1fc4307 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -3083,14 +3083,6 @@ AActor *AActor::StaticSpawn (const PClass *type, fixed_t ix, fixed_t iy, fixed_t actor->state = st; actor->tics = st->GetTics(); - // [RH] Don't decrement tics if they are already less than 1 - if ((actor->flags4 & MF4_RANDOMIZE) && actor->tics > 0) - { - actor->tics -= pr_checkmissilespawn() & 3; - if (actor->tics < 1) - actor->tics = 1; - } - actor->sprite = st->sprite.index; actor->frame = st->GetFrame(); actor->renderflags = (actor->renderflags & ~RF_FULLBRIGHT) | st->GetFullbright(); @@ -4252,6 +4244,14 @@ bool P_HitFloor (AActor *thing) bool P_CheckMissileSpawn (AActor* th) { + // [RH] Don't decrement tics if they are already less than 1 + if ((th->flags4 & MF4_RANDOMIZE) && th->tics > 0) + { + th->tics -= pr_checkmissilespawn() & 3; + if (th->tics < 1) + th->tics = 1; + } + // move a little forward so an angle can be computed if it immediately explodes if (th->Speed >= 100*FRACUNIT) { // Ultra-fast ripper spawning missile diff --git a/wadsrc/decorate/doom/arachnotron.txt b/wadsrc/decorate/doom/arachnotron.txt index 2f6b9f683..9348339d5 100644 --- a/wadsrc/decorate/doom/arachnotron.txt +++ b/wadsrc/decorate/doom/arachnotron.txt @@ -63,6 +63,8 @@ ACTOR Arachnotron 68 //=========================================================================== ACTOR ArachnotronPlasma { + Game Doom + SpawnID 129 Radius 13 Height 8 Speed 25 diff --git a/wadsrc/decorate/doom/archvile.txt b/wadsrc/decorate/doom/archvile.txt index 1a5e2f663..997604525 100644 --- a/wadsrc/decorate/doom/archvile.txt +++ b/wadsrc/decorate/doom/archvile.txt @@ -67,6 +67,8 @@ ACTOR Archvile 64 ACTOR ArchvileFire { + Game Doom + SpawnID 98 +NOBLOCKMAP +NOGRAVITY RenderStyle Add Alpha 1 diff --git a/wadsrc/decorate/doom/doomimp.txt b/wadsrc/decorate/doom/doomimp.txt index 468aa3574..ca56e5b42 100644 --- a/wadsrc/decorate/doom/doomimp.txt +++ b/wadsrc/decorate/doom/doomimp.txt @@ -67,6 +67,8 @@ ACTOR DoomImp 3001 //=========================================================================== ACTOR DoomImpBall { + Game Doom + SpawnID 10 Radius 6 Height 8 Speed 10