X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=mvm_cmds.c;h=6202e8e24044b02c31ba6bfd25b15f156f10321d;hb=bfbabeee8f8ae8c5f35a147be7ab6ca31960b0e8;hp=3faf9a1f796999f0cb8910b62f1fceefcecd3345;hpb=305eb3834a21c5ceaee8531f645848878ad10152;p=xonotic%2Fdarkplaces.git

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 3faf9a1f..6202e8e2 100644
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -193,19 +193,10 @@ static void VM_M_getresolution(prvm_prog_t *prog)
 	}
 	else if(nr == -1)
 	{
-		vid_mode_t *m = VID_GetDesktopMode();
-		if (m)
-		{
-			PRVM_G_VECTOR(OFS_RETURN)[0] = m->width;
-			PRVM_G_VECTOR(OFS_RETURN)[1] = m->height;
-			PRVM_G_VECTOR(OFS_RETURN)[2] = m->pixelheight_num / (prvm_vec_t) m->pixelheight_denom;
-		}
-		else
-		{
-			PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
-			PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
-			PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
-		}
+		vid_mode_t m = VID_GetDesktopMode();
+		PRVM_G_VECTOR(OFS_RETURN)[0] = m.width;
+		PRVM_G_VECTOR(OFS_RETURN)[1] = m.height;
+		PRVM_G_VECTOR(OFS_RETURN)[2] = m.pixelheight_num / (prvm_vec_t) m.pixelheight_denom;
 	}
 	else
 	{
@@ -449,7 +440,7 @@ resortserverlist
 static void VM_M_resortserverlist(prvm_prog_t *prog)
 {
 	VM_SAFEPARMCOUNT(0, VM_M_resortserverlist);
-	ServerList_RebuildViewList();
+	ServerList_RebuildViewList(NULL);
 }
 
 /*
@@ -476,7 +467,7 @@ static void VM_M_getserverliststring(prvm_prog_t *prog)
 	}
 	else
 	{
-		if(hostnr < 0 || hostnr >= serverlist_viewcount)
+		if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
 		{
 			Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
 			return;
@@ -541,7 +532,7 @@ static void VM_M_getserverlistnumber(prvm_prog_t *prog)
 	}
 	else
 	{
-		if(hostnr < 0 || hostnr >= serverlist_viewcount)
+		if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
 		{
 			Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
 			return;
@@ -565,7 +556,8 @@ static void VM_M_getserverlistnumber(prvm_prog_t *prog)
 			PRVM_G_FLOAT( OFS_RETURN ) = cache->info.freeslots;
 			break;
 		case SLIF_PING:
-			PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping;
+			// display inf when a listed server times out and net_slist_pause blocks its removal
+			PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping ?: INFINITY;
 			break;
 		case SLIF_PROTOCOL:
 			PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol;