Skip to content

Commit

Permalink
Try to fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
grorp committed Feb 27, 2025
1 parent 2629029 commit 8c51dcb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion builtin/settingtypes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/gui/touchscreenlayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/gui/touchscreenlayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down

0 comments on commit 8c51dcb

Please sign in to comment.