aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Battlegrounds/ArenaScore.h2
-rw-r--r--src/server/game/Battlegrounds/Battleground.cpp1
-rw-r--r--src/server/game/Battlegrounds/BattlegroundScore.h4
-rw-r--r--src/server/game/Entities/Corpse/Corpse.cpp2
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp2
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Grids/Notifiers/GridNotifiers.h6
-rw-r--r--src/server/scripts/Commands/cs_debug.cpp6
-rw-r--r--src/server/scripts/Commands/cs_gobject.cpp2
9 files changed, 13 insertions, 14 deletions
diff --git a/src/server/game/Battlegrounds/ArenaScore.h b/src/server/game/Battlegrounds/ArenaScore.h
index dcb41c114c4..c3d6ee88dbf 100644
--- a/src/server/game/Battlegrounds/ArenaScore.h
+++ b/src/server/game/Battlegrounds/ArenaScore.h
@@ -36,7 +36,7 @@ struct ArenaScore : public BattlegroundScore
void AppendToPacket(WorldPacket& data, ByteBuffer& content) final
{
- int32 primaryTree;
+ uint32 primaryTree = 0;
if (Player* player = ObjectAccessor::FindPlayer(PlayerGuid))
primaryTree = player->GetPrimaryTalentTree(player->GetActiveSpec());
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 9089e75c1cd..ce00fe5776d 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -1451,7 +1451,6 @@ void Battleground::BuildPvPLogDataPacket(WorldPacket& data)
size_t countPos = data.bitwpos();
data.WriteBits(0, 21);
- uint32 count = 0;
for (auto const& score : PlayerScores)
score.second->AppendToPacket(data, buff);
diff --git a/src/server/game/Battlegrounds/BattlegroundScore.h b/src/server/game/Battlegrounds/BattlegroundScore.h
index c5c1fc07d29..498999cfed7 100644
--- a/src/server/game/Battlegrounds/BattlegroundScore.h
+++ b/src/server/game/Battlegrounds/BattlegroundScore.h
@@ -91,14 +91,14 @@ struct BattlegroundScore
virtual void AppendToPacket(WorldPacket& data, ByteBuffer& content)
{
- int32 primaryTree;
+ uint32 primaryTree = 0;
if (Player* player = ObjectAccessor::FindPlayer(PlayerGuid))
primaryTree = player->GetPrimaryTalentTree(player->GetActiveSpec());
data.WriteBit(0); // Unk 1
data.WriteBit(0); // Unk 2
data.WriteBit(PlayerGuid[2]);
- data.WriteBit(/*!IsArena*/ 1); // IsArena
+ data.WriteBit(/*!IsArena*/ 1); // IsArena
data.WriteBit(0); // Unk 4
data.WriteBit(0); // Unk 5
data.WriteBit(0); // Unk 6
diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index b6b46ff45df..9c50cec6ab8 100644
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@@ -182,7 +182,7 @@ bool Corpse::LoadCorpseFromDB(uint32 guid, Field* fields)
m_time = time_t(fields[11].GetUInt32());
uint32 instanceId = fields[13].GetUInt32();
- uint32 phaseMask = fields[14].GetUInt32();
+ //uint32 phaseMask = fields[14].GetUInt32();
// place
SetLocationInstanceId(instanceId);
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 3a171c3c23b..45f71b096f8 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -743,7 +743,7 @@ void Creature::Motion_Initialize()
GetMotionMaster()->Initialize();
}
-bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 entry, float x, float y, float z, float ang, CreatureData const* data /*= nullptr*/, uint32 vehId /*= 0*/)
+bool Creature::Create(uint32 guidlow, Map* map, uint32 /*phaseMask*/, uint32 entry, float x, float y, float z, float ang, CreatureData const* data /*= nullptr*/, uint32 vehId /*= 0*/)
{
ASSERT(map);
SetMap(map);
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index a2528c78516..b0d1b252c5b 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -167,7 +167,7 @@ void GameObject::RemoveFromWorld()
}
}
-bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMask, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state, uint32 artKit)
+bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 /*phaseMask*/, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state, uint32 artKit)
{
ASSERT(map);
SetMap(map);
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index e82533b1cb2..313240a2391 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -195,13 +195,13 @@ namespace Trinity
template<class Check>
struct WorldObjectLastSearcher
{
- uint32 i_mapTypeMask;
- WorldObject* &i_object;
WorldObject const* _searcher;
+ WorldObject* &i_object;
Check &i_check;
+ uint32 i_mapTypeMask;
WorldObjectLastSearcher(WorldObject const* searcher, WorldObject* & result, Check& check, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL)
- : i_mapTypeMask(mapTypeMask), _searcher(searcher), i_object(result), i_check(check) { }
+ : _searcher(searcher), i_object(result), i_check(check), i_mapTypeMask(mapTypeMask) { }
void Visit(GameObjectMapType &m);
void Visit(PlayerMapType &m);
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 52886d60c4b..d88d46e8ea6 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1390,14 +1390,14 @@ public:
return true;
}
- static bool HandleDebugPhaseCommand(ChatHandler* handler, char const* /*args*/)
+ static bool HandleDebugPhaseCommand(ChatHandler* /*handler*/, char const* /*args*/)
{
+ /*/
Unit* unit = handler->getSelectedUnit();
Player* player = handler->GetSession()->GetPlayer();
if (unit && unit->GetTypeId() == TYPEID_PLAYER)
player = unit->ToPlayer();
-
-
+ */
return true;
}
};
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index de23c33e591..352142baea4 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -508,7 +508,7 @@ public:
}
//set phasemask for selected object
- static bool HandleGameObjectSetPhaseCommand(ChatHandler* handler, char const* args)
+ static bool HandleGameObjectSetPhaseCommand(ChatHandler* /*handler*/, char const* /*args*/)
{
/*// number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r
char* id = handler->extractKeyFromLink((char*)args, "Hgameobject");