@@ -29,7 +29,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level
2929 {
3030 case CLASS_DEATH_KNIGHT:
3131 {
32- for (uint8 i = 0 ; i < TaxiMaskSize ; ++i)
32+ for (std:: size_t i = 0 ; i < m_taximask. size () ; ++i)
3333 m_taximask[i] |= sOldContinentsNodesMask [i];
3434 break ;
3535 }
@@ -66,7 +66,7 @@ bool PlayerTaxi::LoadTaxiMask(std::string const& data)
6666{
6767 bool warn = false ;
6868 std::vector<std::string_view> tokens = Trinity::Tokenize (data, ' ' , false );
69- for (uint8 index = 0 ; (index < TaxiMaskSize ) && (index < tokens.size ()); ++index)
69+ for (size_t index = 0 ; (index < m_taximask. size () ) && (index < tokens.size ()); ++index)
7070 {
7171 if (Optional<uint32> mask = Trinity::StringTo<uint32>(tokens[index]))
7272 {
@@ -87,15 +87,9 @@ bool PlayerTaxi::LoadTaxiMask(std::string const& data)
8787void PlayerTaxi::AppendTaximaskTo (ByteBuffer& data, bool all)
8888{
8989 if (all)
90- {
91- for (uint8 i = 0 ; i < TaxiMaskSize; ++i)
92- data << uint32 (sTaxiNodesMask [i]); // all existing nodes
93- }
90+ data.append (sTaxiNodesMask .data (), sTaxiNodesMask .size ()); // all existing nodes
9491 else
95- {
96- for (uint8 i = 0 ; i < TaxiMaskSize; ++i)
97- data << uint32 (m_taximask[i]); // known nodes
98- }
92+ data.append (m_taximask.data (), m_taximask.size ()); // known nodes
9993}
10094
10195bool PlayerTaxi::LoadTaxiDestinationsFromString (const std::string& values, uint32 team)
@@ -176,8 +170,8 @@ uint32 PlayerTaxi::GetCurrentTaxiPath() const
176170
177171std::ostringstream& operator <<(std::ostringstream& ss, PlayerTaxi const & taxi)
178172{
179- for (uint8 i = 0 ; i < TaxiMaskSize ; ++i)
180- ss << taxi.m_taximask [i] << ' ' ;
173+ for (std:: size_t i = 0 ; i < taxi. m_taximask . size () ; ++i)
174+ ss << uint32 ( taxi.m_taximask [i]) << ' ' ;
181175 return ss;
182176}
183177
0 commit comments