Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
This commit is contained in:
Nay committed 2012-08-30 23:06:19 +01:00
commit d61f3131fb
70 files changed
+462 -443

No files matched your search

+3 -2
View File
@@ -159,7 +159,7 @@ m_movedPlayer(NULL), m_lastSanctuaryTime(0), IsAIEnabled(false), NeedChangeAI(fa
m_ControlledByPlayer(false), movespline(new Movement::MoveSpline()), i_AI(NULL),
i_disabledAI(NULL), m_procDeep(0), m_removedAurasCount(0), i_motionMaster(this),
m_ThreatManager(this), m_vehicle(NULL), m_vehicleKit(NULL), m_unitTypeMask(UNIT_MASK_NONE),
m_HostileRefManager(this)
m_HostileRefManager(this), m_TempSpeed(0.0f), m_AutoRepeatFirstCast(false)
{
#ifdef _MSC_VER
#pragma warning(default:4355)
@@ -13066,7 +13066,8 @@ void Unit::DeleteCharmInfo()
CharmInfo::CharmInfo(Unit* unit)
: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_petnumber(0), m_barInit(false),
m_isCommandAttack(false), m_isAtStay(false), m_isFollowing(false), m_isReturning(false)
m_isCommandAttack(false), m_isAtStay(false), m_isFollowing(false), m_isReturning(false),
m_stayX(0.0f), m_stayY(0.0f), m_stayZ(0.0f)
{
for (uint8 i = 0; i < MAX_SPELL_CHARM; ++i)
m_charmspells[i].SetActionAndType(0, ACT_DISABLED);