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

[8793] Don't do operations through singleton if already in singleton context.

Browse source 
* Also, some minor things:
   - Remove duplicate sWorldLog define.
   - Add sRealmList macro for RealmList::Instance().
   - Use sLog macro in scripting log functions.
This commit is contained in:
XTZGZoReX 2009-11-08 19:32:50 +01:00
parent 146657885d
commit b3f3ffa885
11 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/ObjectMgr.cpp
View file

@ -4099,7 +4099,7 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
continue;
}
// if(!sObjectMgr.GetMangosStringLocale(tmp.dataint)) will checked after db_script_string loading
// if(!GetMangosStringLocale(tmp.dataint)) will checked after db_script_string loading
break;
}
@ -5111,11 +5111,11 @@ uint32 ObjectMgr::GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_al
if (!mount_info)
return 0;
uint16 mount_id = sObjectMgr.ChooseDisplayId(team,mount_info);
uint16 mount_id = ChooseDisplayId(team,mount_info);
if (!mount_id)
return 0;
CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelRandomGender(mount_id);
CreatureModelInfo const *minfo = GetCreatureModelRandomGender(mount_id);
if (minfo)
mount_id = minfo->modelid;