diff options
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/PlayerTaxi.h | 4 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 4ace4f67aca..03e2e872c65 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -1218,7 +1218,7 @@ void DB2Manager::LoadStores(std::string const& dataPath, uint32 defaultLocale) continue; // valid taxi network node - uint8 field = (uint8)((node->ID - 1) / 8); + uint32 field = uint32((node->ID - 1) / 8); uint32 submask = 1 << ((node->ID - 1) % 8); sTaxiNodesMask[field] |= submask; diff --git a/src/server/game/Entities/Player/PlayerTaxi.h b/src/server/game/Entities/Player/PlayerTaxi.h index 7a98e01baa1..9da960883a6 100644 --- a/src/server/game/Entities/Player/PlayerTaxi.h +++ b/src/server/game/Entities/Player/PlayerTaxi.h @@ -44,13 +44,13 @@ class TC_GAME_API PlayerTaxi bool IsTaximaskNodeKnown(uint32 nodeidx) const { - uint8 field = uint8((nodeidx - 1) / 8); + uint32 field = uint32((nodeidx - 1) / 8); uint32 submask = 1 << ((nodeidx-1) % 8); return (m_taximask[field] & submask) == submask; } bool SetTaximaskNode(uint32 nodeidx) { - uint8 field = uint8((nodeidx - 1) / 8); + uint32 field = uint32((nodeidx - 1) / 8); uint32 submask = 1 << ((nodeidx- 1) % 8); if ((m_taximask[field] & submask) != submask) { diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 4b2d0ab6add..a9bbf7bbade 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6171,7 +6171,7 @@ uint32 ObjectMgr::GetNearestTaxiNode(float x, float y, float z, uint32 mapid, ui if (!node || node->ContinentID != mapid || !(node->Flags & requireFlag)) continue; - uint8 field = (uint8)((node->ID - 1) / 8); + uint32 field = uint32((node->ID - 1) / 8); uint32 submask = 1 << ((node->ID - 1) % 8); // skip not taxi network nodes |