From 68220d1fb0f7845dfb0e61df68e994e285c6d31f Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 1 Mar 2001 20:41:20 +0000 Subject: [PATCH] fix up packet logging for the new msg stuff --- qw/source/cl_main.c | 2 +- qw/source/net_packetlog.c | 382 +++++++++++++++++++------------------- 2 files changed, 192 insertions(+), 192 deletions(-) diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index ab37d4ddc..b55f209c5 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -1022,7 +1022,7 @@ CL_ReadPackets (void) while (CL_GetMessage ()) { #ifdef PACKET_LOGGING - if (cls.demoplayback) Log_Incoming_Packet(net_message.data,net_message.cursize); + if (cls.demoplayback) Log_Incoming_Packet(net_message->message->data,net_message->message->cursize); #endif // // remote command packet diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c index 81e275915..73f357ed0 100644 --- a/qw/source/net_packetlog.c +++ b/qw/source/net_packetlog.c @@ -319,72 +319,72 @@ Log_Delta(int bits) bits &= ~511; if (bits & U_MOREBITS) { // read in the low order bits - i = MSG_ReadByte (); + i = MSG_ReadByte (net_message); bits |= i; } // LordHavoc: Endy neglected to mark this as being part of the QSG // version 2 stuff... if (bits & U_EXTEND1) { - bits |= MSG_ReadByte () << 16; + bits |= MSG_ReadByte (net_message) << 16; if (bits & U_EXTEND2) - bits |= MSG_ReadByte () << 24; + bits |= MSG_ReadByte (net_message) << 24; } to.flags = bits; if (bits & U_MODEL) - Net_LogPrintf (" MdlIdx: %d", MSG_ReadByte ()); + Net_LogPrintf (" MdlIdx: %d", MSG_ReadByte (net_message)); if (bits & U_FRAME) { - to.frame = MSG_ReadByte (); + to.frame = MSG_ReadByte (net_message); Net_LogPrintf (" Frame: %d", to.frame); } if (bits & U_COLORMAP) - Net_LogPrintf (" Colormap: %d", MSG_ReadByte ()); + Net_LogPrintf (" Colormap: %d", MSG_ReadByte (net_message)); if (bits & U_SKIN) - Net_LogPrintf (" Skinnum: %d", MSG_ReadByte ()); + Net_LogPrintf (" Skinnum: %d", MSG_ReadByte (net_message)); if (bits & U_EFFECTS) { - to.effects = MSG_ReadByte (); + to.effects = MSG_ReadByte (net_message); Net_LogPrintf (" Effects: %d", to.effects); } if (bits & U_ORIGIN1) - Net_LogPrintf (" X: %f", MSG_ReadCoord ()); + Net_LogPrintf (" X: %f", MSG_ReadCoord (net_message)); if (bits & U_ANGLE1) - Net_LogPrintf (" Pitch: %d", MSG_ReadAngle ()); + Net_LogPrintf (" Pitch: %d", MSG_ReadAngle (net_message)); if (bits & U_ORIGIN2) - Net_LogPrintf (" Y: %f", MSG_ReadCoord ()); + Net_LogPrintf (" Y: %f", MSG_ReadCoord (net_message)); if (bits & U_ANGLE2) - Net_LogPrintf (" Yaw: %d", MSG_ReadAngle ()); + Net_LogPrintf (" Yaw: %d", MSG_ReadAngle (net_message)); if (bits & U_ORIGIN3) - Net_LogPrintf (" Z: %f", MSG_ReadCoord ()); + Net_LogPrintf (" Z: %f", MSG_ReadCoord (net_message)); if (bits & U_ANGLE3) - Net_LogPrintf (" Roll: %d", MSG_ReadAngle ()); + Net_LogPrintf (" Roll: %d", MSG_ReadAngle (net_message)); // Ender (QSG - Begin) if (bits & U_ALPHA) - Net_LogPrintf(" Alpha: %d", MSG_ReadByte ()); + Net_LogPrintf(" Alpha: %d", MSG_ReadByte (net_message)); if (bits & U_SCALE) - Net_LogPrintf(" Scale: %d", MSG_ReadByte ()); + Net_LogPrintf(" Scale: %d", MSG_ReadByte (net_message)); if (bits & U_EFFECTS2) - Net_LogPrintf(" U_EFFECTS2: %d", (to.effects & 0xFF) | (MSG_ReadByte () << 8)); + Net_LogPrintf(" U_EFFECTS2: %d", (to.effects & 0xFF) | (MSG_ReadByte (net_message) << 8)); if (bits & U_GLOWSIZE) - Net_LogPrintf(" GlowSize: %d", MSG_ReadByte ()); + Net_LogPrintf(" GlowSize: %d", MSG_ReadByte (net_message)); if (bits & U_GLOWCOLOR) - Net_LogPrintf(" ColorGlow: %d", MSG_ReadByte ()); + Net_LogPrintf(" ColorGlow: %d", MSG_ReadByte (net_message)); if (bits & U_COLORMOD) - Net_LogPrintf(" Colormod: %d", MSG_ReadByte ()); + Net_LogPrintf(" Colormod: %d", MSG_ReadByte (net_message)); if (bits & U_FRAME2) - Net_LogPrintf(" Uframe2: %d", ((to.frame & 0xFF) | (MSG_ReadByte () << 8))); + Net_LogPrintf(" Uframe2: %d", ((to.frame & 0xFF) | (MSG_ReadByte (net_message) << 8))); // Ender (QSG - End) return; @@ -398,16 +398,16 @@ Analyze_Server_Packet (byte * data, int len) byte *safe; int slen; // FIXME: quick-hack - safe=net_message.data; - slen=net_message.cursize; + safe=net_message->message->data; + slen=net_message->message->cursize; - net_message.data = data; - net_message.cursize = len; - MSG_BeginReading (); + net_message->message->data = data; + net_message->message->cursize = len; + MSG_BeginReading (net_message); Parse_Server_Packet (); // net_message.data = net_message_buffer; - net_message.data = safe; - net_message.cursize = slen; + net_message->message->data = safe; + net_message->message->cursize = slen; } @@ -418,15 +418,15 @@ Parse_Server_Packet () int c, i, ii, iii, mask1, mask2; char *s; - seq1 = MSG_ReadLong (); - if (msg_badread) + seq1 = MSG_ReadLong (net_message); + if (net_message->badread) return; if (seq1 == -1) { Net_LogPrintf ("Special Packet"); } else { - seq2 = MSG_ReadLong (); + seq2 = MSG_ReadLong (net_message); // FIXME: display seqs right when reliable Net_LogPrintf ("\nSeq: %ld Ack: %ld ", seq1 & 0x7FFFFFFF, seq2 & 0x7FFFFFFF); @@ -438,19 +438,19 @@ Parse_Server_Packet () Net_LogPrintf ("\n"); while (1) { - if (msg_badread) + if (net_message->badread) break; - c = MSG_ReadByte (); + c = MSG_ReadByte (net_message); if (c == -1) break; // Net_LogPrintf("\n<%ld,%ld> ",seq1 & 0x7FFFFFFF,seq2 & 0x7FFFFFFF); - Net_LogPrintf ("<%06x> [0x%02x] ", MSG_GetReadCount (), c); + Net_LogPrintf ("<%06x> [0x%02x] ", MSG_GetReadCount (net_message), c); if (c < 53) Net_LogPrintf ("%s: ", svc_string[c]); // else Net_LogPrintf("(UNK: %d): ",c); - if (MSG_GetReadCount () > net_message.cursize) + if (MSG_GetReadCount (net_message) > net_message->message->cursize) return; switch (c) { @@ -463,8 +463,8 @@ Parse_Server_Packet () Net_LogPrintf (" "); break; case svc_updatestat: - i = MSG_ReadByte (); - Net_LogPrintf (" index: %d value: %d", i, MSG_ReadByte ()); + i = MSG_ReadByte (net_message); + Net_LogPrintf (" index: %d value: %d", i, MSG_ReadByte (net_message)); break; case svc_version: #ifdef QUAKEWORLD @@ -475,25 +475,25 @@ Parse_Server_Packet () #ifdef QUAKEWORLD Net_LogPrintf ("**QW OBSOLETE**"); #else - MSG_ReadShort (); + MSG_ReadShort (net_message); #endif break; case svc_sound: - i = MSG_ReadShort (); + i = MSG_ReadShort (net_message); Net_LogPrintf (": (%d) ", i); if (i & SND_VOLUME) - Net_LogPrintf ("Volume %d ", MSG_ReadByte ()); + Net_LogPrintf ("Volume %d ", MSG_ReadByte (net_message)); if (i & SND_ATTENUATION) Net_LogPrintf ("Ann: %f", - (float) MSG_ReadByte () / 64.0); - ii = MSG_ReadByte (); + (float) MSG_ReadByte (net_message) / 64.0); + ii = MSG_ReadByte (net_message); // FIXME: well, cl. for client :-) // Net_LogPrintf ("%d (%s) ", ii, sv.sound_precache[ii]); Net_LogPrintf ("%d (%s) ", ii); Net_LogPrintf ("Pos: "); for (ii = 0; ii < 3; ii++) - Net_LogPrintf ("%f ", MSG_ReadCoord ()); + Net_LogPrintf ("%f ", MSG_ReadCoord (net_message)); Net_LogPrintf ("Ent: %d ", (i >> 3) & 1023); Net_LogPrintf ("Channel %d ", i & 7); break; @@ -501,49 +501,49 @@ Parse_Server_Packet () #ifdef QUAKEWORLD Net_LogPrintf ("**QW OBSOLETE**\n"); #else - MSG_ReadFloat (); + MSG_ReadFloat (net_message); #endif break; case svc_print: // FIXME: i==PRINT_CHAT - Net_LogPrintf (" [%d]", MSG_ReadByte ()); - Net_LogPrintf (" %s", MSG_ReadString ()); + Net_LogPrintf (" [%d]", MSG_ReadByte (net_message)); + Net_LogPrintf (" %s", MSG_ReadString (net_message)); break; case svc_stufftext: - Net_LogPrintf ("%s", MSG_ReadString ()); + Net_LogPrintf ("%s", MSG_ReadString (net_message)); break; case svc_setangle: for (i = 0; i < 3; i++) - Net_LogPrintf ("%f ", MSG_ReadAngle ()); + Net_LogPrintf ("%f ", MSG_ReadAngle (net_message)); break; #ifdef QUAKEWORLD case svc_serverdata: - Net_LogPrintf ("Ver: %ld", MSG_ReadLong ()); - Net_LogPrintf (" Client ID: %ld", MSG_ReadLong ()); - Net_LogPrintf (" Dir: %s", MSG_ReadString ()); - Net_LogPrintf (" User ID: %d", MSG_ReadByte ()); - Net_LogPrintf (" Map: %s", MSG_ReadString ()); + Net_LogPrintf ("Ver: %ld", MSG_ReadLong (net_message)); + Net_LogPrintf (" Client ID: %ld", MSG_ReadLong (net_message)); + Net_LogPrintf (" Dir: %s", MSG_ReadString (net_message)); + Net_LogPrintf (" User ID: %d", MSG_ReadByte (net_message)); + Net_LogPrintf (" Map: %s", MSG_ReadString (net_message)); for (i = 0; i < 10; i++) - MSG_ReadFloat (); + MSG_ReadFloat (net_message); break; #endif case svc_lightstyle: - i = MSG_ReadByte (); + i = MSG_ReadByte (net_message); if (i >= MAX_LIGHTSTYLES) return; - Net_LogPrintf ("%d %s", i, MSG_ReadString ()); + Net_LogPrintf ("%d %s", i, MSG_ReadString (net_message)); break; case svc_updatename: #ifdef QUAKEWORLD Net_LogPrintf ("**QW OBSOLETE**"); #else - Net_LogPrintf ("%d %s", MSG_ReadByte (), MSG_ReadString ()); + Net_LogPrintf ("%d %s", MSG_ReadByte (net_message), MSG_ReadString ()); #endif break; case svc_updatefrags: - Net_LogPrintf ("player: %d frags: %d", MSG_ReadByte (), - MSG_ReadShort ()); + Net_LogPrintf ("player: %d frags: %d", MSG_ReadByte (net_message), + MSG_ReadShort (net_message)); break; case svc_clientdata: #ifdef QUAKEWORLD @@ -551,14 +551,14 @@ Parse_Server_Packet () #endif break; case svc_stopsound: - Net_LogPrintf ("%d", MSG_ReadShort ()); + Net_LogPrintf ("%d", MSG_ReadShort (net_message)); break; case svc_updatecolors: #ifdef QUAKEWORLD Net_LogPrintf ("**QW OBSOLETE**"); #else - Net_LogPrintf ("%d %d", MSG_ReadByte (), MSG_ReadByte ()); + Net_LogPrintf ("%d %d", MSG_ReadByte (net_message), MSG_ReadByte ()); #endif break; case svc_particle: @@ -566,46 +566,46 @@ Parse_Server_Packet () Net_LogPrintf ("**QW OBSOLETE**"); #else for (i = 0; i < 3; i++) - Net_LogPrintf (" %f", MSG_ReadCoord ()); + Net_LogPrintf (" %f", MSG_ReadCoord (net_message)); for (i = 0; i < 3; i++) - Net_LogPrintf (" %d", MSG_ReadChar ()); - Net_LogPrintf (" Count: %d", MSG_ReadByte ()); - Net_LogPrintf (" Color: %d", MSG_ReadByte ()); + Net_LogPrintf (" %d", MSG_ReadChar (net_message)); + Net_LogPrintf (" Count: %d", MSG_ReadByte (net_message)); + Net_LogPrintf (" Color: %d", MSG_ReadByte (net_message)); #endif break; case svc_damage: // FIXME: parse damage - Net_LogPrintf ("armor: %d health: %d", MSG_ReadByte (), - MSG_ReadByte ()); - Net_LogPrintf (" from %f,%f,%f", MSG_ReadCoord (), - MSG_ReadCoord (), MSG_ReadCoord ()); + Net_LogPrintf ("armor: %d health: %d", MSG_ReadByte (net_message), + MSG_ReadByte (net_message)); + Net_LogPrintf (" from %f,%f,%f", MSG_ReadCoord (net_message), + MSG_ReadCoord (net_message), MSG_ReadCoord (net_message)); break; case svc_spawnstatic: - Net_LogPrintf ("%d", MSG_ReadByte ()); + Net_LogPrintf ("Model: %d", MSG_ReadByte (net_message)); Net_LogPrintf (" Frame: %d Color: %d Skin: %", - MSG_ReadByte (), MSG_ReadByte (), - MSG_ReadByte ()); + MSG_ReadByte (net_message), MSG_ReadByte (net_message), + MSG_ReadByte (net_message)); for (i = 0; i < 3; i++) - Net_LogPrintf ("%d: %f %f", i + 1, MSG_ReadCoord (), - MSG_ReadAngle ()); + Net_LogPrintf ("%d: %f %f", i + 1, MSG_ReadCoord (net_message), + MSG_ReadAngle (net_message)); break; case svc_spawnbinary: Net_LogPrintf ("**OBSOLETE**"); break; case svc_spawnbaseline: - Net_LogPrintf ("%d", MSG_ReadShort ()); - Net_LogPrintf (" idx: %d", MSG_ReadByte ()); - Net_LogPrintf (" Frame: %d", MSG_ReadByte ()); - Net_LogPrintf (" Colormap: %d", MSG_ReadByte ()); - Net_LogPrintf (" Skin: %d", MSG_ReadByte ()); + Net_LogPrintf ("%d", MSG_ReadShort (net_message)); + Net_LogPrintf (" idx: %d", MSG_ReadByte (net_message)); + Net_LogPrintf (" Frame: %d", MSG_ReadByte (net_message)); + Net_LogPrintf (" Colormap: %d", MSG_ReadByte (net_message)); + Net_LogPrintf (" Skin: %d", MSG_ReadByte (net_message)); for (i = 0; i < 3; i++) { - Net_LogPrintf (" %f", MSG_ReadCoord ()); - Net_LogPrintf (" %d", MSG_ReadAngle ()); + Net_LogPrintf (" %f", MSG_ReadCoord (net_message)); + Net_LogPrintf (" %d", MSG_ReadAngle (net_message)); }; break; case svc_temp_entity: - i = MSG_ReadByte (); + i = MSG_ReadByte (net_message); switch (i) { case 0: case 1: @@ -616,25 +616,25 @@ Parse_Server_Packet () case 10: case 11: case 13: - Net_LogPrintf (" origin %f %f %f", MSG_ReadCoord (), - MSG_ReadCoord (), MSG_ReadCoord ()); + Net_LogPrintf (" origin %f %f %f", MSG_ReadCoord (net_message), + MSG_ReadCoord (net_message), MSG_ReadCoord (net_message)); break; case 5: case 6: case 9: - Net_LogPrintf (" created by %d", MSG_ReadShort ()); + Net_LogPrintf (" created by %d", MSG_ReadShort (net_message)); Net_LogPrintf (" origin: %f,%f,%f", - MSG_ReadCoord (), MSG_ReadCoord (), - MSG_ReadCoord ()); + MSG_ReadCoord (net_message), MSG_ReadCoord (net_message), + MSG_ReadCoord (net_message)); Net_LogPrintf (" trace endpos: %f,%f,%f", - MSG_ReadCoord (), MSG_ReadCoord (), - MSG_ReadCoord ()); + MSG_ReadCoord (net_message), MSG_ReadCoord (net_message), + MSG_ReadCoord (net_message)); break; case 2: case 12: - Net_LogPrintf (" count: %d", MSG_ReadByte ()); - printf (" origin: %f,%f,%f", MSG_ReadCoord (), - MSG_ReadCoord (), MSG_ReadCoord ()); + Net_LogPrintf (" count: %d", MSG_ReadByte (net_message)); + printf (" origin: %f,%f,%f", MSG_ReadCoord (net_message), + MSG_ReadCoord (net_message), MSG_ReadCoord (net_message)); break; default: Net_LogPrintf (" unknown value %d for tempentity", @@ -644,40 +644,40 @@ Parse_Server_Packet () break; case svc_setpause: - Net_LogPrintf (" %d", MSG_ReadByte ()); + Net_LogPrintf (" %d", MSG_ReadByte (net_message)); break; case svc_signonnum: #ifdef QUAKEWORLD Net_LogPrintf ("**QW OBSOLETE**"); #else - Net_LogPrintf ("%d", MSG_ReadByte ()); + Net_LogPrintf ("%d", MSG_ReadByte (net_message)); #endif break; case svc_centerprint: - Net_LogPrintf (MSG_ReadString ()); + Net_LogPrintf (MSG_ReadString (net_message)); break; case svc_killedmonster: break; case svc_foundsecret: break; case svc_spawnstaticsound: - Net_LogPrintf ("pos %f,%f,%f", MSG_ReadCoord (), - MSG_ReadCoord (), MSG_ReadCoord ()); - Net_LogPrintf ("%d %d %d", MSG_ReadByte (), MSG_ReadByte (), - MSG_ReadByte ()); + Net_LogPrintf ("pos %f,%f,%f", MSG_ReadCoord (net_message), + MSG_ReadCoord (net_message), MSG_ReadCoord (net_message)); + Net_LogPrintf ("%d %d %d", MSG_ReadByte (net_message), MSG_ReadByte (net_message), + MSG_ReadByte (net_message)); break; case svc_intermission: for (i = 0; i < 3; i++) - Net_LogPrintf ("%f ", MSG_ReadCoord ()); + Net_LogPrintf ("%f ", MSG_ReadCoord (net_message)); Net_LogPrintf ("\n"); for (i = 0; i < 3; i++) - Net_LogPrintf ("%f ", MSG_ReadAngle ()); + Net_LogPrintf ("%f ", MSG_ReadAngle (net_message)); break; case svc_finale: - Net_LogPrintf ("%s", MSG_ReadString ()); + Net_LogPrintf ("%s", MSG_ReadString (net_message)); break; case svc_cdtrack: - Net_LogPrintf ("%d", MSG_ReadByte ()); + Net_LogPrintf ("%d", MSG_ReadByte (net_message)); break; case svc_sellscreen: break; @@ -686,98 +686,98 @@ Parse_Server_Packet () case svc_bigkick: break; case svc_updateping: - Net_LogPrintf ("Player: %d ", MSG_ReadByte ()); - Net_LogPrintf ("Ping: %d", MSG_ReadShort ()); + Net_LogPrintf ("Player: %d ", MSG_ReadByte (net_message)); + Net_LogPrintf ("Ping: %d", MSG_ReadShort (net_message)); break; case svc_updateentertime: - Net_LogPrintf ("Player: %d ", MSG_ReadByte ()); - Net_LogPrintf ("Time: %f", MSG_ReadFloat ()); + Net_LogPrintf ("Player: %d ", MSG_ReadByte (net_message)); + Net_LogPrintf ("Time: %f", MSG_ReadFloat (net_message)); break; case svc_updatestatlong: - i = MSG_ReadByte (); - Net_LogPrintf ("%d value: %ld", i, MSG_ReadLong ()); + i = MSG_ReadByte (net_message); + Net_LogPrintf ("%d value: %ld", i, MSG_ReadLong (net_message)); break; case svc_muzzleflash: - Net_LogPrintf ("%d", MSG_ReadShort ()); + Net_LogPrintf ("%d", MSG_ReadShort (net_message)); break; case svc_updateuserinfo: - Net_LogPrintf ("Player: %d ", MSG_ReadByte ()); - Net_LogPrintf ("ID: %ld ", MSG_ReadLong ()); - Net_LogPrintf ("Info: %s", MSG_ReadString ()); + Net_LogPrintf ("Player: %d ", MSG_ReadByte (net_message)); + Net_LogPrintf ("ID: %ld ", MSG_ReadLong (net_message)); + Net_LogPrintf ("Info: %s", MSG_ReadString (net_message)); break; case svc_download: - ii = MSG_ReadShort (); - Net_LogPrintf ("%d bytes at %d", ii, MSG_ReadByte ()); + ii = MSG_ReadShort (net_message); + Net_LogPrintf ("%d bytes at %d", ii, MSG_ReadByte (net_message)); for (i = 0; i < ii; i++) - MSG_ReadByte (); + MSG_ReadByte (net_message); break; case svc_playerinfo: - Net_LogPrintf ("\n\tPlayer: %d", MSG_ReadByte ()); - mask1 = MSG_ReadShort (); + Net_LogPrintf ("\n\tPlayer: %d", MSG_ReadByte (net_message)); + mask1 = MSG_ReadShort (net_message); Net_LogPrintf (" Mask1: %d", mask1); - Net_LogPrintf (" Origin: %f,%f,%f", MSG_ReadCoord (), - MSG_ReadCoord (), MSG_ReadCoord ()); - Net_LogPrintf (" Frame: %d", MSG_ReadByte ()); + Net_LogPrintf (" Origin: %f,%f,%f", MSG_ReadCoord (net_message), + MSG_ReadCoord (net_message), MSG_ReadCoord (net_message)); + Net_LogPrintf (" Frame: %d", MSG_ReadByte (net_message)); if (mask1 & PF_MSEC) - Net_LogPrintf (" Ping: %d", MSG_ReadByte ()); + Net_LogPrintf (" Ping: %d", MSG_ReadByte (net_message)); if (mask1 & PF_COMMAND) { - mask2 = MSG_ReadByte (); // command + mask2 = MSG_ReadByte (net_message); // command if (mask2 & 0x01) - Net_LogPrintf (" Pitch: %f", MSG_ReadAngle16 ()); + Net_LogPrintf (" Pitch: %f", MSG_ReadAngle16 (net_message)); if (mask2 & 0x80) - Net_LogPrintf (" Yaw: %f", MSG_ReadAngle16 ()); + Net_LogPrintf (" Yaw: %f", MSG_ReadAngle16 (net_message)); if (mask2 & 0x02) - Net_LogPrintf (" Roll: %f", MSG_ReadAngle16 ()); + Net_LogPrintf (" Roll: %f", MSG_ReadAngle16 (net_message)); if (mask2 & 0x04) - Net_LogPrintf (" Speed1: %d", MSG_ReadShort ()); + Net_LogPrintf (" Speed1: %d", MSG_ReadShort (net_message)); if (mask2 & 0x08) - Net_LogPrintf (" Speed2: %d", MSG_ReadShort ()); + Net_LogPrintf (" Speed2: %d", MSG_ReadShort (net_message)); if (mask2 & 0x10) - Net_LogPrintf (" Speed3: %d", MSG_ReadShort ()); + Net_LogPrintf (" Speed3: %d", MSG_ReadShort (net_message)); if (mask2 & 0x20) - Net_LogPrintf (" Flag: %d", MSG_ReadByte ()); + Net_LogPrintf (" Flag: %d", MSG_ReadByte (net_message)); if (mask2 & 0x40) - Net_LogPrintf (" Impulse: %d", MSG_ReadByte ()); - Net_LogPrintf (" Msec: %d", MSG_ReadByte ()); + Net_LogPrintf (" Impulse: %d", MSG_ReadByte (net_message)); + Net_LogPrintf (" Msec: %d", MSG_ReadByte (net_message)); } if (mask1 & PF_VELOCITY1) - Net_LogPrintf (" Xspd: %f", MSG_ReadCoord ()); + Net_LogPrintf (" Xspd: %f", MSG_ReadCoord (net_message)); if (mask1 & PF_VELOCITY2) - Net_LogPrintf (" Yspd: %f", MSG_ReadCoord ()); + Net_LogPrintf (" Yspd: %f", MSG_ReadCoord (net_message)); if (mask1 & PF_VELOCITY3) - Net_LogPrintf (" ZSpd: %f", MSG_ReadCoord ()); + Net_LogPrintf (" ZSpd: %f", MSG_ReadCoord (net_message)); if (mask1 & PF_MODEL) - Net_LogPrintf (" Model: %d", MSG_ReadByte ()); + Net_LogPrintf (" Model: %d", MSG_ReadByte (net_message)); if (mask1 & PF_SKINNUM) - Net_LogPrintf (" Skin: %d", MSG_ReadByte ()); + Net_LogPrintf (" Skin: %d", MSG_ReadByte (net_message)); if (mask1 & PF_EFFECTS) - Net_LogPrintf (" Effects: %d", MSG_ReadByte ()); + Net_LogPrintf (" Effects: %d", MSG_ReadByte (net_message)); if (mask1 & PF_WEAPONFRAME) - Net_LogPrintf (" Weapon frame: %d", MSG_ReadByte ()); + Net_LogPrintf (" Weapon frame: %d", MSG_ReadByte (net_message)); break; case svc_nails: - ii = MSG_ReadByte (); + ii = MSG_ReadByte (net_message); Net_LogPrintf (" %d (bits not parsed)", ii); for (i = 0; i < ii; i++) { for (iii = 0; iii < 6; iii++) - MSG_ReadByte (); + MSG_ReadByte (net_message); } break; case svc_chokecount: - Net_LogPrintf ("%d", MSG_ReadByte ()); + Net_LogPrintf ("%d", MSG_ReadByte (net_message)); break; case svc_modellist: - ii = MSG_ReadByte (); + ii = MSG_ReadByte (net_message); Net_LogPrintf ("start %d", ii); for (i = ii; i < 256; i++) { - s = MSG_ReadString (); - if (msg_badread) + s = MSG_ReadString (net_message); + if (net_message->badread) break; if (!s) break; @@ -785,18 +785,18 @@ Parse_Server_Packet () break; Net_LogPrintf ("\n\tModel %d: %s", i, s); } - i = MSG_ReadByte (); + i = MSG_ReadByte (net_message); if (i) Net_LogPrintf ("\n\tnext at %d", i); else Net_LogPrintf ("\n\t*End of modellist*"); break; case svc_soundlist: - ii = MSG_ReadByte (); + ii = MSG_ReadByte (net_message); Net_LogPrintf ("start %d", ii); for (i = ii; i < 256; i++) { - s = MSG_ReadString (); - if (msg_badread) + s = MSG_ReadString (net_message); + if (net_message->badread) break; if (!s) break; @@ -804,7 +804,7 @@ Parse_Server_Packet () break; Net_LogPrintf ("\n\tSound %d: %s", i, s); } - i = MSG_ReadByte (); + i = MSG_ReadByte (net_message); if (i) Net_LogPrintf ("\n\tnext at %d", i); @@ -814,8 +814,8 @@ Parse_Server_Packet () case svc_packetentities: while (1) { - mask1 = (unsigned short) MSG_ReadShort(); - if (msg_badread) { + mask1 = (unsigned short) MSG_ReadShort(net_message); + if (net_message->badread) { Net_LogPrintf ("Badread\n"); return; } @@ -825,27 +825,27 @@ Parse_Server_Packet () } break; case svc_deltapacketentities: - Net_LogPrintf ("idx: %d", MSG_ReadByte ()); + Net_LogPrintf ("idx: %d", MSG_ReadByte (net_message)); return; break; case svc_maxspeed: - Net_LogPrintf ("%f", MSG_ReadFloat ()); + Net_LogPrintf ("%f", MSG_ReadFloat (net_message)); break; case svc_entgravity: - Net_LogPrintf ("%f", MSG_ReadFloat ()); + Net_LogPrintf ("%f", MSG_ReadFloat (net_message)); break; case svc_setinfo: - Net_LogPrintf ("Player: %d ", MSG_ReadByte ()); - Net_LogPrintf ("Keyname: %s ", MSG_ReadString ()); - Net_LogPrintf ("Value: %s", MSG_ReadString ()); + Net_LogPrintf ("Player: %d ", MSG_ReadByte (net_message)); + Net_LogPrintf ("Keyname: %s ", MSG_ReadString (net_message)); + Net_LogPrintf ("Value: %s", MSG_ReadString (net_message)); break; case svc_serverinfo: - Net_LogPrintf ("Name: %s Value: %s", MSG_ReadString (), - MSG_ReadString ()); + Net_LogPrintf ("Name: %s Value: %s", MSG_ReadString (net_message), + MSG_ReadString (net_message)); break; case svc_updatepl: - Net_LogPrintf ("Player: %d Ploss: %d", MSG_ReadByte (), - MSG_ReadByte ()); + Net_LogPrintf ("Player: %d Ploss: %d", MSG_ReadByte (net_message), + MSG_ReadByte (net_message)); break; default: Net_LogPrintf ("**UNKNOWN**: [%d]", c); @@ -860,11 +860,11 @@ void Analyze_Client_Packet (byte * data, int len) { // FIXME: quick-hack - net_message.data = data; - net_message.cursize = len; - MSG_BeginReading (); + net_message->message->data = data; + net_message->message->cursize = len; + MSG_BeginReading (net_message); Parse_Client_Packet (); - net_message.data = net_message_buffer; + net_message->message->data = net_message_buffer; } void @@ -874,13 +874,13 @@ Parse_Client_Packet (void) long seq1, seq2; int mask; - seq1 = MSG_ReadLong (); + seq1 = MSG_ReadLong (net_message); if (seq1 == -1) { - Net_LogPrintf ("Special: %s\n", MSG_ReadString ()); + Net_LogPrintf ("Special: %s\n", MSG_ReadString (net_message)); return; } else { // FIXME: display seqs right when reliable - seq2 = MSG_ReadLong (); + seq2 = MSG_ReadLong (net_message); Net_LogPrintf ("\nSeq: %ld Ack: %ld ", seq1 & 0x7FFFFFFF, seq2 & 0x7FFFFFFF); @@ -889,16 +889,16 @@ Parse_Client_Packet (void) if ((seq2 >>31) &0x01) Net_LogPrintf("CL_RELACK "); */ - Net_LogPrintf ("QP: %u\n", MSG_ReadShort ()); + Net_LogPrintf ("QP: %u\n", MSG_ReadShort (net_message)); while (1) { - if (msg_badread) + if (net_message->badread) break; - c = MSG_ReadByte (); + c = MSG_ReadByte (net_message); if (c == -1) break; // Net_LogPrintf("<%ld,%ld> ",seq1 & 0x7FFFFFFF,seq2 & 0x7FFFFFFF); - Net_LogPrintf ("\n<%06x> [0x%02x] ", MSG_GetReadCount (), c); + Net_LogPrintf ("\n<%06x> [0x%02x] ", MSG_GetReadCount (net_message), c); if (c < 8) Net_LogPrintf ("%s: ", clc_string[c]); @@ -906,46 +906,46 @@ Parse_Client_Packet (void) case clc_nop: break; case clc_delta: - Net_LogPrintf ("%d", MSG_ReadByte ()); + Net_LogPrintf ("%d", MSG_ReadByte (net_message)); break; case clc_move: - Net_LogPrintf ("checksum = %02x ", MSG_ReadByte ()); - Net_LogPrintf ("PacketLoss: %d", MSG_ReadByte ()); + Net_LogPrintf ("checksum = %02x ", MSG_ReadByte (net_message)); + Net_LogPrintf ("PacketLoss: %d", MSG_ReadByte (net_message)); for (i = 0; i < 3; i++) { - mask = MSG_ReadByte (); + mask = MSG_ReadByte (net_message); Net_LogPrintf ("\n\t(%d) mask = %02x", i, mask); if (mask & 0x01) - Net_LogPrintf (" Tilt: %f", MSG_ReadAngle16 ()); + Net_LogPrintf (" Tilt: %f", MSG_ReadAngle16 (net_message)); if (mask & 0x80) - Net_LogPrintf (" Yaw: %f", MSG_ReadAngle16 ()); + Net_LogPrintf (" Yaw: %f", MSG_ReadAngle16 (net_message)); if (mask & 0x02) - Net_LogPrintf (" Roll: %f", MSG_ReadAngle16 ()); + Net_LogPrintf (" Roll: %f", MSG_ReadAngle16 (net_message)); if (mask & 0x04) - Net_LogPrintf (" Fwd: %d", MSG_ReadShort ()); + Net_LogPrintf (" Fwd: %d", MSG_ReadShort (net_message)); if (mask & 0x08) - Net_LogPrintf (" Right: %d", MSG_ReadShort ()); + Net_LogPrintf (" Right: %d", MSG_ReadShort (net_message)); if (mask & 0x10) - Net_LogPrintf (" Up: %d", MSG_ReadShort ()); + Net_LogPrintf (" Up: %d", MSG_ReadShort (net_message)); if (mask & 0x20) - Net_LogPrintf (" Flags: %d", MSG_ReadByte ()); + Net_LogPrintf (" Flags: %d", MSG_ReadByte (net_message)); if (mask & 0x40) - Net_LogPrintf (" Impulse: %d", MSG_ReadByte ()); - Net_LogPrintf (" Msec: %d", MSG_ReadByte ()); + Net_LogPrintf (" Impulse: %d", MSG_ReadByte (net_message)); + Net_LogPrintf (" Msec: %d", MSG_ReadByte (net_message)); } break; case clc_stringcmd: - Net_LogPrintf ("%s", MSG_ReadString ()); + Net_LogPrintf ("%s", MSG_ReadString (net_message)); break; case clc_tmove: for (i = 0; i < 3; i++) - Net_LogPrintf ("%f ", MSG_ReadCoord ()); + Net_LogPrintf ("%f ", MSG_ReadCoord (net_message)); break; case clc_upload: - ii = MSG_ReadShort (); - Net_LogPrintf ("%d bytes at %d", ii, MSG_ReadByte ()); + ii = MSG_ReadShort (net_message); + Net_LogPrintf ("%d bytes at %d", ii, MSG_ReadByte (net_message)); for (i = 0; i < ii; i++) - MSG_ReadByte (); + MSG_ReadByte (net_message); break; default: Net_LogPrintf ("**UNKNOWN**: [%d]", c);