diff options
| author | fschildt <florian.schildt@protonmail.com> | 2025-10-01 14:08:24 +0200 |
|---|---|---|
| committer | fschildt <florian.schildt@protonmail.com> | 2025-10-01 14:09:13 +0200 |
| commit | c775ca6133d93ed97359a6a50bd94a5563c740de (patch) | |
| tree | 9d3efb1c7e7538ff9d5cae408d2c29f9dd3daeab /src/games/minesweeper | |
| parent | 41c2e2ecfcccf62b3c646980dd283848e33a8134 (diff) | |
general refactoring, prepare breakout game
Diffstat (limited to 'src/games/minesweeper')
| -rw-r--r-- | src/games/minesweeper/Minesweeper.cpp | 18 | ||||
| -rw-r--r-- | src/games/minesweeper/Minesweeper.hpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/games/minesweeper/Minesweeper.cpp b/src/games/minesweeper/Minesweeper.cpp index 8e27eb3..1f40b33 100644 --- a/src/games/minesweeper/Minesweeper.cpp +++ b/src/games/minesweeper/Minesweeper.cpp @@ -156,6 +156,7 @@ Minesweeper::ProcessEventDuringPause(SDL_Event &event) m_run_state = resume; } } break; + default:; } } @@ -170,9 +171,9 @@ Minesweeper::ProcessEventDuringResume(SDL_Event &event) } } break; - case SDL_EVENT_MOUSE_BUTTON_DOWN: { - V2F32 click_screen_pos = {event.button.x, (float)g_renderer.m_screen_h-1 - event.button.y}; - V2F32 click_view_pos = ScreenPosToViewPos(click_screen_pos); + case SDL_EVENT_MOUSE_BUTTON_DOWN: { + V2F32 click_screen_pos = {event.button.x, (float)g_renderer.m_screen_h-1 - event.button.y}; + V2F32 click_view_pos = ScreenPosToViewPos(click_screen_pos); float x_adjusted = click_view_pos.x - m_grid_pos.x; float y_adjusted = click_view_pos.y - m_grid_pos.y; @@ -371,7 +372,7 @@ Minesweeper::DrawBoard() m_grid_pos.x + (float)x * m_cell_outer_size.x, m_grid_pos.y + (float)y * m_cell_outer_size.y, }; - RectF32 cell_rect = { + Rectangle cell_rect = { cell_pos.x, cell_pos.y, cell_pos.x + m_cell_inner_size.x, cell_pos.y + m_cell_inner_size.y }; @@ -390,7 +391,7 @@ Minesweeper::DrawBoard() cell_pos.y + flag_offset.y, 1.0f }; - RectF32 flag_rect = { + Rectangle flag_rect = { flag_pos.x, flag_pos.y, flag_pos.x + flag_size.x, @@ -406,7 +407,7 @@ Minesweeper::DrawBoard() cell_pos.y, 1.0f }; - RectF32 mine_rect = { + Rectangle mine_rect = { mine_pos.x, mine_pos.y, mine_pos.x + m_cell_inner_size.x, @@ -426,10 +427,9 @@ Minesweeper::DrawBoard() }; size_t mine_count_val = (size_t)m_adjacent_mine_counts[y*m_grid_width + x]; g_renderer.PushMonoBitmap( + m_digit_glyphs[mine_count_val].bitmap, mine_count_pos, - m_digit_glyphs[mine_count_val].bitmap.width, - m_digit_glyphs[mine_count_val].bitmap.height, - m_digit_glyphs[mine_count_val].bitmap.pixels.get()); + Color{0.0f, 0.0f, 0.0f, 0.0f}); } } } diff --git a/src/games/minesweeper/Minesweeper.hpp b/src/games/minesweeper/Minesweeper.hpp index b90f4a3..c0bae7a 100644 --- a/src/games/minesweeper/Minesweeper.hpp +++ b/src/games/minesweeper/Minesweeper.hpp @@ -1,7 +1,7 @@ #pragma once #include <games/Game.hpp> -#include <basic/math.hpp> +#include <common/math.hpp> #include <common/Font.hpp> #include <array> |