pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-17 22:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/EQEmu/Server

Browse Source
This commit is contained in:
Kemmler 2015-07-20 10:37:26 -04:00
commit a2f39e22d1
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zone/bonuses.cpp
View File

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

5
zone/bot.cpp
View File

@ -1280,6 +1280,11 @@ void Bot::LoadAAs() {
AA::Rank *current = ability->first; AA::Rank *current = ability->first;
if (current->level_req > GetLevel()) {
++iter;
continue;
}
while(current) { while(current) {
if(!CanUseAlternateAdvancementRank(current)) { if(!CanUseAlternateAdvancementRank(current)) {
current = nullptr; current = nullptr;