diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-05-10 23:29:36 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-05-10 23:29:36 +0200 |
| commit | 376dc7402a41a03b4c5bc718863c1e0eb410ebec (patch) | |
| tree | 68e09bdc3bf3cc4c75223787709f0a6fc77150ef /src/server/game/Entities/Player | |
| parent | 5002e5d3524eab201c6c219cd60a9f7d6188ed54 (diff) | |
Core/DataStores: Removed hardcoded cap for taxi nodes mask
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/PlayerTaxi.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/PlayerTaxi.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/PlayerTaxi.cpp b/src/server/game/Entities/Player/PlayerTaxi.cpp index 37a4b8fe22c..e269fd3f7df 100644 --- a/src/server/game/Entities/Player/PlayerTaxi.cpp +++ b/src/server/game/Entities/Player/PlayerTaxi.cpp @@ -31,7 +31,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level { case CLASS_DEATH_KNIGHT: { - for (std::size_t i = 0; i < TaxiMaskSize; ++i) + for (std::size_t i = 0; i < m_taximask.size(); ++i) m_taximask[i] |= sOldContinentsNodesMask[i] & factionMask[i]; break; } @@ -99,7 +99,7 @@ bool PlayerTaxi::LoadTaxiMask(std::string const& data) { bool warn = false; std::vector<std::string_view> tokens = Trinity::Tokenize(data, ' ', false); - for (size_t index = 0; (index < TaxiMaskSize) && (index < tokens.size()); ++index) + for (size_t index = 0; (index < m_taximask.size()) && (index < tokens.size()); ++index) { if (Optional<uint32> mask = Trinity::StringTo<uint32>(tokens[index])) { @@ -209,7 +209,7 @@ uint32 PlayerTaxi::GetCurrentTaxiPath() const std::ostringstream& operator<<(std::ostringstream& ss, PlayerTaxi const& taxi) { - for (std::size_t i = 0; i < TaxiMaskSize; ++i) + for (std::size_t i = 0; i < taxi.m_taximask.size(); ++i) ss << uint32(taxi.m_taximask[i]) << ' '; return ss; } diff --git a/src/server/game/Entities/Player/PlayerTaxi.h b/src/server/game/Entities/Player/PlayerTaxi.h index 16a238a02da..c8c48b0958f 100644 --- a/src/server/game/Entities/Player/PlayerTaxi.h +++ b/src/server/game/Entities/Player/PlayerTaxi.h @@ -36,7 +36,7 @@ namespace WorldPackets class TC_GAME_API PlayerTaxi { public: - PlayerTaxi() : m_flightMasterFactionId(0) { m_taximask.fill(0); } + PlayerTaxi() : m_flightMasterFactionId(0) { } ~PlayerTaxi() { } // Nodes void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level); |