Skip to content

Commit 44baab2

Browse files
committed
fix clang-tidy errors
1 parent 9be68bc commit 44baab2

File tree

7 files changed

+41
-25
lines changed

7 files changed

+41
-25
lines changed

src/game/simulated_tetrion.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ SimulatedTetrion::SimulatedTetrion(
2929

3030
SimulatedTetrion::~SimulatedTetrion() = default;
3131

32+
SimulatedTetrion::SimulatedTetrion(const SimulatedTetrion& other) = default;
33+
34+
SimulatedTetrion::SimulatedTetrion(SimulatedTetrion&& other) noexcept = default;
35+
3236
void SimulatedTetrion::update_step(const SimulationStep simulation_step_index) {
3337
switch (m_game_state) {
3438
case GameState::Playing: {
@@ -324,7 +328,7 @@ void SimulatedTetrion::clear_fully_occupied_lines() {
324328

325329
void SimulatedTetrion::lock_active_tetromino(const SimulationStep simulation_step_index) {
326330
assert(m_active_tetromino.has_value());
327-
for (const Mino& mino : m_active_tetromino->minos()) {
331+
for (const Mino& mino : m_active_tetromino->minos()) { // NOLINT(bugprone-unchecked-optional-access)
328332
m_mino_stack.set(mino.position(), mino.type());
329333
}
330334
m_allowed_to_hold = true;

src/game/simulated_tetrion.hpp

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,23 @@ struct SimulatedTetrion {
5858
u64 m_lock_delay_step_index;
5959

6060
protected:
61-
MinoStack m_mino_stack;
62-
u32 m_level;
63-
u32 m_lines_cleared = 0;
64-
u64 m_score = 0;
65-
66-
67-
std::optional<Tetromino> m_active_tetromino;
68-
std::optional<Tetromino> m_ghost_tetromino;
69-
std::optional<Tetromino> m_tetromino_on_hold;
70-
std::array<std::optional<Tetromino>, num_preview_tetrominos> m_preview_tetrominos{};
61+
MinoStack
62+
m_mino_stack; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
63+
u32 m_level; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
64+
u32 m_lines_cleared = // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
65+
0;
66+
u64 m_score = // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
67+
0;
68+
69+
70+
std::optional<Tetromino>
71+
m_active_tetromino; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
72+
std::optional<Tetromino>
73+
m_ghost_tetromino; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
74+
std::optional<Tetromino>
75+
m_tetromino_on_hold; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
76+
std::array<std::optional<Tetromino>, num_preview_tetrominos>
77+
m_preview_tetrominos{}; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
7178

7279
private:
7380
Random m_random;
@@ -79,19 +86,26 @@ struct SimulatedTetrion {
7986
std::optional<std::shared_ptr<recorder::RecordingWriter>> m_recording_writer;
8087

8188
protected:
82-
ServiceProvider* const m_service_provider;
89+
ServiceProvider*
90+
m_service_provider; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
8391

8492
public:
8593
SimulatedTetrion(
8694
u8 tetrion_index,
8795
Random::Seed random_seed,
8896
u32 starting_level,
89-
ServiceProvider* const service_provider,
97+
ServiceProvider* service_provider,
9098
std::optional<std::shared_ptr<recorder::RecordingWriter>> recording_writer
9199
);
92100

93101
virtual ~SimulatedTetrion();
94102

103+
SimulatedTetrion(const SimulatedTetrion& other);
104+
SimulatedTetrion& operator=(const SimulatedTetrion& other) = delete;
105+
106+
SimulatedTetrion(SimulatedTetrion&& other) noexcept;
107+
SimulatedTetrion& operator=(SimulatedTetrion&& other) noexcept = delete;
108+
95109
void update_step(SimulationStep simulation_step_index);
96110

97111
// returns if the input event lead to a movement
@@ -145,7 +159,7 @@ struct SimulatedTetrion {
145159

146160
[[nodiscard]] u64 get_gravity_delay_frames() const;
147161

148-
static u8 rotation_to_index(Rotation from, Rotation to);
162+
static u8 rotation_to_index(Rotation from, Rotation rotation_to);
149163

150164
static constexpr auto wall_kick_data_jltsz = WallKickTable{
151165
// North -> East

src/game/simulation.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,9 @@
55
#include "core/helper/expected.hpp"
66
#include "input/replay_input.hpp"
77
#include "simulation.hpp"
8-
#include "ui/layout.hpp"
98

109
#include <spdlog/spdlog.h>
1110

12-
namespace {
13-
14-
const auto dummy_layout = ui::AbsolutLayout{ 0, 0, 0, 0 };
15-
16-
}
17-
1811

1912
Simulation::Simulation(
2013
const std::shared_ptr<input::ReplayGameInput>& input,

src/game/tetrion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ Tetrion::Tetrion(
3939
1, 3, ui::Direction::Vertical, ui::AbsolutMargin{ 0 }, std::pair<double, double>{ 0.0, 0.1 }
4040
);
4141

42-
//TODO:
4342
auto* text_layout = get_text_layout();
4443

4544
constexpr auto text_size = utils::get_orientation() == utils::Orientation::Landscape

src/game/tetrion.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ struct Tetrion final : public ui::Widget, SimulatedTetrion {
3737

3838
~Tetrion() override;
3939

40+
Tetrion(const Tetrion& other) = delete;
41+
Tetrion& operator=(const Tetrion& other) = delete;
42+
43+
Tetrion(Tetrion&& other) noexcept = delete;
44+
Tetrion& operator=(Tetrion&& other) noexcept = delete;
45+
4046
void render(const ServiceProvider& service_provider) const override;
4147
[[nodiscard]] Widget::EventHandleResult
4248
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;

src/input/guid.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ namespace { //NOLINT(cert-dcl59-cpp,google-build-namespaces)
115115

116116

117117
const auto temp_result = single_hex_color_value(
118-
input + offset
119-
); //NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
118+
input + offset //NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
119+
);
120120

121121
PROPAGATE(temp_result, sdl::GUID, std::string);
122122

tests/utils/helper.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ MATCHER(OptionalHasNoValue, "optional has no value") {
2525
}
2626

2727

28-
#define ASSERT_FAIL(x) \
28+
#define ASSERT_FAIL(x) /*NOLINT(cppcoreguidelines-macro-usage)*/ \
2929
do { \
3030
std::cerr << "assertion fail in " << __FILE__ << ":" << __LINE__ << ": " << (x) << "\n"; \
3131
utils::unreachable(); \

0 commit comments

Comments
 (0)