Skip to content

Commit 815def4

Browse files
authored
Merge pull request #230 from Vladislav4KZ/move-indicator-fix
fix: restore touch move indicator after closing menus
2 parents 86187fc + 3cec0b9 commit 815def4

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

3rdparty/cs16client-extras/touch/customcmd.cfg

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ if $ui_language = russian // Russian
1919
:set _menu_txt_exit "Выход"
2020

2121
// Cvars
22-
set touch_indicator_value "$touch_move_indicator" ;if "$touch_move_indicator > 0";:set touch_move_indicator 0
22+
if $_menu_opened <= 0
23+
:set touch_indicator_value "$touch_move_indicator"
24+
set _menu_opened 1
25+
if "$touch_move_indicator > 0"
26+
:set touch_move_indicator 0
2327
set _menu_stroke 1 156 77 20 200 ;touch_set_stroke $_menu_stroke
2428
set _menu_sel_bg "156 77 20 180"
2529
set _menu_bg "0 0 0 180"
@@ -30,7 +34,7 @@ set _menu_click_cnd media/launch_select1.wav
3034
set _menu_click_cnd_back media/launch_upmenu1.wav
3135
set _menu_vibrate_value 30
3236
// Alias commands
33-
alias _erase_frame "touch_removebutton _menu_*; touch_setclientonly 0; set touch_move_indicator $touch_indicator_value; unalias _erase_frame"
37+
alias _erase_frame "touch_removebutton _menu_*; touch_setclientonly 0; set touch_move_indicator $touch_indicator_value; set _menu_opened 0; unalias _erase_frame"
3438
alias _reset_menu "touch_removebutton _menu_*; touch_setclientonly 0"
3539
alias _click_cnd "play $_menu_click_cnd ; vibrate $_menu_vibrate_value"
3640
alias _click_cnd_back "play $_menu_click_cnd_back ; vibrate $_menu_vibrate_value"
@@ -39,9 +43,9 @@ alias _closemenu_3 "touch_removebutton _menu_*_my_menu-3-*; touch_removebutton _
3943
alias _closemenu_4 "touch_removebutton _menu_*_my_menu-4-*; touch_removebutton _menu_*_my_menu-5-*; alias _closemenu_4 \"\""
4044
alias _closemenu_5 "touch_removebutton _menu_*_my_menu-5-*; alias _closemenu_5 \"\""
4145
// Movement buttons
42-
if $menu_move_enable >= 1 // Enable/Disable _menu_move when value=1 or hinger
46+
if $menu_move_enable >= 1 // Enable/Disable _menu_move when value=1 or higher
4347
:touch_addbutton "_menu_move" "" "_move" 0 0.1 0.5 1 0 0 0 0 6
44-
if $menu_look_enable >= 1 // Enable/Disable _menu_look when value=1 or hinger
48+
if $menu_look_enable >= 1 // Enable/Disable _menu_look when value=1 or higher
4549
:touch_addbutton "_menu_look" "" "_look" 0.5 0 1 1 0 0 0 0 6
4650
// Coordinates and closemenu for each level
4751
if $_menu_level = 1

3rdparty/cs16client-extras/userconfig.d/touch_defalias.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ alias scoreboard "exec touch/scoreboard.cfg"
3434
// SET CVARS FOR MENU
3535
set enable_controls "0"
3636
set bot_quota_value "9"
37+
set _menu_opened "0"

0 commit comments

Comments
 (0)