aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Entities/Item/ItemPrototype.h2
-rw-r--r--src/server/game/Handlers/MovementHandler.cpp2
-rw-r--r--src/server/game/Server/Packets/ChatPackets.h14
-rw-r--r--src/server/game/Server/Packets/ItemPackets.h4
-rw-r--r--src/server/game/Server/Packets/MovementPackets.cpp4
-rw-r--r--src/server/game/Server/Packets/MovementPackets.h26
-rw-r--r--src/server/game/Server/Packets/QueryPackets.h2
-rw-r--r--src/server/game/Texts/CreatureTextMgr.cpp2
8 files changed, 27 insertions, 29 deletions
diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index fe6051b4f9c..3846f7dd642 100644
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -598,7 +598,7 @@ struct ItemEffect
{
uint32 SpellID;
uint32 Trigger;
- uint32 Charges;
+ int32 Charges;
int32 Cooldown;
uint32 Category;
int32 CategoryCooldown;
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 2100c949071..096eaac26fa 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -359,7 +359,7 @@ void WorldSession::HandleMovementOpcodes(WorldPackets::Movement::ClientPlayerMov
mover->UpdatePosition(movementInfo.pos);
WorldPackets::Movement::ServerPlayerMovement playerMovement;
- playerMovement.mover = mover;
+ playerMovement.movementInfo = &mover->m_movementInfo;
mover->SendMessageToSet(const_cast<WorldPacket*>(playerMovement.Write()), _player);
if (plrMover) // nothing is charmed, or player charmed
diff --git a/src/server/game/Server/Packets/ChatPackets.h b/src/server/game/Server/Packets/ChatPackets.h
index 3d65bb04c54..9cdc534528f 100644
--- a/src/server/game/Server/Packets/ChatPackets.h
+++ b/src/server/game/Server/Packets/ChatPackets.h
@@ -143,8 +143,8 @@ namespace WorldPackets
ObjectGuid SenderAccountGUID;
ObjectGuid TargetGUID;
ObjectGuid PartyGUID;
- uint32 SenderVirtualAddress;
- uint32 TargetVirtualAddress;
+ uint32 SenderVirtualAddress = 0;
+ uint32 TargetVirtualAddress = 0;
std::string SenderName;
std::string TargetName;
std::string Prefix;
@@ -165,7 +165,7 @@ namespace WorldPackets
WorldPacket const* Write() override;
ObjectGuid Guid;
- int32 EmoteID;
+ int32 EmoteID = 0;
};
class CTextEmote final : public ClientPacket
@@ -176,8 +176,8 @@ namespace WorldPackets
void Read() override;
ObjectGuid Target;
- int32 EmoteID;
- int32 SoundIndex;
+ int32 EmoteID = 0;
+ int32 SoundIndex = -1;
};
class STextEmote final : public ServerPacket
@@ -190,8 +190,8 @@ namespace WorldPackets
ObjectGuid SourceGUID;
ObjectGuid SourceAccountGUID;
ObjectGuid TargetGUID;
- int32 SoundIndex;
- int32 EmoteID;
+ int32 SoundIndex = -1;
+ int32 EmoteID = 0;
};
}
}
diff --git a/src/server/game/Server/Packets/ItemPackets.h b/src/server/game/Server/Packets/ItemPackets.h
index cb87bc0c586..72e2a02fbe2 100644
--- a/src/server/game/Server/Packets/ItemPackets.h
+++ b/src/server/game/Server/Packets/ItemPackets.h
@@ -31,8 +31,8 @@ namespace WorldPackets
WorldPacket const* Write() override;
- uint32 ProficiencyMask;
- uint8 ProficiencyClass;
+ uint32 ProficiencyMask = 0;
+ uint8 ProficiencyClass = 0;
};
struct ItemBonusInstanceData
diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index 74c5567c244..0c4d4bcff40 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -300,9 +300,7 @@ WorldPacket const* WorldPackets::Movement::MoveSetFlag::Write()
WorldPacket const* WorldPackets::Movement::ServerPlayerMovement::Write()
{
- MovementInfo movementInfo = mover->m_movementInfo;
-
- _worldPacket << movementInfo;
+ _worldPacket << *movementInfo;
return &_worldPacket;
}
diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h
index 890b1991dd8..6d5d10526b3 100644
--- a/src/server/game/Server/Packets/MovementPackets.h
+++ b/src/server/game/Server/Packets/MovementPackets.h
@@ -43,23 +43,23 @@ namespace WorldPackets
WorldPacket const* Write() override;
- Unit* mover;
+ MovementInfo* movementInfo = nullptr;
};
struct MonsterSplineFilterKey
{
- int16 Idx;
- int16 Speed;
+ int16 Idx = 0;
+ int16 Speed = 0;
};
struct MonsterSplineFilter
{
std::vector<MonsterSplineFilterKey> FilterKeys;
- uint8 FilterFlags;
- float BaseSpeed;
- int16 StartOffset;
- float DistToPrevFilterKey;
- int16 AddedToStart;
+ uint8 FilterFlags = 0;
+ float BaseSpeed = 0.0f;
+ int16 StartOffset = 0;
+ float DistToPrevFilterKey = 0.0f;
+ int16 AddedToStart = 0;
};
struct MovementSpline
@@ -86,7 +86,7 @@ namespace WorldPackets
struct MovementMonsterSpline
{
- uint32 ID;
+ uint32 ID = 0;
G3D::Vector3 Destination;
bool CrzTeleport = false;
MovementSpline Move;
@@ -134,7 +134,7 @@ namespace WorldPackets
WorldPacket const* Write() override;
- MovementInfo* movementInfo;
+ MovementInfo* movementInfo = nullptr;
float Speed = 1.0f;
};
@@ -196,8 +196,8 @@ namespace WorldPackets
WorldPacket const* Write() override;
- int32 MapID = 0;
- uint32 Reason = 0;
+ int32 MapID = 0;
+ uint32 Reason = 0;
Position Pos;
};
@@ -247,7 +247,7 @@ namespace WorldPackets
WorldPacket const* Write() override;
- MovementInfo* movementInfo;
+ MovementInfo* movementInfo = nullptr;
std::vector<MovementForce> MovementForces;
Optional<float> SwimBackSpeed;
Optional<float> FlightSpeed;
diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h
index b9e04ec4260..8b6eae8db56 100644
--- a/src/server/game/Server/Packets/QueryPackets.h
+++ b/src/server/game/Server/Packets/QueryPackets.h
@@ -181,7 +181,7 @@ namespace WorldPackets
void Read() override;
- uint32 TableHash;
+ uint32 TableHash = 0;
std::vector<DBQueryRecord> Queries;
};
diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp
index 07d0bd53629..992942cefeb 100644
--- a/src/server/game/Texts/CreatureTextMgr.cpp
+++ b/src/server/game/Texts/CreatureTextMgr.cpp
@@ -60,7 +60,7 @@ class PlayerTextBuilder
{
std::string const& text = sCreatureTextMgr->GetLocalizedChatString(_source->GetEntry(), _gender, _textGroup, _textId, locale);
WorldPackets::Chat::Chat packet;
- return ChatHandler::BuildChatPacket(&packet, _msgType, Language(_language), _talker, _target, text, 0, "", locale);
+ ChatHandler::BuildChatPacket(&packet, _msgType, Language(_language), _talker, _target, text, 0, "", locale);
data = *packet.Write();
}