2005-08-26 22:50:31 +00:00
|
|
|
#include "quakedef.h"
|
2006-02-11 14:51:36 +00:00
|
|
|
#include "shader.h"
|
2005-08-26 22:50:31 +00:00
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
|
2005-08-26 22:50:31 +00:00
|
|
|
//urm, yeah, this is more than just parse.
|
|
|
|
|
|
|
|
#ifdef Q3CLIENT
|
|
|
|
|
|
|
|
#include "clq3defs.h"
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
#define CMD_BACKUP UPDATE_BACKUP
|
|
|
|
#define CMD_MASK UPDATE_MASK
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
#define SHOWSTRING(s) if(cl_shownet.value==2)Con_Printf ("%s\n", s);
|
|
|
|
#define SHOWNET(x) if(cl_shownet.value==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
|
|
|
|
#define SHOWNET2(x, y) if(cl_shownet.value==2)Con_Printf ("%3i:%3i:%s\n", msg_readcount-1, y, x);
|
|
|
|
|
|
|
|
void MSG_WriteBits(sizebuf_t *msg, int value, int bits);
|
|
|
|
|
|
|
|
|
|
|
|
ClientConnectionState_t ccs;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
qboolean CG_FillQ3Snapshot(int snapnum, snapshot_t *snapshot)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
clientSnap_t *snap;
|
|
|
|
|
|
|
|
if (snapnum > ccs.serverMessageNum)
|
|
|
|
{
|
|
|
|
Host_EndGame("CG_FillQ3Snapshot: snapshotNumber > cl.snap.serverMessageNum");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ccs.serverMessageNum - snapnum >= Q3UPDATE_BACKUP)
|
|
|
|
{
|
|
|
|
return false; // too old
|
|
|
|
}
|
|
|
|
|
|
|
|
snap = &ccs.snapshots[snapnum & Q3UPDATE_MASK];
|
|
|
|
if(!snap->valid || snap->serverMessageNum != snapnum)
|
|
|
|
{
|
|
|
|
return false; // invalid
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(&snapshot->ps, &snap->playerstate, sizeof(snapshot->ps));
|
|
|
|
snapshot->numEntities = snap->numEntities;
|
|
|
|
for (i=0; i<snapshot->numEntities; i++)
|
|
|
|
{
|
|
|
|
memcpy(&snapshot->entities[i], &ccs.parseEntities[(snap->firstEntity+i) & PARSE_ENTITIES_MASK], sizeof(snapshot->entities[0]));
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy( &snapshot->areamask, snap->areabits, sizeof( snapshot->areamask ) );
|
|
|
|
|
|
|
|
snapshot->snapFlags = snap->snapFlags;
|
|
|
|
snapshot->ping = snap->ping;
|
|
|
|
|
|
|
|
snapshot->serverTime = snap->serverTime;
|
|
|
|
|
|
|
|
snapshot->numServerCommands = snap->serverCommandNum;
|
|
|
|
snapshot->serverCommandSequence = ccs.lastServerCommandNum;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=====================
|
|
|
|
CLQ3_ParseServerCommand
|
|
|
|
=====================
|
|
|
|
*/
|
|
|
|
void CLQ3_ParseServerCommand(void)
|
|
|
|
{
|
|
|
|
int number;
|
|
|
|
char *string;
|
|
|
|
|
|
|
|
number = MSG_ReadLong();
|
|
|
|
SHOWNET(va("%i", number));
|
|
|
|
|
|
|
|
string = MSG_ReadString();
|
|
|
|
SHOWSTRING(string);
|
|
|
|
|
|
|
|
if( number <= ccs.lastServerCommandNum )
|
|
|
|
{
|
|
|
|
return; // we have already received this command
|
|
|
|
}
|
|
|
|
|
|
|
|
ccs.lastServerCommandNum++;
|
|
|
|
|
2007-02-23 00:21:33 +00:00
|
|
|
if( number > ccs.lastServerCommandNum+TEXTCMD_MASK-1 )
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
2007-02-23 00:21:33 +00:00
|
|
|
Con_Printf("Warning: Lost %i reliable serverCommands\n",
|
2005-08-26 22:50:31 +00:00
|
|
|
number - ccs.lastServerCommandNum );
|
|
|
|
}
|
|
|
|
|
|
|
|
// archive the command to be processed by cgame later
|
|
|
|
Q_strncpyz( ccs.serverCommands[number & TEXTCMD_MASK], string, sizeof( ccs.serverCommands[0] ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
CL_DeltaEntity
|
|
|
|
|
|
|
|
Parses deltas from the given base and adds the resulting entity
|
|
|
|
to the current frame
|
|
|
|
==================
|
|
|
|
*/
|
|
|
|
static void CLQ3_DeltaEntity( clientSnap_t *frame, int newnum, q3entityState_t *old, qboolean unchanged )
|
|
|
|
{
|
|
|
|
q3entityState_t *state;
|
|
|
|
|
|
|
|
state = &ccs.parseEntities[ccs.firstParseEntity & PARSE_ENTITIES_MASK];
|
|
|
|
|
|
|
|
if( unchanged )
|
|
|
|
{
|
|
|
|
memcpy( state, old, sizeof(*state) ); // don't read any bits
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!MSG_Q3_ReadDeltaEntity(old, state, newnum)) // the entity present in oldframe is not in the current frame
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ccs.firstParseEntity++;
|
|
|
|
frame->numEntities++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
CL_ParsePacketEntities
|
|
|
|
|
|
|
|
An svc_packetentities has just been parsed, deal with the
|
|
|
|
rest of the data stream.
|
|
|
|
==================
|
|
|
|
*/
|
|
|
|
static void CLQ3_ParsePacketEntities( clientSnap_t *oldframe, clientSnap_t *newframe )
|
|
|
|
{
|
|
|
|
int numentities;
|
|
|
|
int oldnum;
|
|
|
|
int newnum;
|
|
|
|
q3entityState_t *oldstate;
|
|
|
|
|
|
|
|
oldstate = NULL;
|
|
|
|
newframe->firstEntity = ccs.firstParseEntity;
|
|
|
|
newframe->numEntities = 0;
|
|
|
|
|
|
|
|
// delta from the entities present in oldframe
|
|
|
|
numentities = 0;
|
|
|
|
if( !oldframe )
|
|
|
|
{
|
|
|
|
oldnum = 99999;
|
|
|
|
}
|
|
|
|
else if( oldframe->numEntities <= 0 )
|
|
|
|
{
|
|
|
|
oldnum = 99999;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
oldstate = &ccs.parseEntities[oldframe->firstEntity & PARSE_ENTITIES_MASK];
|
|
|
|
oldnum = oldstate->number;
|
|
|
|
}
|
|
|
|
|
|
|
|
while( 1 )
|
|
|
|
{
|
|
|
|
newnum = MSG_ReadBits( GENTITYNUM_BITS );
|
|
|
|
if( newnum < 0 || newnum >= MAX_GENTITIES )
|
|
|
|
{
|
|
|
|
Host_EndGame("CLQ3_ParsePacketEntities: bad number %i", newnum);
|
|
|
|
}
|
|
|
|
|
|
|
|
if( msg_readcount > net_message.cursize )
|
|
|
|
{
|
|
|
|
Host_EndGame("CLQ3_ParsePacketEntities: end of message");
|
|
|
|
}
|
|
|
|
|
|
|
|
// end of packetentities
|
|
|
|
if( newnum == ENTITYNUM_NONE )
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
while( oldnum < newnum )
|
|
|
|
{
|
|
|
|
// one or more entities from the old packet are unchanged
|
|
|
|
SHOWSTRING( va( "unchanged: %i", oldnum ) );
|
|
|
|
|
|
|
|
CLQ3_DeltaEntity( newframe, oldnum, oldstate, true );
|
|
|
|
|
|
|
|
numentities++;
|
|
|
|
|
|
|
|
if( numentities >= oldframe->numEntities )
|
|
|
|
{
|
|
|
|
oldnum = 99999;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
oldstate = &ccs.parseEntities[(oldframe->firstEntity + numentities) & PARSE_ENTITIES_MASK];
|
|
|
|
oldnum = oldstate->number;
|
2011-05-15 13:23:13 +00:00
|
|
|
}
|
|
|
|
}
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
if( oldnum == newnum )
|
|
|
|
{
|
|
|
|
// delta from previous state
|
|
|
|
SHOWSTRING( va( "delta: %i", newnum ) );
|
|
|
|
|
|
|
|
CLQ3_DeltaEntity( newframe, newnum, oldstate, false );
|
|
|
|
|
|
|
|
numentities++;
|
|
|
|
|
|
|
|
if( numentities >= oldframe->numEntities )
|
|
|
|
{
|
|
|
|
oldnum = 99999;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
oldstate = &ccs.parseEntities[(oldframe->firstEntity + numentities) & PARSE_ENTITIES_MASK];
|
|
|
|
oldnum = oldstate->number;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( oldnum > newnum )
|
|
|
|
{
|
|
|
|
// delta from baseline
|
|
|
|
SHOWSTRING( va( "baseline: %i", newnum ) );
|
|
|
|
|
|
|
|
CLQ3_DeltaEntity( newframe, newnum, &ccs.baselines[newnum], false );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// any remaining entities in the old frame are copied over
|
|
|
|
while( oldnum != 99999 )
|
|
|
|
{
|
|
|
|
// one or more entities from the old packet are unchanged
|
|
|
|
SHOWSTRING( va( "unchanged: %i", oldnum ) );
|
|
|
|
|
|
|
|
CLQ3_DeltaEntity( newframe, oldnum, oldstate, true );
|
|
|
|
|
|
|
|
numentities++;
|
|
|
|
|
|
|
|
if( numentities >= oldframe->numEntities )
|
|
|
|
{
|
|
|
|
oldnum = 99999;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
oldstate = &ccs.parseEntities[(oldframe->firstEntity + numentities) & PARSE_ENTITIES_MASK];
|
|
|
|
oldnum = oldstate->number;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void CLQ3_ParseSnapshot(void)
|
|
|
|
{
|
|
|
|
clientSnap_t snap, *oldsnap;
|
|
|
|
int delta;
|
|
|
|
int len;
|
|
|
|
int i;
|
2013-03-12 22:53:23 +00:00
|
|
|
outframe_t *frame;
|
2005-08-26 22:50:31 +00:00
|
|
|
// usercmd_t *ucmd;
|
|
|
|
// int commandTime;
|
|
|
|
|
|
|
|
memset(&snap, 0, sizeof(snap));
|
|
|
|
snap.serverMessageNum = ccs.serverMessageNum;
|
|
|
|
snap.serverCommandNum = ccs.lastServerCommandNum;
|
|
|
|
snap.serverTime = MSG_ReadLong();
|
2014-06-12 23:08:42 +00:00
|
|
|
|
|
|
|
//so we can delta to it properly.
|
|
|
|
cl.oldgametime = cl.gametime;
|
|
|
|
cl.oldgametimemark = cl.gametimemark;
|
|
|
|
cl.gametime = snap.serverTime / 1000.0f;
|
|
|
|
cl.gametimemark = Sys_DoubleTime();
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
// If the frame is delta compressed from data that we
|
|
|
|
// no longer have available, we must suck up the rest of
|
2011-05-15 13:23:13 +00:00
|
|
|
// the frame, but not use it, then ask for a non-compressed message
|
2005-08-26 22:50:31 +00:00
|
|
|
delta = MSG_ReadByte();
|
|
|
|
if(delta)
|
|
|
|
{
|
|
|
|
snap.deltaFrame = ccs.serverMessageNum - delta;
|
|
|
|
oldsnap = &ccs.snapshots[snap.deltaFrame & Q3UPDATE_MASK];
|
|
|
|
|
|
|
|
if(!oldsnap->valid)
|
|
|
|
{
|
|
|
|
// should never happen
|
|
|
|
Con_Printf( "Delta from invalid frame (not supposed to happen!).\n");
|
|
|
|
}
|
|
|
|
else if( oldsnap->serverMessageNum != snap.deltaFrame )
|
|
|
|
{
|
|
|
|
// The frame that the server did the delta from
|
|
|
|
// is too old, so we can't reconstruct it properly.
|
|
|
|
Con_Printf( "Delta frame too old.\n" );
|
|
|
|
}
|
|
|
|
else if(ccs.firstParseEntity - oldsnap->firstEntity >
|
|
|
|
MAX_PARSE_ENTITIES - MAX_ENTITIES_IN_SNAPSHOT)
|
|
|
|
{
|
|
|
|
Con_Printf( "Delta parse_entities too old.\n" );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
snap.valid = true; // valid delta parse
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
oldsnap = NULL;
|
|
|
|
snap.deltaFrame = -1;
|
|
|
|
snap.valid = true; // uncompressed frame
|
|
|
|
}
|
|
|
|
|
|
|
|
// read snapFlags
|
|
|
|
snap.snapFlags = MSG_ReadByte();
|
|
|
|
|
|
|
|
// read areabits
|
|
|
|
len = MSG_ReadByte();
|
|
|
|
MSG_ReadData(snap.areabits, len );
|
|
|
|
|
|
|
|
// read playerinfo
|
|
|
|
SHOWSTRING("playerstate");
|
|
|
|
MSG_Q3_ReadDeltaPlayerstate(oldsnap ? &oldsnap->playerstate : NULL, &snap.playerstate);
|
|
|
|
|
|
|
|
// read packet entities
|
|
|
|
SHOWSTRING("packet entities");
|
|
|
|
CLQ3_ParsePacketEntities(oldsnap, &snap);
|
|
|
|
|
|
|
|
if (!snap.valid)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// cl.adjustTimeDelta = true;
|
|
|
|
|
|
|
|
// Find last usercmd server has processed and calculate snap.ping
|
|
|
|
|
|
|
|
snap.ping = 3;
|
2014-06-12 23:08:42 +00:00
|
|
|
for (i=cls.netchan.outgoing_sequence-1 ; i>cls.netchan.outgoing_sequence-CMD_BACKUP ; i--)
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
2014-06-12 23:08:42 +00:00
|
|
|
frame = &cl.outframes[i & CMD_MASK];
|
2005-08-26 22:50:31 +00:00
|
|
|
if (frame->server_message_num == snap.deltaFrame)
|
|
|
|
{
|
|
|
|
snap.ping = Sys_Milliseconds() - frame->client_time;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(&ccs.snap, &snap, sizeof(snap));
|
|
|
|
memcpy(&ccs.snapshots[ccs.serverMessageNum & Q3UPDATE_MASK], &snap, sizeof(snap));
|
|
|
|
|
|
|
|
SHOWSTRING(va("snapshot:%i delta:%i ping:%i", snap.serverMessageNum, snap.deltaFrame, snap.ping));
|
|
|
|
}
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
#define MAXCHUNKSIZE 65536
|
2005-08-26 22:50:31 +00:00
|
|
|
void CLQ3_ParseDownload(void)
|
|
|
|
{
|
2014-06-12 23:08:42 +00:00
|
|
|
qdownload_t *dl = cls.download;
|
2005-08-26 22:50:31 +00:00
|
|
|
unsigned int chunknum;
|
|
|
|
unsigned int chunksize;
|
|
|
|
unsigned char chunkdata[MAXCHUNKSIZE];
|
|
|
|
int i;
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
chunknum = (unsigned short) MSG_ReadShort();
|
2014-06-12 23:08:42 +00:00
|
|
|
chunknum |= ccs.downloadchunknum&~0xffff; //add the chunk number, truncated by the network protocol.
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
if (!chunknum)
|
|
|
|
{
|
2014-06-12 23:08:42 +00:00
|
|
|
dl->size = (unsigned int)MSG_ReadLong();
|
|
|
|
Cvar_SetValue( Cvar_Get("cl_downloadSize", "0", 0, "Download stuff"), dl->size );
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
if (dl->size == (unsigned int)-1)
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
|
|
|
s = MSG_ReadString();
|
|
|
|
Con_Printf("\nDownload refused:\n %s\n", s);
|
2014-06-12 23:08:42 +00:00
|
|
|
CL_DownloadFailed(dl->remotename, dl);
|
2005-08-26 22:50:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
chunksize = (unsigned short)MSG_ReadShort();
|
2005-08-26 22:50:31 +00:00
|
|
|
if (chunksize > MAXCHUNKSIZE)
|
|
|
|
Host_EndGame("Server sent a download chunk of size %i (it's too damn big!)\n", chunksize);
|
|
|
|
|
|
|
|
for (i = 0; i < chunksize; i++)
|
|
|
|
chunkdata[i] = MSG_ReadByte();
|
|
|
|
|
|
|
|
if (ccs.downloadchunknum != chunknum) //the q3 client is rather lame.
|
|
|
|
{ //ccs.downloadchunknum holds the chunk number.
|
2005-10-16 12:52:06 +00:00
|
|
|
Con_DPrintf("PACKETLOSS WHEN DOWNLOADING!!!!\n");
|
2005-08-26 22:50:31 +00:00
|
|
|
return; //let the server try again some time
|
|
|
|
}
|
|
|
|
ccs.downloadchunknum++;
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
if (!dl || dl->method != DL_Q3)
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
2014-06-12 23:08:42 +00:00
|
|
|
Con_Printf("Server sending download, but no download was requested\n");
|
|
|
|
CLQ3_SendClientCommand("stopdl");
|
|
|
|
return;
|
|
|
|
}
|
2005-08-26 22:50:31 +00:00
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
if (!dl->file)
|
|
|
|
{
|
|
|
|
if (!DL_Begun(dl))
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
2014-06-12 23:08:42 +00:00
|
|
|
CL_DownloadFailed(dl->remotename, dl);
|
2005-08-26 22:50:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
Con_DPrintf("dl: chnk %u, size %u, csize %u\n", (unsigned int)chunknum, (unsigned int)dl->size, (unsigned int)chunksize);
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
if (!chunksize)
|
|
|
|
{
|
2014-06-12 23:08:42 +00:00
|
|
|
CL_DownloadFinished(dl);
|
2005-08-26 22:50:31 +00:00
|
|
|
|
2005-10-16 12:52:06 +00:00
|
|
|
FS_ReloadPackFiles();
|
|
|
|
|
2005-08-26 22:50:31 +00:00
|
|
|
cl.servercount = -1; //make sure the server resends us that vital gamestate.
|
|
|
|
ccs.downloadchunknum = -1;
|
2014-06-12 23:08:42 +00:00
|
|
|
return;
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-06-12 23:08:42 +00:00
|
|
|
VFS_WRITE(dl->file, chunkdata, chunksize);
|
|
|
|
dl->ratebytes += chunksize;
|
|
|
|
chunksize=VFS_TELL(dl->file);
|
2006-01-02 23:01:54 +00:00
|
|
|
// Con_Printf("Recieved %i\n", chunksize);
|
2005-08-26 22:50:31 +00:00
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
dl->percent = (100.0 * chunksize) / dl->size;
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
CLQ3_SendClientCommand("nextdl %u", chunknum);
|
|
|
|
}
|
|
|
|
|
|
|
|
static qboolean CLQ3_SendDownloads(char *rc, char *rn)
|
|
|
|
{
|
|
|
|
while(rn)
|
|
|
|
{
|
|
|
|
qdownload_t *dl;
|
|
|
|
char localname[MAX_QPATH];
|
|
|
|
char tempname[MAX_QPATH];
|
|
|
|
char crc[64];
|
|
|
|
vfsfile_t *f;
|
|
|
|
rc = COM_ParseOut(rc, crc, sizeof(crc));
|
|
|
|
rn = COM_Parse(rn);
|
|
|
|
if (!*com_token)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (!strchr(com_token, '/')) //don't let some muppet tell us to download quake3.exe
|
|
|
|
break;
|
|
|
|
|
|
|
|
//as much as I'd like to use COM_FCheckExists, this stuf is relative to root, not the gamedir.
|
|
|
|
f = FS_OpenVFS(va("%s.pk3", com_token), "rb", FS_ROOT);
|
|
|
|
if (f)
|
|
|
|
{
|
|
|
|
VFS_CLOSE(f);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!FS_GenCachedPakName(va("%s.pk3", com_token), crc, localname, sizeof(localname)))
|
|
|
|
continue;
|
|
|
|
f = FS_OpenVFS(localname, "rb", FS_ROOT);
|
|
|
|
if (f)
|
|
|
|
{
|
|
|
|
VFS_CLOSE(f);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!FS_GenCachedPakName(va("%s.tmp", com_token), crc, tempname, sizeof(tempname)))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
//fixme: request to download it
|
|
|
|
Con_Printf("Sending request to download %s\n", com_token);
|
|
|
|
CLQ3_SendClientCommand("download %s.pk3", com_token);
|
|
|
|
ccs.downloadchunknum = 0;
|
|
|
|
dl = Z_Malloc(sizeof(*dl));
|
|
|
|
//q3's downloads are relative to root, but they do at least force a pk3 extension.
|
|
|
|
Q_snprintfz(dl->localname, sizeof(dl->localname), "package/%s", localname);
|
|
|
|
Q_snprintfz(dl->tempname, sizeof(dl->tempname), "package/%s", tempname);
|
|
|
|
dl->prefixbytes = 8;
|
|
|
|
dl->fsroot = FS_ROOT;
|
|
|
|
|
|
|
|
Q_snprintfz(dl->remotename, sizeof(dl->remotename), "%s.pk3", com_token);
|
|
|
|
dl->method = DL_Q3;
|
|
|
|
dl->percent = 0;
|
|
|
|
cls.download = dl;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
qboolean CLQ3_SystemInfoChanged(char *str)
|
|
|
|
{
|
|
|
|
qboolean usingpure, usingcheats;
|
|
|
|
char *value;
|
|
|
|
char *pc, *pn;
|
|
|
|
char *rc, *rn;
|
|
|
|
|
2007-09-17 20:35:39 +00:00
|
|
|
Con_Printf("Server's sv_pure: \"%s\"\n", Info_ValueForKey(str, "sv_pure"));
|
2005-08-26 22:50:31 +00:00
|
|
|
usingpure = atoi(Info_ValueForKey(str, "sv_pure"));
|
|
|
|
usingcheats = atoi(Info_ValueForKey(str, "sv_cheats"));
|
|
|
|
Cvar_ForceCheatVars(usingpure||usingcheats, usingcheats);
|
|
|
|
|
|
|
|
// if (atoi(value))
|
|
|
|
// Host_EndGame("Unable to connect to Q3 Pure Servers\n");
|
|
|
|
value = Info_ValueForKey(str, "fs_game");
|
|
|
|
|
|
|
|
#ifndef CLIENTONLY
|
|
|
|
if (!sv.state)
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
COM_FlushTempoaryPacks();
|
2005-10-16 03:54:03 +00:00
|
|
|
if (!*value)
|
|
|
|
value = "baseq3";
|
2015-05-14 03:06:58 +00:00
|
|
|
COM_Gamedir(value, NULL);
|
2005-08-26 22:50:31 +00:00
|
|
|
#ifndef CLIENTONLY
|
|
|
|
Info_SetValueForStarKey (svs.info, "*gamedir", value, MAX_SERVERINFO_STRING);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
rc = Info_ValueForKey(str, "sv_referencedPaks"); //the ones that we should download.
|
|
|
|
rn = Info_ValueForKey(str, "sv_referencedPakNames");
|
|
|
|
if (CLQ3_SendDownloads(rc, rn))
|
|
|
|
return false;
|
2005-08-26 22:50:31 +00:00
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
pc = Info_ValueForKey(str, "sv_paks"); //the ones that we are allowed to use (in order!)
|
|
|
|
pn = Info_ValueForKey(str, "sv_pakNames");
|
|
|
|
FS_PureMode(usingpure?2:0, pn, pc, rn, rc, ccs.fs_key);
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
return true; //yay, we're in
|
|
|
|
}
|
|
|
|
|
|
|
|
void CLQ3_ParseGameState(void)
|
|
|
|
{
|
|
|
|
int c;
|
|
|
|
int index;
|
|
|
|
char *configString;
|
2011-06-29 18:39:11 +00:00
|
|
|
cvar_t *cl_paused;
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
//
|
|
|
|
// wipe the client_state_t struct
|
|
|
|
//
|
2005-10-01 03:09:17 +00:00
|
|
|
CL_ClearState();
|
2014-03-30 08:55:06 +00:00
|
|
|
ccs.firstParseEntity = 0;
|
|
|
|
memset(ccs.parseEntities, 0, sizeof(ccs.parseEntities));
|
|
|
|
memset(ccs.baselines, 0, sizeof(ccs.baselines));
|
|
|
|
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
cl.minpitch = -90;
|
|
|
|
cl.maxpitch = 90;
|
|
|
|
|
|
|
|
ccs.lastServerCommandNum = MSG_ReadLong();
|
|
|
|
ccs.currentServerCommandNum = ccs.lastServerCommandNum;
|
|
|
|
|
|
|
|
for(;;)
|
|
|
|
{
|
|
|
|
c = MSG_ReadByte();
|
|
|
|
|
|
|
|
if(msg_badread)
|
|
|
|
{
|
2008-11-09 22:29:28 +00:00
|
|
|
Host_EndGame("CLQ3_ParseGameState: read past end of server message");
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if(c == svcq3_eom)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
SHOWNET(va("%i", c));
|
|
|
|
|
|
|
|
switch(c)
|
|
|
|
{
|
|
|
|
default:
|
2014-05-10 13:42:13 +00:00
|
|
|
Host_EndGame("CLQ3_ParseGameState: bad command byte %i", c);
|
2005-08-26 22:50:31 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case svcq3_configstring:
|
2008-11-09 22:29:28 +00:00
|
|
|
index = MSG_ReadBits(16);
|
2005-08-26 22:50:31 +00:00
|
|
|
if (index < 0 || index >= MAX_Q3_CONFIGSTRINGS)
|
|
|
|
{
|
2008-11-09 22:29:28 +00:00
|
|
|
Host_EndGame("CLQ3_ParseGameState: configString index %i out of range", index);
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
configString = MSG_ReadString();
|
|
|
|
|
|
|
|
CG_InsertIntoGameState(index, configString);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case svcq3_baseline:
|
|
|
|
index = MSG_ReadBits(GENTITYNUM_BITS);
|
|
|
|
if (index < 0 || index >= MAX_GENTITIES)
|
|
|
|
{
|
2008-11-09 22:29:28 +00:00
|
|
|
Host_EndGame("CLQ3_ParseGameState: baseline index %i out of range", index);
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
MSG_Q3_ReadDeltaEntity(NULL, &ccs.baselines[index], index);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
cl.playerview[0].playernum = MSG_ReadLong();
|
2005-08-26 22:50:31 +00:00
|
|
|
ccs.fs_key = MSG_ReadLong();
|
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
if (!CLQ3_SystemInfoChanged(CG_GetConfigString(CFGSTR_SYSINFO)))
|
2014-06-12 23:08:42 +00:00
|
|
|
{
|
|
|
|
UI_Restart_f();
|
2005-08-26 22:50:31 +00:00
|
|
|
return;
|
2014-06-12 23:08:42 +00:00
|
|
|
}
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
CG_Restart_f();
|
|
|
|
UI_Restart_f();
|
|
|
|
|
|
|
|
if (!cl.worldmodel)
|
|
|
|
Host_EndGame("CGame didn't set a map.\n");
|
2006-06-04 16:02:03 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
cl.model_precaches_added = false;
|
2014-10-05 20:04:11 +00:00
|
|
|
Surf_NewMap ();
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
SCR_EndLoadingPlaque();
|
|
|
|
|
|
|
|
CL_MakeActive("Quake3Arena");
|
|
|
|
|
|
|
|
cl.splitclients = 1;
|
|
|
|
|
|
|
|
{
|
|
|
|
char buffer[2048];
|
|
|
|
strcpy(buffer, va("cp %i ", cl.servercount));
|
2009-04-01 22:03:56 +00:00
|
|
|
FSQ3_GenerateClientPacksList(buffer, sizeof(buffer), ccs.fs_key);
|
2011-05-15 13:23:13 +00:00
|
|
|
CLQ3_SendClientCommand("%s", buffer); // warning: format not a string literal and no format arguments
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// load cgame, etc
|
|
|
|
// CL_ChangeLevel();
|
|
|
|
|
2011-06-29 18:39:11 +00:00
|
|
|
cl_paused = Cvar_FindVar("cl_paused");
|
|
|
|
if (cl_paused && cl_paused->ival)
|
|
|
|
Cvar_ForceSet(cl_paused, "0");
|
|
|
|
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#define TEXTCMD_BACKUP 64
|
|
|
|
void CLQ3_ParseServerMessage (void)
|
|
|
|
{
|
|
|
|
int cmd;
|
|
|
|
if (!CLQ3_Netchan_Process())
|
|
|
|
return; //was a fragment.
|
|
|
|
|
|
|
|
if (cl_shownet.value == 1)
|
2013-11-29 14:36:47 +00:00
|
|
|
Con_Printf ("%i ",net_message.cursize);
|
2005-08-26 22:50:31 +00:00
|
|
|
else if (cl_shownet.value == 2)
|
2013-11-29 14:36:47 +00:00
|
|
|
Con_Printf ("------------------\n");
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
net_message.packing = SZ_RAWBYTES;
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
MSG_BeginReading(msg_nullnetprim);
|
2005-08-26 22:50:31 +00:00
|
|
|
ccs.serverMessageNum = MSG_ReadLong();
|
|
|
|
net_message.packing = SZ_HUFFMAN; //the rest is huffman compressed.
|
|
|
|
net_message.currentbit = msg_readcount*8;
|
|
|
|
|
|
|
|
// read last client command number server received
|
|
|
|
ccs.lastClientCommandNum = MSG_ReadLong();
|
|
|
|
if( ccs.lastClientCommandNum <= ccs.numClientCommands - TEXTCMD_BACKUP )
|
|
|
|
{
|
|
|
|
ccs.lastClientCommandNum = ccs.numClientCommands - TEXTCMD_BACKUP + 1;
|
|
|
|
}
|
|
|
|
else if( ccs.lastClientCommandNum > ccs.numClientCommands )
|
|
|
|
{
|
|
|
|
ccs.lastClientCommandNum = ccs.numClientCommands;
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// parse the message
|
|
|
|
//
|
|
|
|
for(;;)
|
|
|
|
{
|
|
|
|
cmd = MSG_ReadByte();
|
|
|
|
|
|
|
|
if(msg_badread) //hm, we have an eom, so only stop when the message is bad.
|
|
|
|
{
|
|
|
|
Host_EndGame("CLQ3_ParseServerMessage: read past end of server message");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(cmd == svcq3_eom)
|
|
|
|
{
|
|
|
|
SHOWNET2("END OF MESSAGE", 2);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
SHOWNET(va("%i", cmd));
|
2011-05-15 13:23:13 +00:00
|
|
|
|
2005-08-26 22:50:31 +00:00
|
|
|
// other commands
|
|
|
|
switch(cmd)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
Host_EndGame("CLQ3_ParseServerMessage: Illegible server message");
|
|
|
|
break;
|
|
|
|
case svcq3_nop:
|
|
|
|
break;
|
|
|
|
case svcq3_gamestate:
|
|
|
|
CLQ3_ParseGameState();
|
|
|
|
break;
|
|
|
|
case svcq3_serverCommand:
|
|
|
|
CLQ3_ParseServerCommand();
|
|
|
|
break;
|
|
|
|
case svcq3_download:
|
|
|
|
CLQ3_ParseDownload();
|
|
|
|
break;
|
|
|
|
case svcq3_snapshot:
|
|
|
|
CLQ3_ParseSnapshot();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
qboolean CLQ3_Netchan_Process(void)
|
|
|
|
{
|
|
|
|
int sequence;
|
|
|
|
int lastClientCommandNum;
|
|
|
|
qbyte bitmask;
|
|
|
|
qbyte c;
|
|
|
|
int i, j;
|
|
|
|
char *string;
|
|
|
|
int bit;
|
|
|
|
int readcount;
|
|
|
|
|
|
|
|
if(!Netchan_ProcessQ3(&cls.netchan))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// archive buffer state
|
|
|
|
bit = net_message.currentbit;
|
|
|
|
readcount = msg_readcount;
|
|
|
|
net_message.packing = SZ_HUFFMAN;
|
|
|
|
net_message.currentbit = 32;
|
|
|
|
|
2011-05-15 13:23:13 +00:00
|
|
|
lastClientCommandNum = MSG_ReadLong();
|
2005-08-26 22:50:31 +00:00
|
|
|
sequence = LittleLong(*(int *)net_message.data);
|
|
|
|
|
|
|
|
// restore buffer state
|
|
|
|
net_message.currentbit = bit;
|
|
|
|
msg_readcount = readcount;
|
2011-05-15 13:23:13 +00:00
|
|
|
|
2005-08-26 22:50:31 +00:00
|
|
|
// calculate bitmask
|
2011-06-29 18:39:11 +00:00
|
|
|
bitmask = (sequence ^ cls.challenge) & 0xff;
|
2005-08-26 22:50:31 +00:00
|
|
|
string = ccs.clientCommands[lastClientCommandNum & TEXTCMD_MASK];
|
|
|
|
|
2007-02-23 00:21:33 +00:00
|
|
|
#ifndef Q3_NOENCRYPT
|
2005-08-26 22:50:31 +00:00
|
|
|
// decrypt the packet
|
|
|
|
for(i=msg_readcount+4,j=0 ; i<net_message.cursize ; i++,j++)
|
|
|
|
{
|
|
|
|
if(!string[j])
|
|
|
|
{
|
|
|
|
j = 0; // another way around
|
|
|
|
}
|
|
|
|
c = string[j];
|
|
|
|
if(c > 127 || c == '%')
|
|
|
|
{
|
|
|
|
c = '.';
|
|
|
|
}
|
2014-05-10 13:42:13 +00:00
|
|
|
bitmask ^= c << ((i-msg_readcount) & 1);
|
2005-08-26 22:50:31 +00:00
|
|
|
net_message.data[i] ^= bitmask;
|
|
|
|
}
|
2007-02-23 00:21:33 +00:00
|
|
|
#endif
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CL_Netchan_Transmit( int length, const qbyte *data )
|
|
|
|
{
|
|
|
|
#define msg net_message
|
|
|
|
int serverid;
|
|
|
|
int lastSequence;
|
|
|
|
int lastServerCommandNum;
|
|
|
|
qbyte bitmask;
|
|
|
|
qbyte c;
|
|
|
|
int i, j;
|
|
|
|
char *string;
|
|
|
|
net_message.cursize = 0;
|
|
|
|
SZ_Write(&msg, data, length);
|
|
|
|
|
|
|
|
if(msg.overflowed)
|
|
|
|
{
|
|
|
|
Host_EndGame("Client message overflowed");
|
|
|
|
}
|
|
|
|
|
|
|
|
msg_readcount = 0;
|
|
|
|
msg.currentbit = 0;
|
|
|
|
msg.packing = SZ_HUFFMAN;
|
|
|
|
|
|
|
|
serverid = MSG_ReadLong();
|
|
|
|
lastSequence = MSG_ReadLong();
|
|
|
|
lastServerCommandNum = MSG_ReadLong();
|
|
|
|
|
|
|
|
// calculate bitmask
|
2011-06-29 18:39:11 +00:00
|
|
|
bitmask = (lastSequence ^ serverid ^ cls.challenge) & 0xff;
|
2005-08-26 22:50:31 +00:00
|
|
|
string = ccs.serverCommands[lastServerCommandNum & TEXTCMD_MASK];
|
|
|
|
|
2007-02-23 00:21:33 +00:00
|
|
|
#ifndef Q3_NOENCRYPT
|
2005-08-26 22:50:31 +00:00
|
|
|
// encrypt the packet
|
|
|
|
for( i=12,j=0 ; i<msg.cursize ; i++,j++ )
|
|
|
|
{
|
|
|
|
if( !string[j] )
|
|
|
|
{
|
|
|
|
j = 0; // another way around
|
|
|
|
}
|
|
|
|
c = string[j];
|
|
|
|
if( c > 127 || c == '%' )
|
|
|
|
{
|
|
|
|
c = '.';
|
|
|
|
}
|
|
|
|
bitmask ^= c << (i & 1);
|
|
|
|
msg.data[i] ^= bitmask;
|
|
|
|
}
|
2007-02-23 00:21:33 +00:00
|
|
|
#endif
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
Netchan_TransmitQ3( &cls.netchan, msg.cursize, msg.data );
|
|
|
|
#undef msg
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void MSG_WriteDeltaKey( sizebuf_t *msg, int key, int from, int to, int bits )
|
|
|
|
{
|
|
|
|
if( from == to )
|
|
|
|
{
|
|
|
|
MSG_WriteBits( msg, 0, 1 );
|
|
|
|
return; // unchanged
|
|
|
|
}
|
2011-05-15 13:23:13 +00:00
|
|
|
|
2005-08-26 22:50:31 +00:00
|
|
|
MSG_WriteBits( msg, 1, 1 );
|
|
|
|
MSG_WriteBits( msg, to ^ key, bits );
|
|
|
|
}
|
|
|
|
|
|
|
|
void MSG_Q3_WriteDeltaUsercmd( sizebuf_t *msg, int key, const usercmd_t *from, const usercmd_t *to )
|
|
|
|
{
|
|
|
|
// figure out how to pack serverTime
|
|
|
|
if( to->servertime - from->servertime < 255 )
|
|
|
|
{
|
|
|
|
MSG_WriteBits(msg, 1, 1);
|
|
|
|
MSG_WriteBits(msg, to->servertime - from->servertime, 8);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
MSG_WriteBits( msg, 0, 1 );
|
|
|
|
MSG_WriteBits( msg, to->servertime, 32);
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !memcmp( (qbyte *)from + 4, (qbyte *)to + 4, sizeof( usercmd_t ) - 4 ) )
|
|
|
|
{
|
|
|
|
MSG_WriteBits(msg, 0, 1);
|
|
|
|
return; // nothing changed
|
|
|
|
}
|
|
|
|
MSG_WriteBits(msg, 1, 1);
|
|
|
|
|
|
|
|
key ^= to->servertime;
|
|
|
|
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->angles[0], to->angles[0], 16);
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->angles[1], to->angles[1], 16);
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->angles[2], to->angles[2], 16);
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->forwardmove, to->forwardmove, 8);
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->sidemove, to->sidemove, 8 );
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->upmove, to->upmove, 8);
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->buttons, to->buttons, 16);
|
|
|
|
MSG_WriteDeltaKey(msg, key, from->weapon, to->weapon, 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void VARGS CLQ3_SendClientCommand(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list argptr;
|
|
|
|
char command[MAX_STRING_CHARS];
|
|
|
|
|
|
|
|
va_start( argptr, fmt );
|
2011-07-22 15:11:35 +00:00
|
|
|
vsnprintf( command, sizeof(command), fmt, argptr );
|
2005-08-26 22:50:31 +00:00
|
|
|
va_end( argptr );
|
|
|
|
|
|
|
|
// create new clientCommand
|
|
|
|
ccs.numClientCommands++;
|
|
|
|
|
|
|
|
// check if server will lose some of our clientCommands
|
|
|
|
if(ccs.numClientCommands - ccs.lastClientCommandNum >= TEXTCMD_BACKUP)
|
|
|
|
Host_EndGame("Client command overflow");
|
|
|
|
|
|
|
|
Q_strncpyz(ccs.clientCommands[ccs.numClientCommands & TEXTCMD_MASK], command, sizeof(ccs.clientCommands[0]));
|
|
|
|
Con_DPrintf("Sending %s\n", command);
|
|
|
|
}
|
|
|
|
|
|
|
|
void CLQ3_SendCmd(usercmd_t *cmd)
|
|
|
|
{
|
|
|
|
char *string;
|
|
|
|
int i;
|
|
|
|
char data[MAX_OVERALLMSGLEN];
|
|
|
|
sizebuf_t msg;
|
2013-03-12 22:53:23 +00:00
|
|
|
outframe_t *frame, *oldframe;
|
2005-08-26 22:50:31 +00:00
|
|
|
int cmdcount, key;
|
|
|
|
usercmd_t *to, *from;
|
2005-09-08 22:52:46 +00:00
|
|
|
extern int keycatcher;
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
if (cls.resendinfo)
|
|
|
|
{
|
|
|
|
cls.resendinfo = false;
|
2011-01-29 19:53:38 +00:00
|
|
|
CLQ3_SendClientCommand("userinfo \"%s\"", cls.userinfo[0]);
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//reuse the q1 array
|
2014-06-12 23:08:42 +00:00
|
|
|
cmd->servertime = cl.servertime*1000;
|
2005-08-26 22:50:31 +00:00
|
|
|
cmd->weapon = ccs.selected_weapon;
|
|
|
|
|
|
|
|
cmd->forwardmove *= 127/400.0f;
|
|
|
|
cmd->sidemove *= 127/400.0f;
|
|
|
|
cmd->upmove *= 127/400.0f;
|
2014-02-11 17:51:29 +00:00
|
|
|
if (cmd->forwardmove > 127)
|
|
|
|
cmd->forwardmove = 127;
|
|
|
|
if (cmd->forwardmove < -127)
|
|
|
|
cmd->forwardmove = -127;
|
|
|
|
if (cmd->sidemove > 127)
|
|
|
|
cmd->sidemove = 127;
|
|
|
|
if (cmd->sidemove < -127)
|
|
|
|
cmd->sidemove = -127;
|
|
|
|
if (cmd->upmove > 127)
|
|
|
|
cmd->upmove = 127;
|
|
|
|
if (cmd->upmove < -127)
|
|
|
|
cmd->upmove = -127;
|
2005-08-26 22:50:31 +00:00
|
|
|
|
2005-09-08 22:52:46 +00:00
|
|
|
if (cmd->buttons & 2) //jump
|
|
|
|
{
|
|
|
|
cmd->upmove = 100;
|
|
|
|
cmd->buttons &= ~2;
|
|
|
|
}
|
2013-10-08 14:28:11 +00:00
|
|
|
if (Key_Dest_Has(~kdm_game) || (keycatcher&3))
|
2005-09-08 22:52:46 +00:00
|
|
|
cmd->buttons |= 2; //add in the 'at console' button
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
cl.outframes[cl.movesequence&CMD_MASK].cmd[0] = *cmd;
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
frame = &cl.outframes[cls.netchan.outgoing_sequence & CMD_MASK];
|
|
|
|
frame->cmd_sequence = cl.movesequence++;
|
2005-08-26 22:50:31 +00:00
|
|
|
frame->server_message_num = ccs.serverMessageNum;
|
|
|
|
frame->server_time = cl.gametime;
|
|
|
|
frame->client_time = Sys_DoubleTime()*1000;
|
|
|
|
|
|
|
|
memset(&msg, 0, sizeof(msg));
|
|
|
|
msg.maxsize = sizeof(data);
|
|
|
|
msg.data = data;
|
|
|
|
msg.packing = SZ_HUFFMAN;
|
|
|
|
|
|
|
|
MSG_WriteBits(&msg, cl.servercount, 32);
|
|
|
|
MSG_WriteBits(&msg, ccs.serverMessageNum, 32);
|
|
|
|
MSG_WriteBits(&msg, ccs.lastServerCommandNum, 32);
|
|
|
|
|
|
|
|
// write clientCommands not acknowledged by server yet
|
|
|
|
for (i=ccs.lastClientCommandNum+1; i<=ccs.numClientCommands; i++)
|
|
|
|
{
|
|
|
|
MSG_WriteBits(&msg, clcq3_clientCommand, 8);
|
|
|
|
MSG_WriteBits(&msg, i, 32);
|
|
|
|
string = ccs.clientCommands[i & TEXTCMD_MASK];
|
|
|
|
while(*string)
|
|
|
|
MSG_WriteBits(&msg, *string++, 8);
|
|
|
|
MSG_WriteBits(&msg, 0, 8);
|
|
|
|
}
|
|
|
|
|
2014-06-12 23:08:42 +00:00
|
|
|
i = (cls.netchan.outgoing_sequence-1);
|
|
|
|
oldframe = &cl.outframes[i & CMD_MASK];
|
2013-06-23 02:17:02 +00:00
|
|
|
cmdcount = cl.movesequence - oldframe->cmd_sequence;
|
2014-06-12 23:08:42 +00:00
|
|
|
if (cmdcount > CMD_MASK)
|
|
|
|
cmdcount = CMD_MASK;
|
2005-08-26 22:50:31 +00:00
|
|
|
// begin a client move command, if any
|
|
|
|
if( cmdcount )
|
|
|
|
{
|
2009-03-03 01:52:30 +00:00
|
|
|
extern cvar_t cl_nodelta;
|
|
|
|
if(cl_nodelta.value || !ccs.snap.valid ||
|
2005-08-26 22:50:31 +00:00
|
|
|
ccs.snap.serverMessageNum != ccs.serverMessageNum)
|
|
|
|
MSG_WriteBits(&msg, clcq3_nodeltaMove, 8); // no compression
|
|
|
|
else
|
2011-05-15 13:23:13 +00:00
|
|
|
MSG_WriteBits(&msg, clcq3_move, 8);
|
2005-08-26 22:50:31 +00:00
|
|
|
|
|
|
|
// write cmdcount
|
|
|
|
MSG_WriteBits(&msg, cmdcount, 8);
|
|
|
|
|
|
|
|
// calculate key
|
|
|
|
string = ccs.serverCommands[ccs.lastServerCommandNum & TEXTCMD_MASK];
|
|
|
|
key = ccs.fs_key ^ ccs.serverMessageNum ^ StringKey(string, 32);
|
|
|
|
|
|
|
|
// send this and the previous cmds in the message, so
|
|
|
|
// if the last packet was dropped, it can be recovered
|
|
|
|
from = &nullcmd;
|
2014-06-12 23:08:42 +00:00
|
|
|
for (i = cl.movesequence-cmdcount; i < cl.movesequence; i++)
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
2013-03-12 22:53:23 +00:00
|
|
|
to = &cl.outframes[i&CMD_MASK].cmd[0];
|
2005-08-26 22:50:31 +00:00
|
|
|
MSG_Q3_WriteDeltaUsercmd( &msg, key, from, to );
|
|
|
|
from = to;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MSG_WriteBits(&msg, clcq3_eom, 8);
|
|
|
|
|
|
|
|
CL_Netchan_Transmit( msg.cursize, msg.data );
|
|
|
|
while(cls.netchan.reliable_length)
|
|
|
|
Netchan_TransmitNextFragment(&cls.netchan);
|
|
|
|
}
|
|
|
|
|
2013-05-03 04:28:08 +00:00
|
|
|
void CLQ3_SendAuthPacket(netadr_t *gameserver)
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
|
|
|
char data[2048];
|
|
|
|
sizebuf_t msg;
|
|
|
|
|
|
|
|
//send the auth packet
|
|
|
|
//this should be the right code, but it doesn't work.
|
2013-05-03 04:28:08 +00:00
|
|
|
if (gameserver->type == NA_IP)
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
|
|
|
char *key = Cvar_Get("cl_cdkey", "", 0, "Quake3 auth")->string;
|
|
|
|
netadr_t authaddr;
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
#define Q3_AUTHORIZE_SERVER_NAME "authorize.quake3arena.com:27952"
|
2005-08-26 22:50:31 +00:00
|
|
|
if (*key)
|
|
|
|
{
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
Con_Printf("Resolving %s\n", Q3_AUTHORIZE_SERVER_NAME);
|
2013-03-12 22:53:23 +00:00
|
|
|
if (NET_StringToAdr(Q3_AUTHORIZE_SERVER_NAME, 0, &authaddr))
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
|
|
|
msg.data = data;
|
|
|
|
msg.cursize = 0;
|
|
|
|
msg.overflowed = msg.allowoverflow = 0;
|
|
|
|
msg.maxsize = sizeof(data);
|
|
|
|
MSG_WriteLong(&msg, -1);
|
|
|
|
MSG_WriteString(&msg, "getKeyAuthorize 0 ");
|
|
|
|
msg.cursize--;
|
|
|
|
while(*key)
|
|
|
|
{
|
|
|
|
if ((*key >= 'a' && *key <= 'z') || (*key >= 'A' && *key <= 'Z') || (*key >= '0' && *key <= '9'))
|
|
|
|
MSG_WriteByte(&msg, *key);
|
|
|
|
key++;
|
|
|
|
}
|
|
|
|
MSG_WriteByte(&msg, 0);
|
|
|
|
|
2013-05-03 04:28:08 +00:00
|
|
|
NET_SendPacket (NS_CLIENT, msg.cursize, msg.data, &authaddr);
|
2005-08-26 22:50:31 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
Con_Printf(" failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-03 04:28:08 +00:00
|
|
|
void CLQ3_SendConnectPacket(netadr_t *to)
|
2005-08-26 22:50:31 +00:00
|
|
|
{
|
|
|
|
char data[2048];
|
2008-06-08 14:37:57 +00:00
|
|
|
char adrbuf[MAX_ADR_SIZE];
|
2005-08-26 22:50:31 +00:00
|
|
|
sizebuf_t msg;
|
|
|
|
|
|
|
|
memset(&ccs, 0, sizeof(ccs));
|
|
|
|
|
|
|
|
cl.splitclients = 1;
|
|
|
|
msg.data = data;
|
|
|
|
msg.cursize = 0;
|
|
|
|
msg.overflowed = msg.allowoverflow = 0;
|
|
|
|
msg.maxsize = sizeof(data);
|
|
|
|
MSG_WriteLong(&msg, -1);
|
2013-05-03 04:28:08 +00:00
|
|
|
MSG_WriteString(&msg, va("connect \"\\challenge\\%i\\qport\\%i\\protocol\\%i\\ip\\%s%s\"", cls.challenge, cls.qport, PROTOCOL_VERSION_Q3, NET_AdrToString (adrbuf, sizeof(adrbuf), &net_local_cl_ipadr), cls.userinfo[0]));
|
2014-05-10 13:42:13 +00:00
|
|
|
#ifdef HUFFNETWORK
|
2005-08-26 22:50:31 +00:00
|
|
|
Huff_EncryptPacket(&msg, 12);
|
2014-05-10 13:42:13 +00:00
|
|
|
if (!Huff_CompressionCRC(HUFFCRC_QUAKE3))
|
|
|
|
{
|
|
|
|
Con_Printf("Huffman compression error\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2005-08-26 22:50:31 +00:00
|
|
|
NET_SendPacket (NS_CLIENT, msg.cursize, msg.data, to);
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
#endif
|
|
|
|
|