Merge pull request #92 from Vladislav4KZ/touch-menus-fix

touch: fix: wait 2 frames, then close menu after command execution
Velaron · Aug 15, 2024 · 2395c66 · 2395c66
2 parents 8879e77 + 3ee25a9
commit 2395c66
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/3rdparty/cs16client-extras/touch/buy_item_ct.cfg b/3rdparty/cs16client-extras/touch/buy_item_ct.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot7 "_click; _menu_none; touch_setcolor _menu_slot7 255 174
 alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed shield"
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_item_t.cfg b/3rdparty/cs16client-extras/touch/buy_item_t.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot6 "_click; _menu_none; touch_setcolor _menu_slot6 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_machinegun_ct.cfg b/3rdparty/cs16client-extras/touch/buy_machinegun_ct.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot1 "_click; _menu_none; touch_setcolor _menu_slot1 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_machinegun_t.cfg b/3rdparty/cs16client-extras/touch/buy_machinegun_t.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot1 "_click; _menu_none; touch_setcolor _menu_slot1 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_pistol_ct.cfg b/3rdparty/cs16client-extras/touch/buy_pistol_ct.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot5 "_click; _menu_none; touch_setcolor _menu_slot5 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed shield"
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_pistol_t.cfg b/3rdparty/cs16client-extras/touch/buy_pistol_t.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot5 "_click; _menu_none; touch_setcolor _menu_slot5 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed shield"
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_rifle_ct.cfg b/3rdparty/cs16client-extras/touch/buy_rifle_ct.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot6 "_click; _menu_none; touch_setcolor _menu_slot6 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_rifle_t.cfg b/3rdparty/cs16client-extras/touch/buy_rifle_t.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot6 "_click; _menu_none; touch_setcolor _menu_slot6 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_shotgun_ct.cfg b/3rdparty/cs16client-extras/touch/buy_shotgun_ct.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot2 "_click; _menu_none; touch_setcolor _menu_slot2 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_shotgun_t.cfg b/3rdparty/cs16client-extras/touch/buy_shotgun_t.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot2 "_click; _menu_none; touch_setcolor _menu_slot2 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_submachinegun_ct.cfg b/3rdparty/cs16client-extras/touch/buy_submachinegun_ct.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot4 "_click; _menu_none; touch_setcolor _menu_slot4 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/buy_submachinegun_t.cfg b/3rdparty/cs16client-extras/touch/buy_submachinegun_t.cfg
@@ -107,7 +107,7 @@ alias _menu_select_slot4 "_click; _menu_none; touch_setcolor _menu_slot4 255 174
 //alias _menu_select_slot8 "_click; _menu_none; touch_setcolor _menu_slot8 255 174 0 150; touch_show _menu_frame_icn_class8; touch_show _menu_frame_txt_data1; touch_show _menu_frame_txt_desc8; if $cscl_currentmoney >= $_menu_money_item8;:_menu_show_confirm ; alias _menu_confirmed "
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
 
 if $cscl_currentmoney >= 0
 :

diff --git a/3rdparty/cs16client-extras/touch/chooseteam.cfg b/3rdparty/cs16client-extras/touch/chooseteam.cfg
@@ -62,19 +62,19 @@ alias +menu_slot0 "_click; touch_setcolor _menu_slot0 255 174 0 150"
 alias -menu_slot0 "touch_setcolor _menu_slot0 0 0 0 150; slot10; _erase_frame"
 
 alias +menu_slot1 "_click; touch_setcolor _menu_slot1 255 174 0 150"
-alias -menu_slot1 "touch_setcolor _menu_slot1 0 0 0 150; _erase_frame; jointeam 1"
+alias -menu_slot1 "touch_setcolor _menu_slot1 0 0 0 150; jointeam 1; wait; wait; _erase_frame"
 
 alias +menu_slot2 "_click; touch_setcolor _menu_slot2 255 174 0 150"
-alias -menu_slot2 "touch_setcolor _menu_slot2 0 0 0 150; _erase_frame; jointeam 2"
+alias -menu_slot2 "touch_setcolor _menu_slot2 0 0 0 150; jointeam 2; wait; wait; _erase_frame"
 
 alias +menu_slot3 "_click; touch_setcolor _menu_slot3 255 174 0 150"
-alias -menu_slot3 "touch_setcolor _menu_slot3 0 0 0 150; _erase_frame; jointeam 3"
+alias -menu_slot3 "touch_setcolor _menu_slot3 0 0 0 150; jointeam 3; wait; wait; _erase_frame"
 
 alias +menu_slot5 "_click; touch_setcolor _menu_slot5 255 174 0 150"
-alias -menu_slot5 "touch_setcolor _menu_slot5 0 0 0 150; _erase_frame; jointeam 5"
+alias -menu_slot5 "touch_setcolor _menu_slot5 0 0 0 150; jointeam 5; wait; wait; _erase_frame"
 
 alias +menu_slot6 "_click; touch_setcolor _menu_slot6 255 174 0 150"
-alias -menu_slot6 "touch_setcolor _menu_slot6 0 0 0 150; _erase_frame; jointeam 6"
+alias -menu_slot6 "touch_setcolor _menu_slot6 0 0 0 150; jointeam 6; wait; wait; _erase_frame"
 
 alias +menu_slot9 "_click; touch_setcolor _menu_slot9 255 174 0 150"
 alias -menu_slot9 "touch_setcolor _menu_slot9 0 0 0 150; _menu_scores"

diff --git a/3rdparty/cs16client-extras/touch/chooseteam_ct.cfg b/3rdparty/cs16client-extras/touch/chooseteam_ct.cfg
@@ -75,4 +75,4 @@ alias _menu_select_slot4 "_click; _menu_none; touch_setcolor _menu_slot4 255 174
 alias _menu_select_slot5 "_click; _menu_none; touch_setcolor _menu_slot5 255 174 0 150; touch_show _menu_frame_icn_class5; touch_show _menu_frame_txt_desc5; touch_show _menu_confirm*; alias _menu_confirmed joinclass 5"
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"
diff --git a/3rdparty/cs16client-extras/touch/chooseteam_tr.cfg b/3rdparty/cs16client-extras/touch/chooseteam_tr.cfg
@@ -75,4 +75,4 @@ alias _menu_select_slot4 "_click; _menu_none; touch_setcolor _menu_slot4 255 174
 alias _menu_select_slot5 "_click; _menu_none; touch_setcolor _menu_slot5 255 174 0 150; touch_show _menu_frame_icn_class5; touch_show _menu_frame_txt_desc5; touch_show _menu_confirm*; alias _menu_confirmed joinclass 5"
 
 alias +menu_confirm "_click; touch_setcolor _menu_confirm 255 174 0 150"
-alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _erase_frame; _menu_confirmed"
+alias -menu_confirm "touch_setcolor _menu_confirm 0 0 0 150; _menu_confirmed; wait; wait; _erase_frame"