josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: More warning fixes

Browse Source
This commit is contained in:
Shauren
2011-05-07 20:09:45 +02:00
parent 7905200eba
commit 551889c42f
16 changed files with 68 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+4 -4
View File
@@ -1122,9 +1122,9 @@ void ObjectMgr::ChooseCreatureFlags(const CreatureTemplate *cinfo, uint32& npcfl
}
}
CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32 &displayID)
CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32* displayID)
{
CreatureModelInfo const* minfo = GetCreatureModelInfo(displayID);
CreatureModelInfo const* minfo = GetCreatureModelInfo(*displayID);
if (!minfo)
return NULL;
@@ -1139,7 +1139,7 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32 &display
else
{
// Model ID changed
displayID = minfo->modelid_other_gender;
*displayID = minfo->modelid_other_gender;
return minfo_tmp;
}
}
@@ -5788,7 +5788,7 @@ uint32 ObjectMgr::GetTaxiMountDisplayId(uint32 id, uint32 team, bool allowed_alt
}
// minfo is not actually used but the mount_id was updated
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(mount_id);
sObjectMgr->GetCreatureModelRandomGender(&mount_id);
return mount_id;
}
src/server/game/Globals/ObjectMgr.h
+1 -1
View File
@@ -636,7 +636,7 @@ class ObjectMgr
CreatureTemplate const* GetCreatureTemplate(uint32 entry);
CreatureTemplateContainer const* GetCreatureTemplates() { return &CreatureTemplateStore; }
CreatureModelInfo const* GetCreatureModelInfo(uint32 modelId);
CreatureModelInfo const* GetCreatureModelRandomGender(uint32 &displayID);
CreatureModelInfo const* GetCreatureModelRandomGender(uint32* displayID);
uint32 ChooseDisplayId(uint32 team, const CreatureTemplate *cinfo, const CreatureData *data = NULL);
static void ChooseCreatureFlags(const CreatureTemplate *cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData *data = NULL);
EquipmentInfo const *GetEquipmentInfo(uint32 entry);