From d0328a3ee8721db367f22799805f1f9b8030bc54 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 15 Jan 2021 00:09:21 +0100 Subject: [PATCH] [hellfire] MAI_SnotSpil --- Source/monster.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/monster.cpp b/Source/monster.cpp index 37e3b7f31..c32113358 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -5094,7 +5094,7 @@ void MAI_Garbud(int i) void MAI_Zhar(int i) { - int mx, my, _mx, _my, md; + int mx, my, md; MonsterStruct *Monst; if ((DWORD)i >= MAXMONSTERS) @@ -5118,12 +5118,12 @@ void MAI_Zhar(int i) } if (dFlags[mx][my] & BFLAG_VISIBLE) { - _mx = Monst->_mx - Monst->_menemyx; - _my = Monst->_my - Monst->_menemyy; - if (abs(_mx) > abs(_my)) - abs(_mx); + mx = Monst->_mx - Monst->_menemyx; + my = Monst->_my - Monst->_menemyy; + if (abs(mx) > abs(my)) + abs(mx); else - abs(_my); + abs(my); #ifndef SPAWN if (Monst->mtalkmsg == TEXT_ZHAR2) { if (!effect_is_playing(USFX_ZHAR2) && Monst->_mgoal == MGOAL_TALKING) { @@ -5150,7 +5150,11 @@ void MAI_SnotSpil(int i) MonsterStruct *Monst; if ((DWORD)i >= MAXMONSTERS) +#ifdef HELLFIRE + return; +#else app_fatal("MAI_SnotSpil: Invalid monster %d", i); +#endif Monst = &monster[i]; if (monster[i]._mmode != MM_STAND) {