Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity

Game/Scripting: Follow-up to b3d44d6. Fix script selection for creatures on difficulty > 0.

Browse Source
This commit is contained in:
treeston authored and Aokromes committed 2016-09-09 20:00:30 +02:00
1 parent bb9b7582ee
commit 32de236865
3 files changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Scripting/ScriptMgr.cpp
+4 -3
View File
@@ -1603,12 +1603,13 @@ uint32 ScriptMgr::GetDialogStatus(Player* player, Creature* creature)
return tmpscript->GetDialogStatus(player, creature);
}
bool ScriptMgr::CanSpawn(ObjectGuid::LowType spawnId, CreatureTemplate const* cTemplate, CreatureData const* cData, Map const* map)
bool ScriptMgr::CanSpawn(ObjectGuid::LowType spawnId, uint32 entry, CreatureTemplate const* actTemplate, CreatureData const* cData, Map const* map)
{
ASSERT(cTemplate);
GET_SCRIPT_RET(CreatureScript, cTemplate->ScriptID, tmpscript, true);
return tmpscript->CanSpawn(spawnId, cTemplate, cData, map);
CreatureTemplate const* baseTemplate = sObjectMgr->GetCreatureTemplate(entry);
GET_SCRIPT_RET(CreatureScript, baseTemplate->ScriptID, tmpscript, true);
return tmpscript->CanSpawn(spawnId, entry, baseTemplate, actTemplate, cData, map);
}
CreatureAI* ScriptMgr::GetCreatureAI(Creature* creature)