eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

fix a silly bug, and some other compile warnings.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5118 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2017-06-22 16:49:29 +00:00
parent 705067928a
commit 6946af8dee
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/client/cl_demo.c
View file

@ -2801,7 +2801,7 @@ void CL_QTVPlay_f (void)
char *host; char *host;
char msg[4096]; char msg[4096];
int msglen=0; int msglen=0;
char *password; // char *password;
if (Cmd_Argc() < 2) if (Cmd_Argc() < 2)
{ {
@ -2843,7 +2843,7 @@ void CL_QTVPlay_f (void)
else else
host = NULL; host = NULL;
password = Cmd_Argv(2); // password = Cmd_Argv(2);
if (qtvcl_forceversion1.ival) if (qtvcl_forceversion1.ival)
{ {

4
engine/client/cl_parse.c
View file

@ -3101,7 +3101,7 @@ static void CLQW_ParseServerData (void)
} }
else if (cls.fteprotocolextensions2 & PEXT2_MAXPLAYERS) else if (cls.fteprotocolextensions2 & PEXT2_MAXPLAYERS)
{ {
qboolean spec = false; // qboolean spec = false;
cl.allocated_client_slots = MSG_ReadByte(); cl.allocated_client_slots = MSG_ReadByte();
if (cl.allocated_client_slots > MAX_CLIENTS) if (cl.allocated_client_slots > MAX_CLIENTS)
{ {
@ -3113,7 +3113,7 @@ static void CLQW_ParseServerData (void)
cl.splitclients = MSG_ReadByte(); cl.splitclients = MSG_ReadByte();
if (cl.splitclients & 128) if (cl.splitclients & 128)
{ {
spec = true; // spec = true;
cl.splitclients &= ~128; cl.splitclients &= ~128;
} }
if (cl.splitclients > MAX_SPLITS) if (cl.splitclients > MAX_SPLITS)

2
engine/server/sv_init.c
View file

@ -447,7 +447,7 @@ void SV_CalcPHS (void)
int i, j, k, l, index, num; int i, j, k, l, index, num;
int bitbyte; int bitbyte;
unsigned *dest, *src; unsigned *dest, *src;
qbyte *scan, pvs; qbyte *scan, *pvs;
int count, vcount; int count, vcount;
model_t *model = sv.world.worldmodel; model_t *model = sv.world.worldmodel;
pvsbuffer_t buf; pvsbuffer_t buf;

3
engine/server/svq3_game.c
View file

@ -2371,7 +2371,6 @@ void SVQ3_BuildClientSnapshot( client_t *client )
// check for SVF_PORTAL entities first // check for SVF_PORTAL entities first
for( i=0 ; i<numq3entities ; i++) for( i=0 ; i<numq3entities ; i++)
{ {
qbyte *merge;
ent = GENTITY_FOR_NUM(i); ent = GENTITY_FOR_NUM(i);
if(ent == clent ) if(ent == clent )
@ -2384,7 +2383,7 @@ void SVQ3_BuildClientSnapshot( client_t *client )
// merge PVS if portal // merge PVS if portal
portalarea = CM_PointLeafnum(sv.world.worldmodel, ent->s.origin2); portalarea = CM_PointLeafnum(sv.world.worldmodel, ent->s.origin2);
//merge pvs bits so we can see other ents through it //merge pvs bits so we can see other ents through it
merge = sv.world.worldmodel->funcs.ClusterPVS(sv.world.worldmodel, CM_LeafCluster(sv.world.worldmodel, portalarea), &pvsbuffer, PVM_MERGE); sv.world.worldmodel->funcs.ClusterPVS(sv.world.worldmodel, CM_LeafCluster(sv.world.worldmodel, portalarea), &pvsbuffer, PVM_MERGE);
//and merge areas, so we can see the world too (client will calc its own pvs) //and merge areas, so we can see the world too (client will calc its own pvs)
portalarea = CM_LeafArea(sv.world.worldmodel, portalarea); portalarea = CM_LeafArea(sv.world.worldmodel, portalarea);
CM_WriteAreaBits(sv.world.worldmodel, snap->areabits, portalarea, true); CM_WriteAreaBits(sv.world.worldmodel, snap->areabits, portalarea, true);