X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=mvm_cmds.c;h=b22db369aa67f504538074743534f59a2fbc5b3e;hb=b16784feefc91f75e23ecebdc6e769baaebca2aa;hp=f5976ac68bf100f3aa44022a43162b58b5dd00a1;hpb=da00708dace157ebbbc05b5cd698f60951fe5c08;p=xonotic%2Fdarkplaces.git

diff --git a/mvm_cmds.c b/mvm_cmds.c
index f5976ac6..b22db369 100644
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -4,6 +4,8 @@
 #include "clvm_cmds.h"
 #include "menu.h"
 
+// TODO check which strings really should be engine strings
+
 //============================================================================
 // Menu
 
@@ -144,93 +146,55 @@ void VM_M_getkeydest(void)
 	}
 }
 
+
 /*
 =========
-VM_M_callfunction
+VM_M_getresolution
 
-	callfunction(...,string function_name)
-Extension: pass
+vector	getresolution(float number)
 =========
 */
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_M_callfunction(void)
+void VM_M_getresolution(void)
 {
-	mfunction_t *func;
-	const char *s;
+	int nr, fs;
+	VM_SAFEPARMCOUNTRANGE(1, 2, VM_getresolution);
 
-	VM_SAFEPARMCOUNTRANGE(1, 8, VM_M_callfunction);
-
-	s = PRVM_G_STRING(OFS_PARM0+(prog->argc - 1)*3);
-
-	VM_CheckEmptyString(s);
+	nr = (int)PRVM_G_FLOAT(OFS_PARM0);
 
-	func = PRVM_ED_FindFunction(s);
+	fs = ((prog->argc <= 1) || ((int)PRVM_G_FLOAT(OFS_PARM1)));
 
-	if(!func)
-		PRVM_ERROR("VM_M_callfunciton: function %s not found !", s);
-	else if (func->first_statement < 0)
+	if(nr < 0 || nr >= (fs ? video_resolutions_count : video_resolutions_hardcoded_count))
 	{
-		// negative statements are built in functions
-		int builtinnumber = -func->first_statement;
-		prog->xfunction->builtinsprofile++;
-		if (builtinnumber < prog->numbuiltins && prog->builtins[builtinnumber])
-			prog->builtins[builtinnumber]();
-		else
-			PRVM_ERROR("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, PRVM_NAME);
+		PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
+		PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
+		PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
 	}
-	else if(func - prog->functions > 0)
+	else
 	{
-		prog->argc--;
-		PRVM_ExecuteProgram(func - prog->functions,"");
-		prog->argc++;
+		video_resolution_t *r = &((fs ? video_resolutions : video_resolutions_hardcoded)[nr]);
+		PRVM_G_VECTOR(OFS_RETURN)[0] = r->width;
+		PRVM_G_VECTOR(OFS_RETURN)[1] = r->height;
+		PRVM_G_VECTOR(OFS_RETURN)[2] = r->pixelheight;
 	}
 }
 
-/*
-=========
-VM_M_isfunction
-
-float	isfunction(string function_name)
-=========
-*/
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_M_isfunction(void)
-{
-	mfunction_t *func;
-	const char *s;
-
-	VM_SAFEPARMCOUNT(1, VM_M_isfunction);
-
-	s = PRVM_G_STRING(OFS_PARM0);
-
-	VM_CheckEmptyString(s);
-
-	func = PRVM_ED_FindFunction(s);
-
-	if(!func)
-		PRVM_G_FLOAT(OFS_RETURN) = false;
-	else
-		PRVM_G_FLOAT(OFS_RETURN) = true;
-}
-
-/*
-=========
-VM_M_getresolution
-
-vector	getresolution(float number)
-=========
-*/
-void VM_M_getresolution(void)
+void VM_M_getgamedirinfo(void)
 {
-	int nr;
-	VM_SAFEPARMCOUNT(1, VM_getresolution);
+	int nr, item;
+	VM_SAFEPARMCOUNT(2, VM_getgamedirinfo);
 
 	nr = (int)PRVM_G_FLOAT(OFS_PARM0);
+	item = (int)PRVM_G_FLOAT(OFS_PARM1);
+
+	PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
 
-	// FIXME bounds check
-	PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr].width;
-	PRVM_G_VECTOR(OFS_RETURN)[1] = video_resolutions[nr].height;
-	PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
+	if(nr >= 0 && nr < fs_all_gamedirs_count)
+	{
+		if(item == 0)
+			PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( fs_all_gamedirs[nr].name );
+		else if(item == 1)
+			PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( fs_all_gamedirs[nr].description );
+	}
 }
 
 /*
@@ -421,7 +385,7 @@ void VM_M_setserverlistmasknumber( void )
 			mask->info.freeslots = number;
 			break;
 		case SLIF_ISFAVORITE:
-			mask->info.isfavorite = number;
+			mask->info.isfavorite = number != 0;
 			break;
 		default:
 			VM_Warning( "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
@@ -1418,10 +1382,10 @@ VM_M_setkeydest,					// #601 void setkeydest(float dest)
 VM_M_getkeydest,					// #602 float getkeydest(void)
 VM_M_setmousetarget,				// #603 void setmousetarget(float trg)
 VM_M_getmousetarget,				// #604 float getmousetarget(void)
-VM_M_callfunction,				// #605 void callfunction(...)
+VM_callfunction,				// #605 void callfunction(...)
 VM_writetofile,					// #606 void writetofile(float fhandle, entity ent)
-VM_M_isfunction,					// #607 float isfunction(string function_name)
-VM_M_getresolution,				// #608 vector getresolution(float number)
+VM_isfunction,					// #607 float isfunction(string function_name)
+VM_M_getresolution,				// #608 vector getresolution(float number, [float forfullscreen])
 VM_keynumtostring,				// #609 string keynumtostring(float keynum)
 VM_findkeysforcommand,		// #610 string findkeysforcommand(string command)
 VM_M_getserverliststat,			// #611 float gethostcachevalue(float type)
@@ -1438,7 +1402,9 @@ VM_M_getserverlistnumber,		// #621 float gethostcachenumber(float fld, float hos
 VM_M_getserverlistindexforkey,// #622 float gethostcacheindexforkey(string key)
 VM_M_addwantedserverlistkey,	// #623 void addwantedhostcachekey(string key)
 VM_getextresponse,				// #624 string getextresponse(void)
-VM_netaddress_resolve           // #625 string netaddress_resolve(string, float)
+VM_netaddress_resolve,          // #625 string netaddress_resolve(string, float)
+VM_M_getgamedirinfo,            // #626 string getgamedirinfo(float n, float prop)
+NULL
 };
 
 const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);