ui/requester: add option to allow requester wraparound

This allows the up or down input key to be held in requesters and the
UI will wrap around to the top/bottom.

src/libtrx/config/map_tr1.def

@@ -122,6 +122,7 @@ CFG_BOOL(g_Config, visuals.enable_skybox, true)
 CFG_BOOL(g_Config, visuals.enable_ps1_crystals, true)
 CFG_BOOL(g_Config, ui.enable_game_ui, true)
 CFG_BOOL(g_Config, ui.enable_photo_mode_ui, true)
+CFG_BOOL(g_Config, ui.enable_wraparound, true)
 CFG_BOOL(g_Config, gameplay.enable_item_examining, true)
 CFG_BOOL(g_Config, gameplay.enable_auto_item_selection, true)
 CFG_BOOL(g_Config, gameplay.enable_pickup_aids, false)

src/libtrx/config/map_tr2.def

@@ -32,6 +32,7 @@ CFG_RGB888(g_Config, visuals.water_color, 0x80, 0xDF, 0xFF)
 CFG_DOUBLE(g_Config, ui.text_scale, 1.0)
 CFG_DOUBLE(g_Config, ui.bar_scale, 1.0)
 CFG_BOOL(g_Config, ui.enable_photo_mode_ui, true)
+CFG_BOOL(g_Config, ui.enable_wraparound, true)
 CFG_INT32(g_Config, rendering.fps, 60)
 CFG_ENUM(g_Config, rendering.screenshot_format, SCREENSHOT_FORMAT_JPEG, SCREENSHOT_FORMAT)
 CFG_ENUM(g_Config, rendering.render_mode, RM_HARDWARE, RENDER_MODE)

src/libtrx/game/ui/elements/requester.c

@@ -1,5 +1,6 @@
 #include "game/ui/elements/requester.h"
 
+#include "config.h"
 #include "game/input.h"
 #include "game/ui/elements/frame.h"
 #include "game/ui/elements/pad.h"
@@ -27,10 +28,18 @@ void UI_Requester_Free(UI_REQUESTER_STATE *const s)
 int32_t UI_Requester_Control(UI_REQUESTER_STATE *const s)
 {
     if (s->is_selectable) {
-        if (g_InputDB.menu_down && s->sel_row + 1 < s->max_rows) {
-            s->sel_row++;
-        } else if (g_InputDB.menu_up && s->sel_row > 0) {
-            s->sel_row--;
+        if (g_InputDB.menu_down) {
+            if (s->sel_row + 1 < s->max_rows) {
+                s->sel_row++;
+            } else if (g_Config.ui.enable_wraparound) {
+                s->sel_row = 0;
+            }
+        } else if (g_InputDB.menu_up) {
+            if (s->sel_row > 0) {
+                s->sel_row--;
+            } else if (g_Config.ui.enable_wraparound) {
+                s->sel_row = s->max_rows - 1;
+            }
         }
     }
 

src/libtrx/include/libtrx/config/types_tr1.h

@@ -98,6 +98,7 @@ typedef struct {
     struct {
         bool enable_game_ui;
         bool enable_photo_mode_ui;
+        bool enable_wraparound;
         double text_scale;
         double bar_scale;
         UI_STYLE menu_style;

src/libtrx/include/libtrx/config/types_tr2.h

@@ -60,6 +60,7 @@ typedef struct {
 
     struct {
         bool enable_photo_mode_ui;
+        bool enable_wraparound;
         double text_scale;
         double bar_scale;
     } ui;