Skip to content

Commit 8d2024a

Browse files
committed
let CTA (of MAI_Fallen) affect non-fallen monsters
1 parent 42b848f commit 8d2024a

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Source/monster.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3345,17 +3345,18 @@ void MonCallToArms(int mnum)
33453345
m = dMonster[x][y];
33463346
if (m > 0) {
33473347
mon = &monsters[m - 1];
3348-
if (mon->_mAI.aiType == AI_FALLEN /*&& !MON_RELAXED*/ && (mon->_mleader == MON_NO_LEADER || mon->_mleader == mnum) && LineClear(mx, my, mon->_mx, mon->_my)) {
3348+
if (/*!MON_RELAXED && */(mon->_mleader == MON_NO_LEADER || mon->_mleader == mnum) && LineClear(mx, my, mon->_mx, mon->_my)) {
33493349
mon->_msquelch = SQUELCH_MAX; // prevent monster from getting in relaxed state
3350+
if (mon->_mAI.aiType == AI_FALLEN) {
33503351
#if DEBUG
3351-
assert(mon->_mAnims[MA_WALK].maFrames * mon->_mAnims[MA_WALK].maFrameLen * (2 * MAX_RAD + 8) < SQUELCH_MAX - SQUELCH_LOW);
3352-
assert(mon->_mAnims[MA_ATTACK].maFrames * mon->_mAnims[MA_ATTACK].maFrameLen * (2 * MAX_RAD + 8) < SQUELCH_MAX - SQUELCH_LOW);
3353-
assert(amount * 13 < SQUELCH_MAX - SQUELCH_LOW);
3352+
assert(mon->_mAnims[MA_WALK].maFrames * mon->_mAnims[MA_WALK].maFrameLen * (2 * MAX_RAD + 8) < SQUELCH_MAX - SQUELCH_LOW);
3353+
assert(mon->_mAnims[MA_ATTACK].maFrames * mon->_mAnims[MA_ATTACK].maFrameLen * (2 * MAX_RAD + 8) < SQUELCH_MAX - SQUELCH_LOW);
3354+
assert(amount * 13 < SQUELCH_MAX - SQUELCH_LOW);
33543355
#endif
3355-
static_assert((2 * MAX_RAD + 8) * 13 < SQUELCH_MAX - SQUELCH_LOW, "MAI_Fallen might relax with attack goal.");
3356-
mon->_mgoal = MGOAL_ATTACK;
3357-
mon->_mgoalvar1 = amount; // FALLEN_ATTACK_AMOUNT
3358-
3356+
static_assert((2 * MAX_RAD + 8) * 13 < SQUELCH_MAX - SQUELCH_LOW, "MAI_Fallen might relax with attack goal.");
3357+
mon->_mgoal = MGOAL_ATTACK;
3358+
mon->_mgoalvar1 = amount; // FALLEN_ATTACK_AMOUNT
3359+
}
33593360
mon->_mlastx = tx;
33603361
mon->_mlasty = ty;
33613362
}

0 commit comments

Comments
 (0)