aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpp <none@none>2010-08-21 23:08:54 +0200
committerSpp <none@none>2010-08-21 23:08:54 +0200
commit572f7bbd1dc67a6df6503ec4f828a64842d02cdc (patch)
tree60cc6e5495dfa29d751059755bccf20aecc9ad44 /src
parenta136403deed39dc7d8523fc7117a070b238992f9 (diff)
Core: Remove "may be used uninitialized in this function", "unused parameter ‘xxx’" and "'xxx' defined but not used" warnings
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/collision/Models/WorldModel.cpp2
-rw-r--r--src/server/game/AI/EventAI/CreatureEventAI.h2
-rw-r--r--src/server/game/AuctionHouse/AuctionHouseMgr.cpp2
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp2
-rw-r--r--src/server/game/Chat/Chat.cpp16
-rw-r--r--src/server/game/Chat/Commands/Level3.cpp6
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Loot/LootMgr.cpp4
-rw-r--r--src/server/game/Maps/Map.cpp2
-rw-r--r--src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp4
-rw-r--r--src/server/game/Reputation/ReputationMgr.h4
-rw-r--r--src/server/game/Scripting/ScriptMgr.h2
-rw-r--r--src/server/game/Server/WorldSession.cpp2
-rw-r--r--src/server/game/Spells/SpellEffects.cpp2
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
-rw-r--r--src/server/game/Tools/PlayerDump.cpp2
-rw-r--r--src/server/game/World/World.cpp4
-rw-r--r--src/server/shared/Utilities/SignalHandler.h2
-rw-r--r--src/server/worldserver/CommandLine/CliRunnable.cpp6
-rw-r--r--src/server/worldserver/RemoteAccess/RASocket.cpp2
20 files changed, 38 insertions, 32 deletions
diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp
index 0bd156fedc2..c3ff6aaade5 100644
--- a/src/server/collision/Models/WorldModel.cpp
+++ b/src/server/collision/Models/WorldModel.cpp
@@ -345,7 +345,7 @@ namespace VMAP
{
GModelRayCallback(const std::vector<MeshTriangle> &tris, const std::vector<Vector3> &vert):
vertices(vert.begin()), triangles(tris.begin()), hit(false) {}
- bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit)
+ bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool /*pStopAtFirstHit*/)
{
bool result = IntersectTriangle(triangles[entry], vertices, ray, distance);
if (result) hit=true;
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.h b/src/server/game/AI/EventAI/CreatureEventAI.h
index 3d2aaffae77..5495216b728 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.h
+++ b/src/server/game/AI/EventAI/CreatureEventAI.h
@@ -556,7 +556,7 @@ typedef UNORDERED_MAP<uint32, std::vector<CreatureEventAI_Event> > CreatureEvent
struct CreatureEventAI_Summon
{
- uint32 id;
+ uint32 id2;
float position_x;
float position_y;
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 0c004d62726..76f6a8ae396 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -535,7 +535,7 @@ void AuctionHouseObject::AddAuction(AuctionEntry *auction)
sScriptMgr.OnAuctionAdd(this, auction);
}
-bool AuctionHouseObject::RemoveAuction(AuctionEntry *auction, uint32 item_template)
+bool AuctionHouseObject::RemoveAuction(AuctionEntry *auction, uint32 /*item_template*/)
{
bool wasInMap = AuctionsMap.erase(auction->Id) ? true : false;
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
index 5b0b0b807d2..aa9ec2b521d 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
@@ -493,7 +493,7 @@ void BattlegroundSA::TeleportPlayers()
}
}
-void BattlegroundSA::EventPlayerDamagedGO(Player* plr, GameObject* go, uint8 hitType, uint32 destroyedEvent)
+void BattlegroundSA::EventPlayerDamagedGO(Player* /*plr*/, GameObject* go, uint8 hitType, uint32 destroyedEvent)
{
if (!go || !go->GetGOInfo())
return;
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 9ee79281e5a..0fa2c91befb 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -1200,14 +1200,14 @@ valid examples:
std::istringstream reader(message);
char buffer[256];
- uint32 color;
-
- ItemPrototype const* linkedItem;
- Quest const* linkedQuest;
- SpellEntry const *linkedSpell;
- AchievementEntry const* linkedAchievement;
- ItemRandomPropertiesEntry const* itemProperty;
- ItemRandomSuffixEntry const* itemSuffix;
+ uint32 color = 0;
+
+ ItemPrototype const* linkedItem = NULL;
+ Quest const* linkedQuest = NULL;
+ SpellEntry const *linkedSpell = NULL;
+ AchievementEntry const* linkedAchievement = NULL;
+ ItemRandomPropertiesEntry const* itemProperty = NULL;
+ ItemRandomSuffixEntry const* itemSuffix = NULL;
while (!reader.eof())
{
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index d712dcdac91..ae09f424c40 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -1114,7 +1114,7 @@ bool ChatHandler::HandleReloadAuctionsCommand(const char * /*args*/)
return true;
}
-bool ChatHandler::HandleReloadConditions(const char* args)
+bool ChatHandler::HandleReloadConditions(const char* /*args*/)
{
sLog.outString("Re-Loading Conditions...");
sConditionMgr.LoadConditions(true);
@@ -3536,8 +3536,8 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args)
if (repState) // and then target != NULL also
{
- ReputationRank rank = target->GetReputationMgr().GetRank(factionEntry);
- std::string rankName = GetTrinityString(ReputationRankStrIndex[rank]);
+ uint32 index = target->GetReputationMgr().GetReputationRankStrIndex(factionEntry);
+ std::string rankName = GetTrinityString(index);
ss << " " << rankName << "|h|r (" << target->GetReputationMgr().GetReputation(factionEntry) << ")";
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index ff9a57d54c9..bf44e7467bb 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -2586,7 +2586,7 @@ void Player::RemoveFromGroup(Group* group, uint64 guid)
}
}
-void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 BonusXP, bool recruitAFriend, float group_rate)
+void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 BonusXP, bool recruitAFriend, float /*group_rate*/)
{
WorldPacket data(SMSG_LOG_XPGAIN, 21); // guess size?
data << uint64(victim ? victim->GetGUID() : 0); // guid
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
index 86f078a7340..988ff9ef066 100644
--- a/src/server/game/Loot/LootMgr.cpp
+++ b/src/server/game/Loot/LootMgr.cpp
@@ -978,7 +978,7 @@ bool LootTemplate::LootGroup::HasQuestDropForPlayer(Player const * player) const
return false;
}
-void LootTemplate::LootGroup::CopyConditions(ConditionList conditions)
+void LootTemplate::LootGroup::CopyConditions(ConditionList /*conditions*/)
{
for (LootStoreItemList::iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
{
@@ -1114,7 +1114,7 @@ void LootTemplate::LootGroup::Verify(LootStore const& lootstore, uint32 id, uint
}
}
-void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_set) const
+void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& /*store*/, LootIdSet* ref_set) const
{
for (LootStoreItemList::const_iterator ieItr=ExplicitlyChanced.begin(); ieItr != ExplicitlyChanced.end(); ++ieItr)
{
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 9c4b4f80a56..21c039974f5 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1646,7 +1646,7 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps, float maxSearchD
}
}
-inline bool IsOutdoorWMO(uint32 mogpFlags, int32 adtId, int32 rootId, int32 groupId, WMOAreaTableEntry const* wmoEntry, AreaTableEntry const* atEntry)
+inline bool IsOutdoorWMO(uint32 mogpFlags, int32 /*adtId*/, int32 /*rootId*/, int32 /*groupId*/, WMOAreaTableEntry const* wmoEntry, AreaTableEntry const* atEntry)
{
bool outdoor = true;
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 42c01f4401a..77835a58411 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -262,7 +262,9 @@ void FlightPathMovementGenerator::Finalize(Player & player)
{
player.clearUnitState(UNIT_STAT_IN_FLIGHT);
- float x, y, z;
+ float x = 0;
+ float y = 0;
+ float z = 0;
i_destinationHolder.GetLocationNow(player.GetBaseMap(), x, y, z);
player.SetPosition(x, y, z, player.GetOrientation());
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index b3a01ffc86d..f4aef1e8181 100644
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -101,6 +101,10 @@ class ReputationMgr
ReputationRank GetRank(FactionEntry const* factionEntry) const;
ReputationRank GetBaseRank(FactionEntry const* factionEntry) const;
+ uint32 GetReputationRankStrIndex(FactionEntry const* factionEntry)
+ {
+ return ReputationRankStrIndex[GetRank(factionEntry)];
+ };
ReputationRank const* GetForcedRankIfAny(FactionTemplateEntry const* factionTemplateEntry) const
{
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index e4cac7747c4..c8baeddf48d 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -177,7 +177,7 @@ template<class TObject> class UpdatableScript
public:
- virtual void OnUpdate(TObject* obj, uint32 diff) { }
+ virtual void OnUpdate(TObject* /*obj*/, uint32 /*diff*/) { }
};
class SpellHandlerScript : public ScriptObject
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 0351ca5d520..b425e5a4c4a 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -80,7 +80,7 @@ WorldSession::~WorldSession()
}
///- empty incoming packet queue
- WorldPacket* packet;
+ WorldPacket* packet = NULL;
while (_recvQueue.next(packet))
delete packet;
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index bb634d62442..dc870431bf1 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -6200,7 +6200,7 @@ void Spell::EffectBlock(uint32 /*i*/)
unitTarget->ToPlayer()->SetCanBlock(true);
}
-void Spell::EffectLeap(uint32 i)
+void Spell::EffectLeap(uint32 /*i*/)
{
if (unitTarget->isInFlight())
return;
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index c0c2632e7e7..804d939eeb1 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1826,7 +1826,7 @@ bool SpellMgr::IsSkillTypeSpell(uint32 spellId, SkillType type) const
}
// basepoints provided here have to be valid basepoints (use SpellMgr::CalculateSpellEffectBaseAmount)
-int32 SpellMgr::CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster, int32 const * effBasePoints, Unit const * target)
+int32 SpellMgr::CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster, int32 const * effBasePoints, Unit const * /*target*/)
{
float basePointsPerLevel = spellEntry->EffectRealPointsPerLevel[effIndex];
int32 basePoints = effBasePoints ? *effBasePoints : spellEntry->EffectBasePoints[effIndex];
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index 5dd0ed97dc7..3d61c646996 100644
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -477,7 +477,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
ROLLBACK(DUMP_FILE_BROKEN);
}
- DumpTableType type;
+ DumpTableType type = DumpTableType(0);
uint8 i;
for (i = 0; i < DUMP_TABLE_COUNT; ++i)
{
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index c6db1e81d96..d8c90e421af 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -126,7 +126,7 @@ World::~World()
m_sessions.erase(m_sessions.begin());
}
- CliCommandHolder* command;
+ CliCommandHolder* command = NULL;
while (cliCmdQueue.next(command))
delete command;
@@ -2742,4 +2742,4 @@ void World::ProcessQueryCallbacks()
_UpdateRealmCharCount(result, param);
m_realmCharCallback.FreeResult();
}
-} \ No newline at end of file
+}
diff --git a/src/server/shared/Utilities/SignalHandler.h b/src/server/shared/Utilities/SignalHandler.h
index 0c4d8143c41..a20c58b983a 100644
--- a/src/server/shared/Utilities/SignalHandler.h
+++ b/src/server/shared/Utilities/SignalHandler.h
@@ -35,7 +35,7 @@ class SignalHandler : public ACE_Event_Handler
HandleSignal(SigNum);
return 0;
}
- virtual void HandleSignal(int SigNum) {};
+ virtual void HandleSignal(int /*SigNum*/) {};
};
}
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
index e44ec1ada94..18b4872055b 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
@@ -72,7 +72,7 @@ char * command_finder(const char* text, int state)
return ((char*)NULL);
}
-char ** cli_completion(const char * text, int start, int end)
+char ** cli_completion(const char * text, int start, int /*end*/)
{
char ** matches;
matches = (char**)NULL;
@@ -85,7 +85,7 @@ char ** cli_completion(const char * text, int start, int end)
}
#endif
-void utf8print(void* arg, const char* str)
+void utf8print(void* /*arg*/, const char* str)
{
#if PLATFORM == PLATFORM_WINDOWS
wchar_t wtemp_buf[6000];
@@ -106,7 +106,7 @@ void utf8print(void* arg, const char* str)
#endif
}
-void commandFinished(void*, bool sucess)
+void commandFinished(void*, bool /*success*/)
{
printf("TC> ");
fflush(stdout);
diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp
index 8fdc7ccd948..d70a414597f 100644
--- a/src/server/worldserver/RemoteAccess/RASocket.cpp
+++ b/src/server/worldserver/RemoteAccess/RASocket.cpp
@@ -226,7 +226,7 @@ void RASocket::zprint(void* callbackArg, const char * szText )
send(((RASocket*)callbackArg)->GetSocket(), szText, sz, 0);
}
-void RASocket::commandFinished(void* callbackArg, bool success)
+void RASocket::commandFinished(void* callbackArg, bool /*success*/)
{
RASocket* raSocket = (RASocket*)callbackArg;
raSocket->Sendf("TC>");