mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/ItemPrototype.h
	src/game/ObjectMgr.cpp
	src/shared/Database/SQLStorage.cpp
This commit is contained in:
tomrus88 2008-11-16 17:20:43 +03:00
commit e738198eb4
33 changed files with 721 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/Creature.cpp
View file

@ -1937,9 +1937,14 @@ uint32 Creature::getLevelForTarget( Unit const* target ) const
return level;
}
char const* Creature::GetScriptName() const
std::string Creature::GetScriptName()
{
return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptName;
return objmgr.GetScriptName(GetScriptId());
}
uint32 Creature::GetScriptId()
{
return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptID;
}
VendorItemData const* Creature::GetVendorItems() const