tetris: use unscoped enums in Tetromino class

1 files changed, 9 insertions, 10 deletions

diff --git a/src/games/tetris/Tetromino.cpp b/src/games/tetris/Tetromino.cpp
index 78ac68d..a77fa57 100644
--- a/src/games/tetris/Tetromino.cpp
+++ b/src/games/tetris/Tetromino.cpp
@@ -57,8 +57,8 @@ static const uint16_t s_left_aligned_bitmaps[7][4][4] = {
 };
 
 
-TetrominoId Tetromino::GetRandomId() {
-    static std::uniform_int_distribution<int> s_Dist(0, (int)TetrominoId::TETROMINO_ID_COUNT-1);
+Tetromino::TetrominoId Tetromino::GetRandomId() {
+    static std::uniform_int_distribution<int> s_Dist(0, tetromino_id_count-1);
     static std::mt19937 s_Rng((std::random_device()()));
     TetrominoId id = static_cast<TetrominoId>(s_Dist(s_Rng));
     return id;
@@ -77,7 +77,7 @@ Tetromino::Tetromino(Board &board) :
 {
 }
 
-TetrominoId Tetromino::GetId() {
+Tetromino::TetrominoId Tetromino::GetId() {
     return m_Id;
 }
 
@@ -95,8 +95,7 @@ bool Tetromino::IsCollisionWithBoard() {
 }
 
 void Tetromino::MaybeRotate(TetrominoRotation rotation) {
-    int32_t rot = static_cast<int32_t>(rotation);
-    int32_t ori = (m_Ori + rot) % 4;
+    int32_t ori = (m_Ori + rotation) % 4;
     if (!IsCollisionWithBoard(m_Id, m_Pos, ori, m_BoardBitmap)) {
         m_Ori = ori;
     }
@@ -158,14 +157,14 @@ Color Tetromino::GetColor(TetrominoId id) {
 
     Color color;
     switch (id) {
-        case TETROMINO_I:
-        case TETROMINO_O:
-        case TETROMINO_T: {
+        case i_piece:
+        case o_piece:
+        case t_piece: {
             color = {0.8f, 0.8f, 0.8f, 1.0f};
         } break;
 
-        case TETROMINO_J:
-        case TETROMINO_S: {
+        case j_piece:
+        case s_piece: {
             color = {0.8f, 0.2f, 0.2f, 1.0f};
         } break;