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:
commit
d61f3131fb
70 files changed
+462
-443
No files matched your search
@@ -913,7 +913,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SmartAIMgr::IsTextValid(SmartScriptHolder const& e, uint32 id)
|
||||
/*bool SmartAIMgr::IsTextValid(SmartScriptHolder const& e, uint32 id) // unused
|
||||
{
|
||||
bool error = false;
|
||||
uint32 entry = 0;
|
||||
@@ -938,4 +938,4 @@ bool SmartAIMgr::IsTextValid(SmartScriptHolder const& e, uint32 id)
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}*/
|
||||
Reference in new issue
Block a user