From 3034bd576218b7a9db9859a4fdd2ad6f4b694dff Mon Sep 17 00:00:00 2001
From: nytmyr <53322305+nytmyr@users.noreply.github.com>
Date: Sun, 1 Dec 2024 23:31:39 -0600
Subject: [PATCH] fix changes made to mercs by mistake

---
 zone/merc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zone/merc.cpp b/zone/merc.cpp
index d66501efa..c54585f9e 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -1500,7 +1500,7 @@ bool Merc::AI_IdleCastCheck() {
 
 bool EntityList::Merc_AICheckCloseBeneficialSpells(Merc* caster, uint8 iChance, float iRange, uint32 iSpellTypes) {
 
-	if (BOT_SPELL_TYPES_DETRIMENTAL(iSpellTypes)) {
+	if ((iSpellTypes & SPELL_TYPES_DETRIMENTAL) != 0) {
 		//according to live, you can buff and heal through walls...
 		//now with PCs, this only applies if you can TARGET the target, but
 		// according to Rogean, Live NPCs will just cast through walls/floors, no problem..
@@ -1569,7 +1569,7 @@ bool Merc::AIDoSpellCast(uint16 spellid, Mob* tar, int32 mana_cost, uint32* oDon
 
 	float dist2 = 0;
 
-	if (mercSpell.type == SpellType_Escape) {
+	if (mercSpell.type & SpellType_Escape) {
 		dist2 = 0;
 	} else
 		dist2 = DistanceSquared(m_Position, tar->GetPosition());