zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-29 04:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: fixed countermeasure for empty lower skills

Browse source
This commit is contained in:
Christoph Oelckers 2021-07-11 08:17:38 +02:00
parent 3e30869aeb
commit 1b45c83d59
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/sw/src/sprite.cpp
View file

@ -1049,11 +1049,13 @@ ActorTestSpawn(SPRITEp sp)
return false; 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); 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 // 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 && 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) sp->lotag != TAG_SPAWN_ACTOR && sp->extra > 0) || sp->picnum == ZILLA_RUN_R0)