From: black <black@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 16 Dec 2003 12:43:50 +0000 (+0000)
Subject: Added the togglemenu command for both menus and the chr builtin command (menu qc)
X-Git-Tag: xonotic-v0.1.0preview~6208
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=c60119cef7f0b44169ddb4c7d688976f9f9283ae;p=xonotic%2Fdarkplaces.git

Added the togglemenu command for both menus and the chr builtin command (menu qc)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3733 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/menu.c b/menu.c
index bac140cd..0185ad45 100644
--- a/menu.c
+++ b/menu.c
@@ -3498,8 +3498,6 @@ void M_Init (void)
 	menuplyr_load = true;
 	menuplyr_pixels = NULL;
 
-	Cmd_AddCommand ("togglemenu", M_ToggleMenu_f);
-
 	Cmd_AddCommand ("menu_main", M_Menu_Main_f);
 	Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f);
 	Cmd_AddCommand ("menu_load", M_Menu_Load_f);
@@ -3946,11 +3944,18 @@ void MR_Restart(void)
 	MR_SetRouting (FALSE);
 }
 
+void Call_MR_ToggleMenu_f(void)
+{
+	if(MR_ToggleMenu_f)
+		MR_ToggleMenu_f();
+}
+
 void MR_Init()
 {
 	// set router console commands
 	Cvar_RegisterVariable (&forceqmenu);
 	Cmd_AddCommand ("menu_restart",MR_Restart);
+	Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f);
 
 	// use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
 	if(COM_CheckParm("-forceqmenu"))
diff --git a/prvm_cmds.c b/prvm_cmds.c
index 9cb8f9bd..f950bd2c 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -94,6 +94,8 @@ float	search_begin(string pattern, float caseinsensitive, float quiet)
 void	search_end(float handle)
 float	search_getsize(float handle)
 string	search_getfilename(float handle, float num)
+
+string	chr(float ascii)
 		
 perhaps only : Menu : WriteMsg 
 ===============================
@@ -2431,6 +2433,25 @@ void VM_search_getfilename(void)
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tmp);
 }
 
+/*
+=========
+VM_chr
+
+string	chr(float ascii)
+=========
+*/
+void VM_chr(void)
+{
+	char *tmp;
+	VM_SAFEPARMCOUNT(1, VM_chr);
+
+	tmp = VM_GetTempString();
+	tmp[0] = (unsigned char) PRVM_G_FLOAT(OFS_PARM0);
+	tmp[1] = 0;
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tmp);
+}
+
 //=============================================================================
 // Draw builtins (client & menu)
 
@@ -3141,7 +3162,8 @@ prvm_builtin_t vm_m_builtins[] = {
 	VM_search_end,
 	VM_search_getsize,
 	VM_search_getfilename, // 77
-	0,0,0,// 80
+	VM_chr,	//78
+	0,0,// 80
 	e10,			// 90
 	e10,			// 100
 	e100,			// 200