From 1b45c83d59a734b4471833cdeea5077925c15056 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 11 Jul 2021 08:17:38 +0200 Subject: [PATCH] - SW: fixed countermeasure for empty lower skills --- source/games/sw/src/sprite.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp index 9203187e3..1c485836c 100644 --- a/source/games/sw/src/sprite.cpp +++ b/source/games/sw/src/sprite.cpp @@ -1049,11 +1049,13 @@ ActorTestSpawn(SPRITEp sp) return false; } - // Skill ranges from -1 (No Monsters) to 3 + // Countermeasure for mods that leave the lower skills unpopulated. int spawnskill = TEST(sp->extra, SPRX_SKILL); - if (spawnskill > MinEnemySkill || (MinEnemySkill == 0 && spawnskill > Skill)) - { + if (MinEnemySkill > 0 && spawnskill == MinEnemySkill) spawnskill = 0; + // Skill ranges from -1 (No Monsters) to 3. + if (spawnskill > Skill) + { // JBF: hack to fix Wanton Destruction's missing Sumos, Serpents, and Zilla on Skill < 2 if (((sp->picnum == SERP_RUN_R0 || sp->picnum == SUMO_RUN_R0) && sp->lotag > 0 && sp->lotag != TAG_SPAWN_ACTOR && sp->extra > 0) || sp->picnum == ZILLA_RUN_R0)