Fix merge ...

This commit is contained in:
Michael Cook (mackal) 2015-06-19 21:48:34 -04:00
parent 6621a125e6
commit 635ac692ea

View File

@ -5175,10 +5175,8 @@ int32 Bot::CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint32 points, uint16
case SE_FcTwincast: { case SE_FcTwincast: {
if(type == focusTwincast) if(type == focusTwincast)
value = base1; value = base1;
}
break; break;
} }
/* /*
case SE_SympatheticProc: case SE_SympatheticProc:
{ {
@ -5247,7 +5245,6 @@ int32 Bot::CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint32 points, uint16
value = base1; value = base1;
break; break;
} }
}
//Check for spell skill limits. //Check for spell skill limits.
if ((LimitSpellSkill) && (!SpellSkill_Found)) if ((LimitSpellSkill) && (!SpellSkill_Found))