mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-08 04:02:25 +00:00
Visual Studio 2015 Community compiles bonuses.cpp correctly now.
This commit is contained in:
parent
76b29c04e5
commit
8a55106288
@ -38,6 +38,7 @@
|
|||||||
#include "../common/unix.h"
|
#include "../common/unix.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void Mob::CalcBonuses()
|
void Mob::CalcBonuses()
|
||||||
{
|
{
|
||||||
CalcSpellBonuses(&spellbonuses);
|
CalcSpellBonuses(&spellbonuses);
|
||||||
@ -3492,17 +3493,6 @@ uint8 Mob::IsFocusEffect(uint16 spell_id,int effect_index, bool AA,uint32 aa_eff
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Avoid an internal compiler error in VS 2015
|
|
||||||
// Community RC (free) with the /O2 compiler
|
|
||||||
// option enabled on x64 build; definite fail on
|
|
||||||
// building Release-X64. Disabling optimizations
|
|
||||||
// for the entire file might be overkill and/or
|
|
||||||
// inapplicable to other builds, more testing needed.
|
|
||||||
// Bug has been reported to MS, fix ETA unknown.
|
|
||||||
#if (defined(_MSC_VER) && defined(_WIN64)&& _MSC_VER==1900)
|
|
||||||
#pragma optimize( "", off )
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void Mob::NegateSpellsBonuses(uint16 spell_id)
|
void Mob::NegateSpellsBonuses(uint16 spell_id)
|
||||||
{
|
{
|
||||||
if(!IsValidSpell(spell_id))
|
if(!IsValidSpell(spell_id))
|
||||||
@ -4664,7 +4654,6 @@ void Mob::NegateSpellsBonuses(uint16 spell_id)
|
|||||||
itembonuses.SkillProcSuccess[e] = effect_value;
|
itembonuses.SkillProcSuccess[e] = effect_value;
|
||||||
aabonuses.SkillProcSuccess[e] = effect_value;
|
aabonuses.SkillProcSuccess[e] = effect_value;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
case SE_SkillProc:{
|
case SE_SkillProc:{
|
||||||
@ -4674,15 +4663,9 @@ void Mob::NegateSpellsBonuses(uint16 spell_id)
|
|||||||
itembonuses.SkillProc[e] = effect_value;
|
itembonuses.SkillProc[e] = effect_value;
|
||||||
aabonuses.SkillProc[e] = effect_value;
|
aabonuses.SkillProc[e] = effect_value;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// See line 3495 above, more or less
|
|
||||||
#if (defined(_MSC_VER) && defined(_WIN64)&& _MSC_VER==1900)
|
|
||||||
#pragma optimize( "", on )
|
|
||||||
#endif
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user