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

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 5e1e65a1..47976cfb 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);
 
@@ -250,7 +250,7 @@ void VM_M_writetofile(void)
 	if( !file ) {
 		return;
 	}
-	
+
 	ent = PRVM_G_EDICT(OFS_PARM1);
 	if(ent->priv.required->free)
 	{
@@ -480,7 +480,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 ));
 }
 
 /*
@@ -533,7 +533,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 ));
 }
 
 
@@ -654,7 +654,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 );
 }
 
@@ -743,7 +743,7 @@ 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);
 	switch (dest)
@@ -754,7 +754,7 @@ 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);
+			PRVM_ERROR("VM_clientcommand: %s: invalid client !", PRVM_NAME);
 
 		return &svs.clients[destclient].message;