Replace all uses of core::list with std::list (#12313)

[dragonfireclient.git] / src / gui / touchscreengui.h

diff --git a/src/gui/touchscreengui.h b/src/gui/touchscreengui.h
index 0349624fac6d98895565f8e82c9ccaf2738d2087..6b36c0d599eaab0ed34eb357acc90bdcbe600a77 100644 (file)
--- a/src/gui/touchscreengui.h
+++ b/src/gui/touchscreengui.h
@@ -39,7 +39,7 @@ typedef enum
        jump_id = 0,
        crunch_id,
        zoom_id,
-       special1_id,
+       aux1_id,
        after_last_element_id,
        settings_starter_id,
        rare_controls_starter_id,
@@ -69,7 +69,7 @@ typedef enum
        j_backward,
        j_left,
        j_right,
-       j_special1
+       j_aux1
 } touch_gui_joystick_move_id;
 
 typedef enum
@@ -217,7 +217,7 @@ class TouchScreenGUI
 
        // forward, backward, left, right
        touch_gui_button_id m_joystick_names[5] = {
-                       forward_id, backward_id, left_id, right_id, special1_id};
+                       forward_id, backward_id, left_id, right_id, aux1_id};
        bool m_joystick_status[5] = {false, false, false, false, false};
 
        /*
@@ -228,16 +228,18 @@ class TouchScreenGUI
         */
        line3d<f32> m_shootline;
 
-       int m_move_id = -1;
+       bool m_has_move_id = false;
+       size_t m_move_id;
        bool m_move_has_really_moved = false;
        u64 m_move_downtime = 0;
        bool m_move_sent_as_mouse_event = false;
        v2s32 m_move_downlocation = v2s32(-10000, -10000);
 
-       int m_joystick_id = -1;
+       bool m_has_joystick_id = false;
+       size_t m_joystick_id;
        bool m_joystick_has_really_moved = false;
        bool m_fixed_joystick = false;
-       bool m_joystick_triggers_special1 = false;
+       bool m_joystick_triggers_aux1 = false;
        button_info *m_joystick_btn_off = nullptr;
        button_info *m_joystick_btn_bg = nullptr;
        button_info *m_joystick_btn_center = nullptr;