X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=mvm_cmds.c;h=0cd14d7e871a24af5a82e3aa55e9d960ded7ffdd;hb=6013a64d0eed039b96f5d920743dcced5f9b6a6b;hp=5e1e65a1e246dc60b2795bea874574d9454eaf3f;hpb=73b087899f1ad0101e7250ed7722cf7d001d7c5d;p=xonotic%2Fdarkplaces.git

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 5e1e65a1..0cd14d7e 100644
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -74,7 +74,7 @@ void VM_M_setmousetarget(void)
 		in_client_mouse = true;
 		break;
 	default:
-		PRVM_ERROR("VM_M_setmousetarget: wrong destination %i !\n",PRVM_G_FLOAT(OFS_PARM0));
+		PRVM_ERROR("VM_M_setmousetarget: wrong destination %f !",PRVM_G_FLOAT(OFS_PARM0));
 	}
 }
 
@@ -123,7 +123,7 @@ void VM_M_setkeydest(void)
 		// key_dest = key_message
 		// break;
 	default:
-		PRVM_ERROR("VM_M_setkeydest: wrong destination %i !\n",prog->globals.generic[OFS_PARM0]);
+		PRVM_ERROR("VM_M_setkeydest: wrong destination %f !", PRVM_G_FLOAT(OFS_PARM0));
 	}
 }
 
@@ -171,19 +171,19 @@ void VM_M_callfunction(void)
 	const char *s;
 
 	if(prog->argc == 0)
-		PRVM_ERROR("VM_M_callfunction: 1 parameter is required !\n");
+		PRVM_ERROR("VM_M_callfunction: 1 parameter is required !");
 
 	s = PRVM_G_STRING(OFS_PARM0 + (prog->argc - 1));
 
 	if(!s)
-		PRVM_ERROR("VM_M_callfunction: null string !\n");
+		PRVM_ERROR("VM_M_callfunction: null string !");
 
 	VM_CheckEmptyString(s);
 
 	func = PRVM_ED_FindFunction(s);
 
 	if(!func)
-		PRVM_ERROR("VM_M_callfunciton: function %s not found !\n", s);
+		PRVM_ERROR("VM_M_callfunciton: function %s not found !", s);
 	else if (func->first_statement < 0)
 	{
 		// negative statements are built in functions
@@ -220,7 +220,7 @@ void VM_M_isfunction(void)
 	s = PRVM_G_STRING(OFS_PARM0);
 
 	if(!s)
-		PRVM_ERROR("VM_M_isfunction: null string !\n");
+		PRVM_ERROR("VM_M_isfunction: null string !");
 
 	VM_CheckEmptyString(s);
 
@@ -246,11 +246,11 @@ void VM_M_writetofile(void)
 
 	VM_SAFEPARMCOUNT(2, VM_M_writetofile);
 
-	file = VM_GetFileHandle( PRVM_G_FLOAT(OFS_PARM0) );
+	file = VM_GetFileHandle( (int)PRVM_G_FLOAT(OFS_PARM0) );
 	if( !file ) {
 		return;
 	}
-	
+
 	ent = PRVM_G_EDICT(OFS_PARM1);
 	if(ent->priv.required->free)
 	{
@@ -274,7 +274,7 @@ void VM_M_getresolution(void)
 	int nr;
 	VM_SAFEPARMCOUNT(1, VM_getresolution);
 
-	nr = PRVM_G_FLOAT(OFS_PARM0);
+	nr = (int)PRVM_G_FLOAT(OFS_PARM0);
 
 
 	PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr][0];
@@ -282,45 +282,6 @@ void VM_M_getresolution(void)
 	PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
 }
 
-/*
-=========
-VM_M_keynumtostring
-
-string keynumtostring(float keynum)
-=========
-*/
-void VM_M_keynumtostring(void)
-{
-	int keynum;
-	char *tmp;
-	VM_SAFEPARMCOUNT(1, VM_M_keynumtostring);
-
-	keynum = PRVM_G_FLOAT(OFS_PARM0);
-
-	tmp = VM_GetTempString();
-
-	strcpy(tmp, Key_KeynumToString(keynum));
-
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
-}
-
-/*
-=========
-VM_M_stringtokeynum
-
-float stringtokeynum(string key)
-=========
-*/
-void VM_M_stringtokeynum( void )
-{
-	const char *str;
-	VM_SAFEPARMCOUNT( 1, VM_M_keynumtostring );
-
-	str = PRVM_G_STRING( OFS_PARM0 );
-
-	PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str );
-}
-
 /*
 =========
 VM_M_findkeysforcommand
@@ -381,7 +342,7 @@ void VM_M_getserverliststat( void )
 
 	PRVM_G_FLOAT( OFS_RETURN ) = 0;
 
-	type = PRVM_G_FLOAT( OFS_PARM0 );
+	type = (int)PRVM_G_FLOAT( OFS_PARM0 );
 	switch(type)
 	{
 	case 0:
@@ -446,7 +407,7 @@ void VM_M_setserverlistmaskstring( void )
 	if( !str )
 		PRVM_ERROR( "VM_M_setserverlistmaskstring: null string passed!" );
 
-	masknr = PRVM_G_FLOAT( OFS_PARM0 );
+	masknr = (int)PRVM_G_FLOAT( OFS_PARM0 );
 	if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
 		mask = &serverlist_andmasks[masknr];
 	else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
@@ -480,7 +441,7 @@ void VM_M_setserverlistmaskstring( void )
 	}
 
 	mask->active = true;
-	mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+	mask->tests[field] = (serverlist_maskop_t)((int)PRVM_G_FLOAT( OFS_PARM3 ));
 }
 
 /*
@@ -501,7 +462,7 @@ void VM_M_setserverlistmasknumber( void )
 	int field;
 	VM_SAFEPARMCOUNT( 4, VM_M_setserverlistmasknumber );
 
-	masknr = PRVM_G_FLOAT( OFS_PARM0 );
+	masknr = (int)PRVM_G_FLOAT( OFS_PARM0 );
 	if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
 		mask = &serverlist_andmasks[masknr];
 	else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
@@ -511,7 +472,7 @@ void VM_M_setserverlistmasknumber( void )
 		return;
 	}
 
-	number = PRVM_G_FLOAT( OFS_PARM2 );
+	number = (int)PRVM_G_FLOAT( OFS_PARM2 );
 	field = (int) PRVM_G_FLOAT( OFS_PARM1 );
 
 	switch( field ) {
@@ -533,7 +494,7 @@ void VM_M_setserverlistmasknumber( void )
 	}
 
 	mask->active = true;
-	mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+	mask->tests[field] = (serverlist_maskop_t)((int)PRVM_G_FLOAT( OFS_PARM3 ));
 }
 
 
@@ -565,7 +526,7 @@ void VM_M_getserverliststring(void)
 
 	PRVM_G_INT(OFS_RETURN) = 0;
 
-	hostnr = PRVM_G_FLOAT(OFS_PARM1);
+	hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
 
 	if(hostnr < 0 || hostnr >= serverlist_viewcount)
 	{
@@ -617,7 +578,7 @@ void VM_M_getserverlistnumber(void)
 
 	PRVM_G_INT(OFS_RETURN) = 0;
 
-	hostnr = PRVM_G_FLOAT(OFS_PARM1);
+	hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
 
 	if(hostnr < 0 || hostnr >= serverlist_viewcount)
 	{
@@ -654,7 +615,7 @@ void VM_M_setserverlistsort( void )
 {
 	VM_SAFEPARMCOUNT( 2, VM_M_setserverlistsort );
 
-	serverlist_sortbyfield = (int) PRVM_G_FLOAT( OFS_PARM0 );
+	serverlist_sortbyfield = (serverlist_infofield_t)((int)PRVM_G_FLOAT( OFS_PARM0 ));
 	serverlist_sortdescending = (qboolean) PRVM_G_FLOAT( OFS_PARM1 );
 }
 
@@ -668,7 +629,7 @@ refreshserverlist()
 void VM_M_refreshserverlist( void )
 {
 	VM_SAFEPARMCOUNT( 0, VM_M_refreshserverlist );
-	ServerList_QueryList();
+	ServerList_QueryList(true, false);
 }
 
 /*
@@ -743,9 +704,9 @@ sizebuf_t *VM_WriteDest (void)
 	int		destclient;
 
 	if(!sv.active)
-		PRVM_ERROR("VM_WriteDest: game is not server (%s)\n", PRVM_NAME);
+		PRVM_ERROR("VM_WriteDest: game is not server (%s)", PRVM_NAME);
 
-	dest = PRVM_G_FLOAT(OFS_PARM1);
+	dest = (int)PRVM_G_FLOAT(OFS_PARM1);
 	switch (dest)
 	{
 	case MSG_BROADCAST:
@@ -753,10 +714,10 @@ sizebuf_t *VM_WriteDest (void)
 
 	case MSG_ONE:
 		destclient = (int) PRVM_G_FLOAT(OFS_PARM2);
-		if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active)
-			PRVM_ERROR("VM_clientcommand: %s: invalid client !\n", PRVM_NAME);
+		if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active || !svs.clients[destclient].netconnection)
+			PRVM_ERROR("VM_clientcommand: %s: invalid client !", PRVM_NAME);
 
-		return &svs.clients[destclient].message;
+		return &svs.clients[destclient].netconnection->message;
 
 	case MSG_ALL:
 		return &sv.reliable_datagram;
@@ -774,22 +735,22 @@ sizebuf_t *VM_WriteDest (void)
 
 void VM_M_WriteByte (void)
 {
-	MSG_WriteByte (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+	MSG_WriteByte (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
 }
 
 void VM_M_WriteChar (void)
 {
-	MSG_WriteChar (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+	MSG_WriteChar (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
 }
 
 void VM_M_WriteShort (void)
 {
-	MSG_WriteShort (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+	MSG_WriteShort (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
 }
 
 void VM_M_WriteLong (void)
 {
-	MSG_WriteLong (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+	MSG_WriteLong (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
 }
 
 void VM_M_WriteAngle (void)
@@ -940,7 +901,8 @@ prvm_builtin_t vm_m_builtins[] = {
 	VM_cin_setstate,
 	VM_cin_getstate,
 	VM_cin_restart, // 465
-	0,0,0,0,0,	// 470
+	VM_drawline,	// 466
+	0,0,0,0,	// 470
 	e10,			// 480
 	e10,			// 490
 	e10,			// 500
@@ -954,12 +916,12 @@ prvm_builtin_t vm_m_builtins[] = {
 	VM_M_writetofile,
 	VM_M_isfunction,
 	VM_M_getresolution,
-	VM_M_keynumtostring,
+	VM_keynumtostring,
 	VM_M_findkeysforcommand,// 610
 	VM_M_getserverliststat,
 	VM_M_getserverliststring,
 	VM_parseentitydata,
-	VM_M_stringtokeynum,
+	VM_stringtokeynum,
 	VM_M_resetserverlistmasks,
 	VM_M_setserverlistmaskstring,
 	VM_M_setserverlistmasknumber,