diff options
author | metamuffin <metamuffin@disroot.org> | 2024-07-12 01:32:21 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-07-12 01:32:21 +0200 |
commit | d8953b2748f88505ef71dba2a10b9ccca81e26ba (patch) | |
tree | 40f69fcff2c1763f9bd989f1e9bd260e8d5c243f /client/menu/popup_message.gd | |
parent | 55d3fd0c7ead5c47a3fbf63463b70af328e7dcc9 (diff) | |
parent | 60e825cbbaa56493d3a216efbda0e4e987fe17e8 (diff) | |
download | hurrycurry-d8953b2748f88505ef71dba2a10b9ccca81e26ba.tar hurrycurry-d8953b2748f88505ef71dba2a10b9ccca81e26ba.tar.bz2 hurrycurry-d8953b2748f88505ef71dba2a10b9ccca81e26ba.tar.zst |
Merge branch 'master' of https://codeberg.org/hurrycurry/hurrycurry
Diffstat (limited to 'client/menu/popup_message.gd')
-rw-r--r-- | client/menu/popup_message.gd | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/client/menu/popup_message.gd b/client/menu/popup_message.gd index e70e1fef..d37343c3 100644 --- a/client/menu/popup_message.gd +++ b/client/menu/popup_message.gd @@ -84,9 +84,11 @@ func _on_reset_timeout(): if not Global.get_profile("has_reset") and not Global.get_setting("touch_controls"): display_hint_msg(tr("Press %s to reset the camera view") % display_keybind("R", "Y")) -func display_keybind(keyboard: String, joypad: String) -> String: +func display_keybind(keyboard: String, joypad: String, touch = null) -> String: if Global.using_joypad: return joypad + " (Joypad)" + if touch != null: + return touch return keyboard func any_action_just_pressed(actions: Array) -> bool: @@ -95,3 +97,6 @@ func any_action_just_pressed(actions: Array) -> bool: return true return false +func _on_rotate_camera_timeout(): + if not Global.get_setting("has_rotated") and not Global.get_setting("touch_controls"): + display_hint_msg(tr("Use %s to reset the camera view") % display_keybind(tr("arrow keys"), tr("right stick"))) |