Apply review comments

Gymnasiast · Jan 19, 2025 · 31e686f · 31e686f
1 parent ad71943
commit 31e686f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 26 deletions.
diff --git a/src/openrct2/drawing/ImageId.hpp b/src/openrct2/drawing/ImageId.hpp
@@ -42,24 +42,9 @@ FilterPaletteID GetGlassPaletteId(colour_t);
 struct ImageId
 {
 private:
-    // clang-format off
-    static constexpr uint32_t kMaskIndex       = 0b00000000000001111111111111111111;
-    static constexpr uint32_t kMaskRemap       = 0b00000111111110000000000000000000;
-    static constexpr uint32_t kMaskPrimary     = 0b00000000111110000000000000000000;
-    static constexpr uint32_t kMaskSecondary   = 0b00011111000000000000000000000000;
-    static constexpr uint32_t kFlagPrimary     = 0b00100000000000000000000000000000;
-    static constexpr uint32_t kFlagBlend       = 0b01000000000000000000000000000000;
-    static constexpr uint32_t kFlagSecondary   = 0b10000000000000000000000000000000;
-    static constexpr uint32_t kShiftRemap      = 19;
-    static constexpr uint32_t kShiftPrimary    = 19;
-    static constexpr uint32_t kShiftSecondary  = 24;
-    static constexpr uint32_t kIndexUndefined  = 0b00000000000001111111111111111111;
-    static constexpr uint32_t kValueUndefined  = kIndexUndefined;
-
-    static constexpr uint8_t  kNewFlagPrimary      = 1;
-    static constexpr uint8_t  kNewFlagBlend        = 2;
-    static constexpr uint8_t  kNewFlagSecondary    = 4;
-    // clang-format on
+    static constexpr uint8_t kNewFlagPrimary = 1;
+    static constexpr uint8_t kNewFlagBlend = 2;
+    static constexpr uint8_t kNewFlagSecondary = 4;
 
     // NONE = No remap
     // BLENDED = No source copy, remap destination only (glass)

diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp
@@ -40,7 +40,7 @@ static constexpr uint8_t kDuckAnimationFlyToWater[] =
     8, 9, 10, 11, 12, 13
 };
 
-static constexpr uint8_t kkDuckAnimationswim[] =
+static constexpr uint8_t kDuckAnimationSwim[] =
 {
     0
 };
@@ -63,11 +63,11 @@ static constexpr uint8_t kDuckAnimationFlyAway[] =
 // clang-format on
 
 static constexpr const uint8_t* kDuckAnimations[] = {
-    kDuckAnimationFlyToWater,  //  DuckStae::FlyToWater,
-    kkDuckAnimationswim,       //  DuckStae::Swim,
-    kDuckAnimationDrink,       //  DuckStae::Drink,
-    kDuckAnimationDoubleDrink, //  DuckStae::DoubleDrink,
-    kDuckAnimationFlyAway,     //  DuckStae::FlyAway,
+    kDuckAnimationFlyToWater,  //  DuckState::FlyToWater,
+    kDuckAnimationSwim,        //  DuckState::Swim,
+    kDuckAnimationDrink,       //  DuckState::Drink,
+    kDuckAnimationDoubleDrink, //  DuckState::DoubleDrink,
+    kDuckAnimationFlyAway,     //  DuckState::FlyAway,
 };
 
 template<>

diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
@@ -1539,7 +1539,7 @@ void Peep::FormatActionTo(Formatter& ft) const
             ft.Add<StringId>(STR_WATERING_GARDENS);
             break;
         case PeepState::EmptyingBin:
-            ft.Add<StringId>(kStringIdEmptyING_LITTER_BIN);
+            ft.Add<StringId>(STR_EMPTYING_LITTER_BIN);
             break;
         case PeepState::Answering:
             if (SubState == 0)

diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h
@@ -359,7 +359,7 @@ enum : StringId
     STR_SELECT_LOCATION = 1439,
     STR_MOWING_GRASS = 1440,
     STR_SWEEPING_FOOTPATH = 1441,
-    kStringIdEmptyING_LITTER_BIN = 1442,
+    STR_EMPTYING_LITTER_BIN = 1442,
     STR_WATERING_GARDENS = 1443,
     STR_WATCHING_RIDE = 1444,
     STR_WATCHING_CONSTRUCTION_OF = 1445,