From 8c51dcbd75679197adf7bc62fa97952368442c55 Mon Sep 17 00:00:00 2001 From: grorp Date: Thu, 27 Feb 2025 18:31:21 -0500 Subject: [PATCH] Try to fix CI --- builtin/settingtypes.txt | 2 +- src/gui/touchscreenlayout.cpp | 4 ++-- src/gui/touchscreenlayout.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 80483cf5b5b17..535878d253795 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -161,7 +161,7 @@ invert_hotbar_mouse_wheel (Hotbar: Invert mouse wheel direction) bool false touch_controls (Touchscreen controls) enum auto auto,true,false # The kind of digging/placing controls used. -# +# # * Tap # Long/short tap anywhere on the screen to interact. # Interaction happens at finger position. diff --git a/src/gui/touchscreenlayout.cpp b/src/gui/touchscreenlayout.cpp index 8f5dd12180b4b..6e977f8b0aad3 100644 --- a/src/gui/touchscreenlayout.cpp +++ b/src/gui/touchscreenlayout.cpp @@ -14,7 +14,7 @@ #include "IGUIStaticText.h" #include "util/enum_string.h" -const struct EnumString es_TouchInteractionStyle[] = +struct EnumString es_TouchInteractionStyle[] = { {TAP, "tap"}, {TAP_CROSSHAIR, "tap_crosshair"}, @@ -354,7 +354,7 @@ ButtonLayout::ButtonMap ButtonLayout::deserializeJson(std::istream &is) if (version < 1) { // Version 0 did not have dig/place buttons, so add them in. // Otherwise, the missing buttons would cause confusion if the user - // switches to "touch_interaction_style = buttons_crosshair". + // switches to "touch_interaction_style = buttons_crosshair". // This may result in overlapping buttons (could be fixed by resolving // collisions in postProcessLoaded). data.emplace(dig_id, default_data.at(dig_id)); diff --git a/src/gui/touchscreenlayout.h b/src/gui/touchscreenlayout.h index d0cb3e848a494..2fde5ac35f441 100644 --- a/src/gui/touchscreenlayout.h +++ b/src/gui/touchscreenlayout.h @@ -27,7 +27,7 @@ enum TouchInteractionStyle : u8 TAP_CROSSHAIR, BUTTONS_CROSSHAIR, }; -extern const EnumString es_TouchInteractionStyle[]; +extern EnumString es_TouchInteractionStyle[]; enum touch_gui_button_id : u8 {