From 9bb168b693436c2032d253fc8450b2877523c92f Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Thu, 8 Dec 2022 01:06:00 -0800 Subject: [PATCH] use bare array instead of parray in tournament index --- src/Episode3/Tournament.cc | 8 ++++---- src/Episode3/Tournament.hh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Episode3/Tournament.cc b/src/Episode3/Tournament.cc index 90ba36c1..a1ab810b 100644 --- a/src/Episode3/Tournament.cc +++ b/src/Episode3/Tournament.cc @@ -395,7 +395,7 @@ void Tournament::print_bracket(FILE* stream) const { vector> TournamentIndex::all_tournaments() const { vector> ret; - for (size_t z = 0; z < this->tournaments.size(); z++) { + for (size_t z = 0; z < 0x20; z++) { if (this->tournaments[z]) { ret.emplace_back(this->tournaments[z]); } @@ -412,12 +412,12 @@ shared_ptr TournamentIndex::create_tournament( bool is_2v2) { // Find an unused tournament number uint8_t number; - for (number = 0; number < this->tournaments.size(); number++) { + for (number = 0; number < 0x20; number++) { if (!this->tournaments[number]) { break; } } - if (number >= this->tournaments.size()) { + if (number >= 0x20) { throw runtime_error("all tournament slots are full"); } @@ -436,7 +436,7 @@ shared_ptr TournamentIndex::get_tournament(uint8_t number) const { } shared_ptr TournamentIndex::get_tournament(const string& name) const { - for (size_t z = 0; z < this->tournaments.size(); z++) { + for (size_t z = 0; z < 0x20; z++) { if (this->tournaments[z] && (this->tournaments[z]->get_name() == name)) { return this->tournaments[z]; } diff --git a/src/Episode3/Tournament.hh b/src/Episode3/Tournament.hh index 6bd6f8cc..91c6ee83 100644 --- a/src/Episode3/Tournament.hh +++ b/src/Episode3/Tournament.hh @@ -156,7 +156,7 @@ public: std::shared_ptr get_tournament(const std::string& name) const; private: - parray, 0x20> tournaments; + std::shared_ptr tournaments[0x20]; };