Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
This commit is contained in:
Vincent_Michael committed 2013-02-18 18:51:52 +01:00
commit 71eaceae5d
74 files changed
+1107 -570

No files matched your search

+3 -4
View File
@@ -495,10 +495,9 @@ public:
cInfo->questItems[5] = fields[78].GetUInt32();
cInfo->movementId = fields[79].GetUInt32();
cInfo->RegenHealth = fields[80].GetBool();
cInfo->equipmentId = fields[81].GetUInt32();
cInfo->MechanicImmuneMask = fields[82].GetUInt32();
cInfo->flags_extra = fields[83].GetUInt32();
cInfo->ScriptID = sObjectMgr->GetScriptId(fields[84].GetCString());
cInfo->MechanicImmuneMask = fields[81].GetUInt32();
cInfo->flags_extra = fields[82].GetUInt32();
cInfo->ScriptID = sObjectMgr->GetScriptId(fields[83].GetCString());
sObjectMgr->CheckCreatureTemplate(cInfo);
}