"svc_updatecolors", // [byte] [byte]
"svc_particle", // [vec3] <variable>
"svc_damage", // [byte] impact [byte] blood [vec3] from
-
+
"svc_spawnstatic",
"OBSOLETE svc_spawnbinary",
"svc_spawnbaseline",
-
+
"svc_temp_entity", // <variable>
"svc_setpause",
"svc_signonnum",
"", // 47
"", // 48
"", // 49
- "", // 50
- "svc_fog", // 51
- "svc_effect", // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
- "svc_effect2", // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
+ "svc_cgame", // 50 // [short] length [bytes] data
+ "svc_unusedlh1", // 51 // unused
+ "svc_effect", // 52 // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
+ "svc_effect2", // 53 // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
+ "svc_sound2", // 54 // short soundindex instead of byte
+ "svc_spawnbaseline2", // 55 // short modelindex instead of byte
+ "svc_spawnstatic2", // 56 // short modelindex instead of byte
+ "svc_entities", // 57 // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata
+ "svc_unusedlh3", // 58
+ "svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten
};
//=============================================================================
}
qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
-qboolean dpprotocol; // LordHavoc: whether or not the current network stream is the enhanced DarkPlaces protocol
+int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces
/*
===============
*/
entity_t *CL_EntityNum (int num)
{
- /*
- if (num >= cl.num_entities)
- {
- if (num >= MAX_EDICTS)
- Host_Error ("CL_EntityNum: %i is an invalid number",num);
- cl.num_entities = num;
-// while (cl.num_entities <= num)
-// {
-// cl_entities[cl.num_entities].colormap = -1; // no special coloring
-// cl.num_entities++;
-// }
- }
- */
if (num >= MAX_EDICTS)
Host_Error ("CL_EntityNum: %i is an invalid number",num);
pos[i] = MSG_ReadCoord ();
S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
-}
+}
/*
==================
float time;
static float lastmsg;
int ret;
+ int c;
sizebuf_t old;
- byte olddata[8192];
+ qbyte olddata[8192];
if (sv.active)
return; // no need if server is local
switch (ret)
{
default:
- Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
+ Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed");
case 0:
break; // nothing waiting
case 1:
Host_Error ("CL_KeepaliveMessage: received a message");
break;
case 2:
- if (MSG_ReadByte() != svc_nop)
+ c = MSG_ReadByte();
+ if (c != svc_nop)
Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop");
break;
}
break;
case 4:
-// SCR_EndLoadingPlaque (); // allow normal screen updates
Con_ClearNotify();
break;
}
// parse protocol version number
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
+ if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
{
- Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
+ Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
return;
}
Nehahrademcompatibility = false;
Nehahrademcompatibility = true;
if (cls.demoplayback && demo_nehahra.integer)
Nehahrademcompatibility = true;
- dpprotocol = i == DPPROTOCOL_VERSION;
+ dpprotocol = i;
+ if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+ dpprotocol = 0;
// parse maxclients
cl.maxclients = MSG_ReadByte ();
// now we try to load everything else until a cache allocation fails
//
- Mem_CheckSentinelsGlobal();
-
for (i=1 ; i<nummodels ; i++)
{
// LordHavoc: i == 1 means the first model is the world model
CL_KeepaliveMessage ();
}
- Mem_CheckSentinelsGlobal();
-
S_BeginPrecaching ();
for (i=1 ; i<numsounds ; i++)
{
- cl.sound_precache[i] = S_PrecacheSound (sound_precache[i]);
+ cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
CL_KeepaliveMessage ();
}
S_EndPrecaching ();
R_NewMap ();
+ CL_CGVM_Start();
+
Mem_CheckSentinelsGlobal();
noclip_anglehack = false; // noclip is turned off at start
Mod_CheckLoaded(model);
if (model && s->frame >= model->numframes)
{
- Con_Printf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
+ Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
s->frame = 0;
}
if (model && s->skin > 0 && s->skin >= model->numskins)
{
- Con_Printf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+ Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
s->skin = 0;
}
}
relinked. Other attributes can change without relinking.
==================
*/
-byte entkill[MAX_EDICTS];
+qbyte entkill[MAX_EDICTS];
int bitprofile[32], bitprofilecount = 0;
void CL_ParseUpdate (int bits)
{
entity_t *ent;
entity_state_t new;
- if (cls.signon == SIGNONS - 1)
- { // first update is the final signon stage
- cls.signon = SIGNONS;
- CL_SignonReply ();
- }
-
if (bits & U_MOREBITS)
bits |= (MSG_ReadByte()<<8);
if ((bits & U_EXTEND1) && (!Nehahrademcompatibility))
if (bits & U_EFFECTS2) new.effects = (new.effects & 0x00FF) | (MSG_ReadByte() << 8);
if (bits & U_GLOWSIZE) new.glowsize = MSG_ReadByte();
if (bits & U_GLOWCOLOR) new.glowcolor = MSG_ReadByte();
-#if 0
- if (bits & U_COLORMOD) {int i = MSG_ReadByte();float r = (((int) i >> 5) & 7) * 1.0 / 7, g = (((int) i >> 2) & 7) * 1.0 / 7, b = ((int) i & 3) * 1.0 / 3;Con_Printf("warning: U_COLORMOD %i (%1.2f %1.2f %1.2f) ignored\n", i, r, g, b);}
-#else
// apparently the dpcrush demo uses this (unintended, and it uses white anyway)
if (bits & U_COLORMOD) MSG_ReadByte();
-#endif
if (bits & U_GLOWTRAIL) new.flags |= RENDER_GLOWTRAIL;
if (bits & U_FRAME2) new.frame = (new.frame & 0x00FF) | (MSG_ReadByte() << 8);
if (bits & U_MODEL2) new.modelindex = (new.modelindex & 0x00FF) | (MSG_ReadByte() << 8);
int j = MSG_ReadFloat() * 255.0f;
if (i == 2)
{
- if (MSG_ReadFloat())
+ i = MSG_ReadFloat();
+ if (i)
new.effects |= EF_FULLBRIGHT;
}
if (j < 0)
new.time = ent->state_current.time;
if (memcmp(&new, &ent->state_current, sizeof(entity_state_t)))
{
+ // set it back to what it should be
+ new.time = cl.mtime[0] + 0.1;
// state has changed
ent->state_previous = ent->state_current;
ent->state_current = new;
// assume 10fps animation
- ent->state_previous.time = cl.mtime[0];
- ent->state_current.time = cl.mtime[0] + 0.1; //ent->state_previous.time + 0.1;
+ //ent->state_previous.time = cl.mtime[0] - 0.1;
}
}
else
}
}
+void CL_ReadEntityFrame(void)
+{
+ entity_t *ent;
+ entity_state_t *s;
+ entity_frame_t entityframe;
+ int i;
+ EntityFrame_Read(&cl.entitydatabase);
+ EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe);
+ for (i = 0;i < entityframe.numentities;i++)
+ {
+ s = &entityframe.entitydata[i];
+ entkill[s->number] = 0;
+ ent = &cl_entities[s->number];
+ memcpy(&ent->state_previous, &ent->state_current, sizeof(*s));
+ memcpy(&ent->state_current, s, sizeof(*s));
+ ent->state_current.time = cl.mtime[0];
+ }
+ VectorCopy(cl.viewentoriginnew, cl.viewentoriginold);
+ VectorCopy(entityframe.eye, cl.viewentoriginnew);
+}
+
char *bitprofilenames[32] =
{
"U_MOREBITS",
Con_Printf("bitprofile: %i updates\n");
if (bitprofilecount)
for (i = 0;i < 32;i++)
-// if (bitprofile[i])
- Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount);
+ Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount);
Con_Printf("\n");
for (i = 0;i < 32;i++)
bitprofile[i] = 0;
cl.idealpitch = MSG_ReadChar ();
else
cl.idealpitch = 0;
-
+
VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
for (i=0 ; i<3 ; i++)
{
else
cl.punchangle[i] = 0;
if (bits & (SU_PUNCHVEC1<<i))
- cl.punchvector[i] = MSG_ReadFloatCoord();
+ cl.punchvector[i] = MSG_ReadCoord();
else
cl.punchvector[i] = 0;
if (bits & (SU_VELOCITY1<<i) )
cl.item_gettime[j] = cl.time;
cl.items = i;
}
-
+
cl.onground = (bits & SU_ONGROUND) != 0;
cl.inwater = (bits & SU_INWATER) != 0;
cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
else
cl.stats[STAT_ACTIVEWEAPON] = i;
+
+ cl.viewzoomold = cl.viewzoomnew; // for interpolation
+ if (bits & SU_VIEWZOOM)
+ {
+ i = MSG_ReadByte();
+ if (i < 2)
+ i = 2;
+ cl.viewzoomnew = (float) i * (1.0f / 255.0f);
+ }
+ else
+ cl.viewzoomnew = 1;
+
}
/*
VectorCopy (ent->state_baseline.origin, ent->render.origin);
VectorCopy (ent->state_baseline.angles, ent->render.angles);
+
+ // This is definitely cheating...
+ if (ent->render.model == NULL)
+ cl.num_statics--;
}
/*
sound_num = MSG_ReadByte ();
vol = MSG_ReadByte ();
atten = MSG_ReadByte ();
-
+
S_StaticSound (cl.sound_precache[sound_num], org, vol, atten);
}
#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x);
+static qbyte cgamenetbuffer[65536];
+
/*
=====================
CL_ParseServerMessage
{
int cmd;
int i, entitiesupdated;
- byte cmdlog[32];
+ qbyte cmdlog[32];
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
-
+
//
// if recording demos, copy the message out
//
Con_Printf ("%i ",net_message.cursize);
else if (cl_shownet.integer == 2)
Con_Printf ("------------------\n");
-
- cl.onground = false; // unless the server says otherwise
+
+ cl.onground = false; // unless the server says otherwise
//
// parse the message
//
entitiesupdated = false;
CL_EntityUpdateSetup();
-
+
while (1)
{
if (msg_badread)
temp = "entity";
cmdlogname[cmdindex] = temp;
SHOWNET("fast update");
+ if (cls.signon == SIGNONS - 1)
+ { // first update is the final signon stage
+ cls.signon = SIGNONS;
+ CL_SignonReply ();
+ }
CL_ParseUpdate (cmd&127);
continue;
}
temp = "<unknown>";
cmdlogname[cmdindex] = temp;
}
-
+
// other commands
switch (cmd)
{
Host_Error ("CL_ParseServerMessage: Illegible server message\n");
}
break;
-
+
case svc_nop:
-// Con_Printf ("svc_nop\n");
break;
-
+
case svc_time:
// handle old protocols which do not have entity update ranges
entitiesupdated = true;
cl.mtime[1] = cl.mtime[0];
- cl.mtime[0] = MSG_ReadFloat ();
+ cl.mtime[0] = MSG_ReadFloat ();
break;
case svc_clientdata:
i = MSG_ReadShort ();
CL_ParseClientdata (i);
break;
-
+
case svc_version:
i = MSG_ReadLong ();
- if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250)
- Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION);
+ if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
+ Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
Nehahrademcompatibility = false;
if (i == 250)
Nehahrademcompatibility = true;
if (cls.demoplayback && demo_nehahra.integer)
Nehahrademcompatibility = true;
- dpprotocol = i == DPPROTOCOL_VERSION;
+ dpprotocol = i;
+ if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3)
+ dpprotocol = 0;
break;
-
+
case svc_disconnect:
Host_EndGame ("Server disconnected\n");
case svc_print:
Con_Printf ("%s", MSG_ReadString ());
break;
-
+
case svc_centerprint:
SCR_CenterPrint (MSG_ReadString ());
break;
-
+
case svc_stufftext:
Cbuf_AddText (MSG_ReadString ());
break;
case svc_serverinfo:
CL_ParseServerInfo ();
-// vid.recalc_refdef = true; // leave intermission full screen
break;
-
+
case svc_setangle:
for (i=0 ; i<3 ; i++)
cl.viewangles[i] = MSG_ReadAngle ();
break;
-
+
case svc_setview:
cl.viewentity = MSG_ReadShort ();
break;
-
+
case svc_lightstyle:
i = MSG_ReadByte ();
if (i >= MAX_LIGHTSTYLES)
cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
cl_lightstyle[i].length = strlen(cl_lightstyle[i].map);
break;
-
+
case svc_sound:
CL_ParseStartSoundPacket(false);
break;
case svc_updatename:
i = MSG_ReadByte ();
if (i >= cl.maxclients)
- Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD");
+ Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients");
strcpy (cl.scores[i].name, MSG_ReadString ());
break;
-
+
case svc_updatefrags:
i = MSG_ReadByte ();
if (i >= cl.maxclients)
- Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD");
+ Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients");
cl.scores[i].frags = MSG_ReadShort ();
- break;
+ break;
case svc_updatecolors:
i = MSG_ReadByte ();
if (i >= cl.maxclients)
- Host_Error ("CL_ParseServerMessage: svc_updatecolors >= MAX_SCOREBOARD");
+ Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients");
cl.scores[i].colors = MSG_ReadByte ();
break;
-
+
case svc_particle:
CL_ParseParticleEffect ();
break;
else
CDAudio_Resume ();
break;
-
+
case svc_signonnum:
i = MSG_ReadByte ();
if (i <= cls.signon)
Host_Error ("svc_updatestat: %i is invalid", i);
cl.stats[i] = MSG_ReadLong ();
break;
-
+
case svc_spawnstaticsound:
CL_ParseStaticSound (false);
break;
cl.cdtrack = MSG_ReadByte ();
cl.looptrack = MSG_ReadByte ();
if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) )
- CDAudio_Play ((byte)cls.forcetrack, true);
+ CDAudio_Play ((qbyte)cls.forcetrack, true);
else
- CDAudio_Play ((byte)cl.cdtrack, true);
+ CDAudio_Play ((qbyte)cl.cdtrack, true);
break;
case svc_intermission:
cl.intermission = 1;
cl.completed_time = cl.time;
-// vid.recalc_refdef = true; // go to full screen
break;
case svc_finale:
cl.intermission = 2;
cl.completed_time = cl.time;
-// vid.recalc_refdef = true; // go to full screen
SCR_CenterPrint (MSG_ReadString ());
break;
case svc_cutscene:
cl.intermission = 3;
cl.completed_time = cl.time;
-// vid.recalc_refdef = true; // go to full screen
- SCR_CenterPrint (MSG_ReadString ());
+ SCR_CenterPrint (MSG_ReadString ());
break;
case svc_sellscreen:
case svc_skybox:
R_SetSkyBox(MSG_ReadString());
break;
+ case svc_cgame:
+ {
+ int length;
+ length = (int) ((unsigned short) MSG_ReadShort());
+ for (i = 0;i < length;i++)
+ cgamenetbuffer[i] = MSG_ReadByte();
+ if (!msg_badread)
+ CL_CGVM_ParseNetwork(cgamenetbuffer, length);
+ }
+ break;
+ case svc_entities:
+ if (cls.signon == SIGNONS - 1)
+ { // first update is the final signon stage
+ cls.signon = SIGNONS;
+ CL_SignonReply ();
+ }
+ CL_ReadEntityFrame();
+ break;
}
}
if (entitiesupdated)
CL_EntityUpdateEnd();
}
+
projects / xonotic / darkplaces.git / blobdiff