From c62b2c0913545f5e19d9d1c33202d721ebeeb93d Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 25 Aug 2024 00:12:57 -0400
Subject: [PATCH] Refactor OverworldEditor to use uint for loop counters in
 RefreshTile16Blockset method

---
 src/app/editor/overworld/entity.cc  | 9 +++++----
 src/app/editor/overworld/refresh.cc | 4 ++--
 src/test/yaze_test.cc               | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/editor/overworld/entity.cc b/src/app/editor/overworld/entity.cc
index 77152b43..90c2d79b 100644
--- a/src/app/editor/overworld/entity.cc
+++ b/src/app/editor/overworld/entity.cc
@@ -59,7 +59,8 @@ void HandleEntityDragging(zelda3::GameEntity *entity, ImVec2 canvas_p0,
   std::string entity_type = "Entity";
   if (entity->entity_type_ == zelda3::GameEntity::EntityType::kExit) {
     entity_type = "Exit";
-  } else if (entity->entity_type_ == zelda3::GameEntity::EntityType::kEntrance) {
+  } else if (entity->entity_type_ ==
+             zelda3::GameEntity::EntityType::kEntrance) {
     entity_type = "Entrance";
   } else if (entity->entity_type_ == zelda3::GameEntity::EntityType::kSprite) {
     entity_type = "Sprite";
@@ -310,11 +311,11 @@ bool DrawExitEditorPopup(zelda3::overworld::OverworldExit &exit) {
 void DrawItemInsertPopup() {
   // Contents of the Context Menu
   if (ImGui::BeginPopup("Item Inserter")) {
-    static int new_item_id = 0;
+    static size_t new_item_id = 0;
     Text("Add Item");
     BeginChild("ScrollRegion", ImVec2(150, 150), true,
                ImGuiWindowFlags_AlwaysVerticalScrollbar);
-    for (int i = 0; i < zelda3::overworld::kSecretItemNames.size(); i++) {
+    for (size_t i = 0; i < zelda3::overworld::kSecretItemNames.size(); i++) {
       if (Selectable(zelda3::overworld::kSecretItemNames[i].c_str(),
                      i == new_item_id)) {
         new_item_id = i;
@@ -348,7 +349,7 @@ bool DrawItemEditorPopup(zelda3::overworld::OverworldItem &item) {
     BeginChild("ScrollRegion", ImVec2(150, 150), true,
                ImGuiWindowFlags_AlwaysVerticalScrollbar);
     ImGui::BeginGroup();
-    for (int i = 0; i < zelda3::overworld::kSecretItemNames.size(); i++) {
+    for (size_t i = 0; i < zelda3::overworld::kSecretItemNames.size(); i++) {
       if (Selectable(zelda3::overworld::kSecretItemNames[i].c_str(),
                      item.id_ == i)) {
         item.id_ = i;
diff --git a/src/app/editor/overworld/refresh.cc b/src/app/editor/overworld/refresh.cc
index 5d2979d9..f3675944 100644
--- a/src/app/editor/overworld/refresh.cc
+++ b/src/app/editor/overworld/refresh.cc
@@ -117,7 +117,7 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
 
   std::vector<std::future<void>> futures;
   // Loop through the tiles and copy their pixel data into separate vectors
-  for (int i = 0; i < kNumTile16Individual; i++) {
+  for (uint i = 0; i < kNumTile16Individual; i++) {
     futures.push_back(std::async(
         std::launch::async,
         [&](int index) {
@@ -141,7 +141,7 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
   }
 
   // Render the bitmaps of each tile.
-  for (int id = 0; id < kNumTile16Individual; id++) {
+  for (uint id = 0; id < kNumTile16Individual; id++) {
     RETURN_IF_ERROR(tile16_individual_[id].ApplyPalette(palette_));
     Renderer::GetInstance().UpdateBitmap(&tile16_individual_[id]);
   }
diff --git a/src/test/yaze_test.cc b/src/test/yaze_test.cc
index 2a4d589a..6af9636a 100644
--- a/src/test/yaze_test.cc
+++ b/src/test/yaze_test.cc
@@ -12,7 +12,7 @@
 namespace yaze {
 namespace test {
 
-TEST(YazeCLibTest, InitializeAndCleanup) {
+TEST(YazeTest, InitializeAndCleanup) {
   yaze_flags flags;
   yaze_init(&flags);
   yaze_cleanup(&flags);