Merge with master

This commit is contained in:
KimLS
2013-05-24 01:23:58 -07:00
54 changed files with 572 additions and 617 deletions
+3 -2
View File
@@ -4484,12 +4484,13 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
case SE_TriggerOnCast:
{
if(type == focusTriggerOnCast)
{
if(MakeRandomInt(0, 100) <= focus_spell.base[i])
value = focus_spell.base2[i];
else
value = 0;
}
break;
}
@@ -5102,7 +5103,7 @@ bool Mob::TryDivineSave()
{
SetHP(1);
uint16 EffectsToTry[] =
int16 EffectsToTry[] =
{
aabonuses.DivineSaveChance[1],
itembonuses.DivineSaveChance[1],