minor cleanup

zsrtp · Aug 1, 2024 · 69fc032 · 69fc032
1 parent 83fc7a4
commit 69fc032
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/modules/menus/menu_actor_list/include/actor_list_menu.h b/modules/menus/menu_actor_list/include/actor_list_menu.h
@@ -37,7 +37,7 @@ class ActorListMenu : public Menu {
 private:
     void updateActorData();
     template <typename T>
-    void updateValue(T*, bool, bool, bool);
+    void updateValue(T*, bool);
     void loadActorName();
     void checkAndCloseMenu();
     void checkAndRestoreMenu();

diff --git a/modules/menus/menu_actor_list/src/actor_list_menu.cpp b/modules/menus/menu_actor_list/src/actor_list_menu.cpp
@@ -145,16 +145,19 @@ ActorListMenu::~ActorListMenu() {
 }
 
 template <typename T>
-void ActorListMenu::updateValue(T* value, bool increase, bool slowIncrement, bool largeIncrement) {
+void ActorListMenu::updateValue(T* value, bool increase) {
     if (value != NULL) {
+        bool slowBtnPressed = GZ_getButtonPressed(SLOW_INC_BTN);
+        bool fastBtnPressed = GZ_getButtonPressed(FAST_INC_BTN);
+
         f32 smallChange = 1.0f;
         f32 mediumChange = 100.0f; 
         f32 largeChange = 1000.0f;
 
         f32 change;
-        if (largeIncrement) {
+        if (fastBtnPressed) {
             change = largeChange;
-        } else if (slowIncrement) {
+        } else if (slowBtnPressed) {
             change = smallChange;
         } else {
             change = mediumChange;
@@ -201,11 +204,7 @@ void ActorListMenu::draw() {
 
     bool rightPressed = GZ_getButtonRepeat(CONTROLLER_RIGHT,1);
     bool leftPressed = GZ_getButtonRepeat(CONTROLLER_LEFT,1);
-    bool slowBtnPressed = GZ_getButtonPressed(SLOW_INC_BTN);
-    bool fastBtnPressed = GZ_getButtonPressed(FAST_INC_BTN);
-
-    // f32 smallPosChange = 1.0f, mediumPosChange = 10.0f, largePosChange = 100.0f;
-    // int smallAngleChange = 1, mediumAngleChange = 10, largeAngleChange = 100;
+
 
     switch (cursor.y) {
     case ACTOR_NAME_INDEX:
@@ -253,32 +252,32 @@ void ActorListMenu::draw() {
         break;
     case ACTOR_POSITION_X_INDEX:
         if (rightPressed || leftPressed) {
-            updateValue(&g_currentActor->current.pos.x, rightPressed, slowBtnPressed, fastBtnPressed);
+            updateValue(&g_currentActor->current.pos.x, rightPressed);
         }
         break;
     case ACTOR_POSITION_Y_INDEX:
         if (rightPressed || leftPressed) {
-            updateValue(&g_currentActor->current.pos.y, rightPressed, slowBtnPressed, fastBtnPressed);
+            updateValue(&g_currentActor->current.pos.y, rightPressed);
         }
         break;
     case ACTOR_POSITION_Z_INDEX:
         if (rightPressed || leftPressed) {
-            updateValue(&g_currentActor->current.pos.z, rightPressed, slowBtnPressed, fastBtnPressed);
+            updateValue(&g_currentActor->current.pos.z, rightPressed);
         }
         break;
     case ACTOR_ANGLE_X_INDEX:
         if (rightPressed || leftPressed) {
-            updateValue(&g_currentActor->shape_angle.x, rightPressed, slowBtnPressed, fastBtnPressed);
+            updateValue(&g_currentActor->shape_angle.x, rightPressed);
         }
         break;
     case ACTOR_ANGLE_Y_INDEX:
         if (rightPressed || leftPressed) {
-            updateValue(&g_currentActor->shape_angle.y, rightPressed, slowBtnPressed, fastBtnPressed);
+            updateValue(&g_currentActor->shape_angle.y, rightPressed);
         }
         break;
     case ACTOR_ANGLE_Z_INDEX:
         if (rightPressed || leftPressed) {
-            updateValue(&g_currentActor->shape_angle.z, rightPressed, slowBtnPressed, fastBtnPressed);
+            updateValue(&g_currentActor->shape_angle.z, rightPressed);
         }
         break;
     case ACTOR_PROC_INDEX:

diff --git a/modules/menus/menu_checkers/src/checkers_menu.cpp b/modules/menus/menu_checkers/src/checkers_menu.cpp
@@ -1,12 +1,4 @@
 #include "menus/menu_checkers/include/checkers_menu.h"
-#include <cstdio>
-#include "commands.h"
-#include "global_data.h"
-#include "timer.h"
-#include "libtp_c/include/d/com/d_com_inf_game.h"
-#include "gz_flags.h"
-#include "rels/include/defines.h"
-#include "rels/include/defines.h"
 #include "menus/utils/menu_mgr.h"
 
 const char l_descTemplates[CHECKERS_COUNT][100] = {

diff --git a/modules/menus/menu_tools/src/tools_menu.cpp b/modules/menus/menu_tools/src/tools_menu.cpp
@@ -6,7 +6,6 @@
 #include "libtp_c/include/d/com/d_com_inf_game.h"
 #include "gz_flags.h"
 #include "rels/include/defines.h"
-#include "rels/include/defines.h"
 #include "menus/utils/menu_mgr.h"
 
 #ifdef GCN_PLATFORM