diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DBCStores.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/MovementPackets.h | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/TaxiPackets.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 1d3a982d586..74ae6983406 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -898,6 +898,7 @@ SkillRaceClassInfoEntry const* GetSkillRaceClassInfo(uint32 skill, uint8 race, u void DeterminaAlternateMapPosition(uint32 mapId, float x, float y, float z, uint32* newMapId /*= nullptr*/, DBCPosition2D* newPos /*= nullptr*/) { + ASSERT(newMapId || newPos); WorldMapTransformsEntry const* transformation = nullptr; for (WorldMapTransformsEntry const* transform : sWorldMapTransformsStore) { @@ -936,10 +937,10 @@ void DeterminaAlternateMapPosition(uint32 mapId, float x, float y, float z, uint if (transformation->RegionScale > 0.0f && transformation->RegionScale < 1.0f) { - newPos->X = (x - transformation->RegionMin.X) * transformation->RegionScale + transformation->RegionMin.X; - newPos->Y = (y - transformation->RegionMin.Y) * transformation->RegionScale + transformation->RegionMin.Y; + x = (x - transformation->RegionMin.X) * transformation->RegionScale + transformation->RegionMin.X; + y = (y - transformation->RegionMin.Y) * transformation->RegionScale + transformation->RegionMin.Y; } - newPos->X += transformation->RegionOffset.X; - newPos->Y += transformation->RegionOffset.Y; + newPos->X = x + transformation->RegionOffset.X; + newPos->Y = y + transformation->RegionOffset.Y; } diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h index 66261564989..d94911af15f 100644 --- a/src/server/game/Server/Packets/MovementPackets.h +++ b/src/server/game/Server/Packets/MovementPackets.h @@ -432,7 +432,7 @@ namespace WorldPackets void Read() override; MovementInfo movementInfo; - int32 SplineID; + int32 SplineID = 0; }; } diff --git a/src/server/game/Server/Packets/TaxiPackets.h b/src/server/game/Server/Packets/TaxiPackets.h index 0c916548bac..739d562c733 100644 --- a/src/server/game/Server/Packets/TaxiPackets.h +++ b/src/server/game/Server/Packets/TaxiPackets.h @@ -92,7 +92,7 @@ namespace WorldPackets void Read() override; ObjectGuid Vendor; - uint32 Node; + uint32 Node = 0; }; class NewTaxiPath final : public ServerPacket @@ -110,7 +110,7 @@ namespace WorldPackets WorldPacket const* Write() override; - uint8 Reply; + uint8 Reply = 0; }; class TaxiRequestEarlyLanding final : public ClientPacket |