pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-18 19:02:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/af4t/Server

Browse Source 
Conflicts:
	zone/bonuses.cpp
This commit is contained in:
Kemmler 2015-07-20 10:31:46 -04:00
commit c2cbf7a2ab
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zone/bonuses.cpp
View File

@ -38,6 +38,20 @@
#include "../common/unix.h"
#endif
<<<<<<< HEAD
=======
// 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
>>>>>>> 663ff552710e460946ba6aed6b431602a8019a08
void Mob::CalcBonuses()
{
CalcSpellBonuses(&spellbonuses);
@ -4681,7 +4695,11 @@ void Mob::NegateSpellsBonuses(uint16 spell_id)
}
}
<<<<<<< HEAD
// See line 3495 above, more or less
=======
// See line 41 above, more or less
>>>>>>> 663ff552710e460946ba6aed6b431602a8019a08
#if (defined(_MSC_VER) && defined(_WIN64)&& _MSC_VER==1900)
#pragma optimize( "", on )
#endif