ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-12-01 00:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)

Browse source
This commit is contained in:
Zack Middleton 2012-12-16 00:15:14 +00:00
parent aac23d6934
commit 8ef0f36a3f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/qcommon/msg.c
View file

@ -562,7 +562,7 @@ delta functions
extern cvar_t *cl_shownet; extern cvar_t *cl_shownet;
#define LOG(x) if( cl_shownet->integer == 4 ) { Com_Printf("%s ", x ); }; #define LOG(x) if( cl_shownet && cl_shownet->integer == 4 ) { Com_Printf("%s ", x ); };
void MSG_WriteDelta( msg_t *msg, int oldV, int newV, int bits ) { void MSG_WriteDelta( msg_t *msg, int oldV, int newV, int bits ) {
if ( oldV == newV ) { if ( oldV == newV ) {
@ -1050,7 +1050,7 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
if ( MSG_ReadBits( msg, 1 ) == 1 ) { if ( MSG_ReadBits( msg, 1 ) == 1 ) {
Com_Memset( to, 0, sizeof( *to ) ); Com_Memset( to, 0, sizeof( *to ) );
to->number = MAX_GENTITIES - 1; to->number = MAX_GENTITIES - 1;
if ( cl_shownet->integer >= 2 || cl_shownet->integer == -1 ) { if ( cl_shownet && ( cl_shownet->integer >= 2 || cl_shownet->integer == -1 ) ) {
Com_Printf( "%3i: #%-3i remove\n", msg->readcount, number ); Com_Printf( "%3i: #%-3i remove\n", msg->readcount, number );
} }
return; return;
@ -1072,7 +1072,7 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
// shownet 2/3 will interleave with other printed info, -1 will // shownet 2/3 will interleave with other printed info, -1 will
// just print the delta records` // just print the delta records`
if ( cl_shownet->integer >= 2 || cl_shownet->integer == -1 ) { if ( cl_shownet && ( cl_shownet->integer >= 2 || cl_shownet->integer == -1 ) ) {
print = 1; print = 1;
Com_Printf( "%3i: #%-3i ", msg->readcount, to->number ); Com_Printf( "%3i: #%-3i ", msg->readcount, to->number );
} else { } else {
@ -1389,7 +1389,7 @@ void MSG_ReadDeltaPlayerstate (msg_t *msg, playerState_t *from, playerState_t *t
// shownet 2/3 will interleave with other printed info, -2 will // shownet 2/3 will interleave with other printed info, -2 will
// just print the delta records // just print the delta records
if ( cl_shownet->integer >= 2 || cl_shownet->integer == -2 ) { if ( cl_shownet && ( cl_shownet->integer >= 2 || cl_shownet->integer == -2 ) ) {
print = 1; print = 1;
Com_Printf( "%3i: playerstate ", msg->readcount ); Com_Printf( "%3i: playerstate ", msg->readcount );
} else { } else {