Counter-Strike: Make the text-menu use the new Textmenu_Toggle call, so

players can exit e.g. the team choice menu.
This commit is contained in:
Marco Cawthorne 2021-02-14 00:20:32 +01:00
parent 086e8e5a37
commit 8d262c9eb2
3 changed files with 31 additions and 5 deletions

View File

@ -19,19 +19,19 @@ Game_ConsoleCommand(void)
{
switch(argv(0)) {
case "chooseteam":
Textmenu_Call("TEAM_SELECT");
Textmenu_Toggle("TEAM_SELECT");
break;
case "buy":
Textmenu_Call("BUY");
Textmenu_Toggle("BUY");
break;
case "radio1":
Textmenu_Call("RADIOA");
Textmenu_Toggle("RADIOA");
break;
case "radio2":
Textmenu_Call("RADIOB");
Textmenu_Toggle("RADIOB");
break;
case "radio3":
Textmenu_Call("RADIOC");
Textmenu_Toggle("RADIOC");
break;
case "nightvision":
/*Nightvision_Toggle();*/

View File

@ -17,5 +17,9 @@
var string g_textmenu = "";
var float g_textmenucheck = 0.0f;
void Textmenu_Call(string);
void Textmenu_Toggle(string);
int Textmenu_IsActive(void);
void Textmenu_Hide(void);
void Textmenu_Input(int);
void Textmenu_Draw(void);

View File

@ -16,6 +16,20 @@
/* Old style Counter-Strike/TFC menus */
int
Textmenu_IsActive(void)
{
return (g_textmenu != "") ? TRUE : FALSE;
}
void
Textmenu_Hide(void)
{
g_textmenu = "";
g_textchannels[5].m_flTime = 0.0f;
g_textmenucheck = 0.0f;
}
void
Textmenu_Call(string menu)
{
@ -23,6 +37,14 @@ Textmenu_Call(string menu)
g_textchannels[5].m_flTime = 0.0f;
g_textmenucheck = 0.0f;
}
void
Textmenu_Toggle(string menu)
{
if (Textmenu_IsActive())
Textmenu_Hide();
else
Textmenu_Call(menu);
}
void
Textmenu_Draw(void)