nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 12:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk

Browse Source
This commit is contained in:
Yehonal
2016-08-26 16:25:25 +02:00
parent a6db058f90 f82c3fd94c
commit c888cfb158
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
View File

@@ -16,5 +16,5 @@ endif()
# -Wno-narrowing needed to suppress a warning in g3d
# -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion are needed to suppress gsoap warnings on Unix systems.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses -Wreorder")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")

5
src/game/Entities/Pet/Pet.cpp
View File

@@ -977,6 +977,9 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
// Can be summon and guardian
if (GetEntry() == NPC_RISEN_GHOUL)
{
// 100% energy after summon
SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
// xinef: fixes orc death knight command racial
if (m_owner->getRace() == RACE_ORC)
CastSpell(this, SPELL_ORC_RACIAL_COMMAND, true, NULL, NULL, m_owner->GetGUID());
@@ -2240,4 +2243,4 @@ void Pet::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */)
playerOwner->SendDirectMessage(&data);
}
}
}
}

6
src/game/Server/WorldSession.cpp
View File

@@ -1081,9 +1081,9 @@ void WorldSession::InitializeQueryCallbackParameters()
{
// Callback parameters that have pointers in them should be properly
// initialized to NULL here.
_charCreateCallback.SetParam(NULL);
_loadPetFromDBFirstCallback.SetFirstParam(NULL);
_loadPetFromDBFirstCallback.SetSecondParam(NULL);
_charCreateCallback.SetParam(nullptr);
_loadPetFromDBFirstCallback.SetFirstParam(0);
_loadPetFromDBFirstCallback.SetSecondParam(nullptr);
}
void WorldSession::ProcessQueryCallbacks()