1 files changed, 7 insertions, 7 deletions

diff --git a/src/games/tetris/Board.cpp b/src/games/tetris/Board.cpp
index 2230ee5..87a0e22 100644
--- a/src/games/tetris/Board.cpp
+++ b/src/games/tetris/Board.cpp
@@ -12,14 +12,14 @@ Board::Board() {
 
     for (int y = 0; y < 22; y++) {
         for (int x = 0; x < 10; x++) {
-            m_Idmap[y][x] = (uint8_t)TetrominoId::TETROMINO_ID_NONE;
+            m_Idmap[y][x] = Tetromino::tetromino_id_none;
         }
     }
 }
 
 int32_t Board::PlaceTetromino(Tetromino &tetromino) {
     BoardPos pos = tetromino.GetPos();
-    TetrominoId id = tetromino.GetId();
+    Tetromino::TetrominoId id = tetromino.GetId();
     uint16_t tetromino_bitmap[4];
     tetromino.GetBitmap(tetromino_bitmap);
 
@@ -44,7 +44,7 @@ int32_t Board::PlaceTetromino(Tetromino &tetromino) {
             if (tetromino_bitmap[y] & bitmap_x) {
                 int32_t idmap_x = pos.x + x - 3;
                 int32_t idmap_y = pos.y + y - 2;
-                m_Idmap[idmap_y][idmap_x] = static_cast<uint8_t>(id);
+                m_Idmap[idmap_y][idmap_x] = id;
             }
         }
     }
@@ -77,7 +77,7 @@ int32_t Board::ClearRows(int32_t y0) {
     }
     for (int32_t y = 24-rows_cleared; y < 24; y++) {
         m_Bitmap[y] = 0xe007;
-        std::fill(m_Idmap[y-2], m_Idmap[y-2] + 10, (uint8_t)TetrominoId::TETROMINO_ID_NONE);
+        std::fill(m_Idmap[y-2], m_Idmap[y-2] + 10, Tetromino::tetromino_id_none);
     }
 
 
@@ -119,8 +119,8 @@ void Board::Draw(int32_t level, RenderGroup& render_group) {
     // tetromino parts
     for (size_t y = 0; y < 20; y++) {
         for (size_t x = 0; x < 10; x++) {
-            uint8_t tetromino_id = m_Idmap[y][x];
-            if (tetromino_id < (uint8_t)TetrominoId::TETROMINO_ID_COUNT) {
+            Tetromino::TetrominoId tetromino_id = (Tetromino::TetrominoId)m_Idmap[y][x];
+            if (tetromino_id < Tetromino::tetromino_id_count) {
                 V2F32 local_pos = {
                     (float)x * tetromino_size_with_border + tetromino_offset,
                     (float)y * tetromino_size_with_border + tetromino_offset
@@ -142,7 +142,7 @@ void Board::Draw(int32_t level, RenderGroup& render_group) {
                 };
 
 
-                Color color = Tetromino::GetColor(static_cast<TetrominoId>(tetromino_id));
+                Color color = Tetromino::GetColor(tetromino_id);
                 render_group.PushRectangle(world_rect, world_pos.z, color);
             }
         }