fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

qccgui: reworked compile prints to split the screen instead of being some other window that's hidden when fullscreened etc.

Browse source 
splitscreen: split spectator setting into a per-seat setting. scoreboards are now also per-seat.
added parm_string global for richer map change stuff.
dpp7: fixed and reinstated.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5110 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2017-05-28 15:42:32 +00:00
parent 0fad8fe37d
commit 025aeff8a4
50 changed files with 1150 additions and 813 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engine/server/sv_ccmds.c
View file

@ -759,7 +759,8 @@ void SV_Map_f (void)
Z_Free(host_client->spawninfo);
host_client->spawninfo = NULL;
memset(host_client->spawn_parms, 0, sizeof(host_client->spawn_parms));
SV_GetNewSpawnParms(host_client);
if (host_client->state > cs_zombie)
SV_GetNewSpawnParms(host_client);
}
if (preserveplayers && svprogfuncs && host_client->state == cs_spawned && host_client->spawninfo)
@ -2855,16 +2856,14 @@ void SV_MemInfo_f(void)
sz += lp->length;
fr = 0;
fr += sizeof(client_frame_t)*UPDATE_BACKUP;
if (cl->pendingdeltabits)
{
int maxents = cl->frameunion.frames[0].entities.max_entities; /*this is the max number of ents updated per frame. we can't track more, so...*/
fr = sizeof(cl)*UPDATE_BACKUP+
sizeof(*cl->pendingdeltabits)*cl->max_net_ents+
sizeof(unsigned int)*maxents*UPDATE_BACKUP+
sizeof(unsigned int)*maxents*UPDATE_BACKUP;
fr += sizeof(cl)*UPDATE_BACKUP+
sizeof(*cl->pendingdeltabits)*cl->max_net_ents;
}
else
fr = (sizeof(client_frame_t)+sizeof(entity_state_t)*cl->frameunion.frames[0].entities.max_entities)*UPDATE_BACKUP;
fr += sizeof(*cl->frameunion.frames[0].resend)*cl->frameunion.frames[0].maxresend*UPDATE_BACKUP;
fr += sizeof(entity_state_t)*cl->frameunion.frames[0].qwentities.max_entities*UPDATE_BACKUP;
fr += sizeof(*cl->sentents.entities) * cl->sentents.max_entities;
csfr = sizeof(*cl->pendingcsqcbits) * cl->max_net_ents;
@ -2873,7 +2872,8 @@ void SV_MemInfo_f(void)
}
}
//FIXME: report vm memory
if (sv.world.progs)
Con_Printf("ssqc: %u (used) / %u (reserved)\n", sv.world.progs->stringtablesize, sv.world.progs->stringtablemaxsize);
}
void SV_Download_f (void)