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/Battlegrounds/Battleground.cpp
+2 -2
View File
@@ -539,8 +539,8 @@ inline Player* Battleground::_GetPlayer(BattlegroundPlayerMap::const_iterator it
inline Player* Battleground::_GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, const char* context) const
{
Player* player = NULL;
if (player = _GetPlayer(itr, context))
Player* player = _GetPlayer(itr, context);
if (player)
{
uint32 team = itr->second.Team;
if (!team)
src/server/game/Chat/ChatLink.cpp
+2 -2
View File
@@ -84,7 +84,7 @@ inline bool ReadHex(std::istringstream& iss, uint32& res, uint32 length)
{
std::istringstream::pos_type pos = iss.tellg();
iss >> std::hex >> res;
uint32 size = uint32(iss.gcount());
//uint32 size = uint32(iss.gcount());
if (length && uint32(iss.tellg() - pos) != length)
return false;
return !iss.fail() && !iss.eof();
@@ -93,7 +93,7 @@ inline bool ReadHex(std::istringstream& iss, uint32& res, uint32 length)
#define DELIMITER ':'
#define PIPE_CHAR '|'
bool ChatLink::ValidateName(char* buffer, const char* context)
bool ChatLink::ValidateName(char* buffer, const char* /*context*/)
{
_name = buffer;
return true;
src/server/game/Entities/Creature/Creature.cpp
+5 -5
View File
@@ -301,7 +301,7 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData *data
}
uint32 displayID = sObjectMgr->ChooseDisplayId(0, GetCreatureInfo(), data);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(&displayID);
if (!minfo) // Cancel load if no model defined
{
sLog->outErrorDb("Creature (Entry: %u) has no model defined in table `creature_template`, can't load. ", Entry);
@@ -779,8 +779,8 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry,
}
LoadCreaturesAddon();
uint32 displayID = 0;
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID = GetNativeDisplayId());
uint32 displayID = GetNativeDisplayId();
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(&displayID);
if (minfo && !isTotem()) // Cancel load if no model defined or if totem
{
SetDisplayId(displayID);
@@ -1618,8 +1618,8 @@ void Creature::Respawn(bool force)
else
setDeathState(JUST_ALIVED);
uint32 displayID = 0;
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID = GetNativeDisplayId());
uint32 displayID = GetNativeDisplayId();
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(&displayID);
if (minfo) // Cancel load if no model defined
{
SetDisplayId(displayID);
src/server/game/Entities/Player/Player.cpp
+9 -10
View File
@@ -11150,7 +11150,6 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const
if (pItem->IsBindedNotWith(this))
return EQUIP_ERR_DONT_OWN_THAT_ITEM;
Bag *pBag;
ItemTemplate const *pBagProto;
// item is 'one item only'
@@ -11201,11 +11200,11 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const
for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
{
if (pBag = GetBagByPos(t))
if (Bag* bag = GetBagByPos(t))
{
if (ItemCanGoIntoBag(pItem->GetTemplate(), pBag->GetTemplate()))
if (ItemCanGoIntoBag(pItem->GetTemplate(), bag->GetTemplate()))
{
for (uint32 j = 0; j < pBag->GetBagSize(); j++)
for (uint32 j = 0; j < bag->GetBagSize(); j++)
{
pItem2 = GetItemByPos(t, j);
if( pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_bags[t-INVENTORY_SLOT_BAG_START][j] + pItem->GetCount() <= pProto->GetMaxStackSize())
@@ -11258,15 +11257,15 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const
for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
{
if (pBag = GetBagByPos(t))
if (Bag* bag = GetBagByPos(t))
{
pBagProto = pBag->GetTemplate();
pBagProto = bag->GetTemplate();
// not plain container check
if (pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER) &&
ItemCanGoIntoBag(pProto, pBagProto))
{
for (uint32 j = 0; j < pBag->GetBagSize(); j++)
for (uint32 j = 0; j < bag->GetBagSize(); j++)
{
if (inv_bags[t-INVENTORY_SLOT_BAG_START][j] == 0)
{
@@ -11297,15 +11296,15 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const
// search free slot in bags
for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
{
if (pBag = GetBagByPos(t))
if (Bag* bag = GetBagByPos(t))
{
pBagProto = pBag->GetTemplate();
pBagProto = bag->GetTemplate();
// special bag already checked
if (pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER))
continue;
for (uint32 j = 0; j < pBag->GetBagSize(); j++)
for (uint32 j = 0; j < bag->GetBagSize(); j++)
{
if (inv_bags[t-INVENTORY_SLOT_BAG_START][j] == 0)
{
src/server/game/Entities/Totem/Totem.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ void Totem::InitStats(uint32 duration)
if (m_owner->GetTypeId() == TYPEID_PLAYER && cinfo)
{
uint32 displayID = sObjectMgr->ChooseDisplayId(m_owner->ToPlayer()->GetTeam(), cinfo);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID);
sObjectMgr->GetCreatureModelRandomGender(&displayID);
switch (m_owner->ToPlayer()->GetTeam())
{
case ALLIANCE:
src/server/game/Events/GameEventMgr.cpp
+1 -1
View File
@@ -1332,7 +1332,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
{
CreatureTemplate const *cinfo = sObjectMgr->GetCreatureTemplate(data2->id);
uint32 displayID = sObjectMgr->ChooseDisplayId(0, cinfo, data2);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID);
sObjectMgr->GetCreatureModelRandomGender(&displayID);
if (data2->equipmentId == 0)
itr->second.equipement_id_prev = cinfo->equipmentId;
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);
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+3 -4
View File
@@ -3417,8 +3417,7 @@ void AuraEffect::HandleAuraTransform(AuraApplication const * aurApp, uint8 mode,
team = target->ToPlayer()->GetTeam();
uint32 displayID = sObjectMgr->ChooseDisplayId(team, ci);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID);
sObjectMgr->GetCreatureModelRandomGender(&displayID);
target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, displayID);
}
@@ -3878,7 +3877,7 @@ void AuraEffect::HandleAuraMounted(AuraApplication const * aurApp, uint8 mode, b
team = target->ToPlayer()->GetTeam();
uint32 displayID = sObjectMgr->ChooseDisplayId(team, ci);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID);
sObjectMgr->GetCreatureModelRandomGender(&displayID);
//some spell has one aura of mount and one of vehicle
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
@@ -6154,7 +6153,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo
team = target->ToPlayer()->GetTeam();
uint32 displayID = sObjectMgr->ChooseDisplayId(team, creatureInfo);
CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID);
sObjectMgr->GetCreatureModelRandomGender(&displayID);
target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, displayID);
}
src/server/game/Tickets/TicketMgr.cpp
+2 -3
View File
@@ -100,7 +100,7 @@ void GmTicket::SaveToDB(SQLTransaction& trans) const
CharacterDatabase.ExecuteOrAppend(trans, stmt);
}
void GmTicket::DeleteFromDB(SQLTransaction& trans)
void GmTicket::DeleteFromDB()
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GM_TICKET);
stmt->setUInt32(0, _id);
@@ -286,8 +286,7 @@ void TicketMgr::RemoveTicket(uint32 ticketId)
{
if (GmTicket* ticket = GetTicket(ticketId))
{
SQLTransaction trans = SQLTransaction(NULL);
ticket->DeleteFromDB(trans);
ticket->DeleteFromDB();
_ticketList.erase(ticketId);
}
}
src/server/game/Tickets/TicketMgr.h
+1 -1
View File
@@ -129,7 +129,7 @@ public:
bool LoadFromDB(Field* fields);
void SaveToDB(SQLTransaction& trans) const;
void DeleteFromDB(SQLTransaction& trans);
void DeleteFromDB();
void WritePacket(WorldPacket& data) const;
void SendResponse(WorldSession* session) const;
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+1 -1
View File
@@ -1215,7 +1215,7 @@ class npc_crate_helper : public CreatureScript
_marked = false;
}
void SpellHit(Unit* caster, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
{
if (spell->Id == SPELL_ARCANE_DISRUPTION && !_marked)
{
src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+1 -2
View File
@@ -190,11 +190,10 @@ public:
void MovementInform(uint32 type, uint32 id)
{
if (id == 1)
if (type == POINT_MOTION_TYPE && id == 1)
{
DoScriptText(SAY_DIRECTION, me);
me->ForcedDespawn();
return;
}
}
};
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+12 -13
View File
@@ -340,8 +340,8 @@ public:
events.ScheduleEvent(EVENT_YELL_2, 0, 0, _phase);
events.ScheduleEvent(EVENT_YELL_3, 8*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_YELL_4, 16*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, urand(7, 16)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_STATIC_FIELD, urand(20, 30)*IN_MILLISECONDS, 0, _phase);
break;
default:
break;
@@ -474,7 +474,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 const diff)
{
if (!UpdateVictim())
return;
@@ -571,11 +571,11 @@ public:
break;
case EVENT_SURGE_POWER_PHASE_3:
DoCast(GetTargetPhaseThree(), SPELL_SURGE_POWER_PHASE_3);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, PHASE_THREE);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, urand(7, 16)*IN_MILLISECONDS, 0, PHASE_THREE);
break;
case EVENT_STATIC_FIELD:
DoCast(GetTargetPhaseThree(), SPELL_STATIC_FIELD);
events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, PHASE_THREE);
events.ScheduleEvent(EVENT_STATIC_FIELD, urand(20, 30)*IN_MILLISECONDS, 0, PHASE_THREE);
break;
default:
break;
@@ -738,7 +738,7 @@ public:
summonTimer = urand(5, 7)*IN_MILLISECONDS;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 const diff)
{
if (!me->HasAura(SPELL_PORTAL_VISUAL_CLOSED) &&
!me->HasAura(SPELL_PORTAL_OPENED))
@@ -813,7 +813,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 const /*diff*/)
{
if (!instance)
return;
@@ -874,7 +874,7 @@ public:
instance = creature->GetInstanceScript();
}
void PassengerBoarded(Unit* unit, int8 seat, bool apply)
void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply)
{
if (apply)
{
@@ -919,7 +919,7 @@ public:
// we dont evade
}
void DoAction(const int32 action)
void DoAction(int32 const action)
{
if (me->GetEntry() != NPC_HOVER_DISK_CASTER)
return;
@@ -952,9 +952,8 @@ public:
// we dont do melee damage!
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 /*i*/)
{
}
private:
@@ -988,7 +987,7 @@ public:
DoCast(me, SPELL_ARCANE_OVERLOAD, false);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 const /*diff*/)
{
// we dont do melee damage!
}
@@ -1087,7 +1086,7 @@ public:
events.ScheduleEvent(EVENT_YELL_1, 0);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 const /*diff*/)
{
while (uint32 eventId = events.ExecuteEvent())
{
src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+2 -2
View File
@@ -286,7 +286,7 @@ class go_razorscale_harpoon : public GameObjectScript
public:
go_razorscale_harpoon() : GameObjectScript("go_razorscale_harpoon") {}
bool OnGossipHello(Player* player, GameObject* go)
bool OnGossipHello(Player* /*player*/, GameObject* go)
{
InstanceScript* instance = go->GetInstanceScript();
if (Creature* razorscale = ObjectAccessor::GetCreature(*go, instance ? instance->GetData64(TYPE_RAZORSCALE) : 0))
@@ -360,7 +360,7 @@ class boss_razorscale : public CreatureScript
void MovementInform(uint32 type, uint32 id)
{
if (id == 1)
if (type == POINT_MOTION_TYPE && id == 1)
{
phase = PHASE_GROUND;
events.SetPhase(PHASE_GROUND);
src/server/scripts/Outland/nagrand.cpp
+2 -2
View File
@@ -893,7 +893,7 @@ public:
};
};
enum corki
enum CorkiData
{
// first quest
QUEST_HELP = 9923,
@@ -993,7 +993,7 @@ public:
void MovementInform(uint32 type, uint32 id)
{
if (id == 1)
if (type == POINT_MOTION_TYPE && id == 1)
{
Say_Timer = 5000;
ReleasedFromCage = true;