}
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
{
static void VM_M_resortserverlist(prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(0, VM_M_resortserverlist);
- ServerList_RebuildViewList();
+ ServerList_RebuildViewList(NULL);
}
/*
}
else
{
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
{
Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
return;
}
else
{
- if(hostnr < 0 || hostnr >= serverlist_viewcount)
+ if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
{
Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
return;
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;