}
MSG_WriteByte (&cls.message, clc_stringcmd);
- //sprintf (str, "spawn %s", cls.spawnparms);
- //MSG_WriteString (&cls.message, str);
MSG_WriteString (&cls.message, "spawn");
break;
i = MSG_ReadLong ();
if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250)
{
- Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
+ Host_Error ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION);
return;
}
Nehahrademcompatibility = false;
Con_Printf ("%c%s\n", 2, str);
}
-//
-// first we go through and touch all of the precache data that still
-// happens to be in the cache, so precaching something else doesn't
-// needlessly purge it
-//
-
+ // check memory integrity
Mem_CheckSentinelsGlobal();
- Mod_ClearUsed();
-
// disable until we get textures for it
R_ResetSkyBox();
-// precache models
memset (cl.model_precache, 0, sizeof(cl.model_precache));
+ memset (cl.sound_precache, 0, sizeof(cl.sound_precache));
+
+ // touch all of the precached models that are still loaded so we can free
+ // anything that isn't needed
+ Mod_ClearUsed();
for (nummodels=1 ; ; nummodels++)
{
+ CL_KeepaliveMessage ();
str = MSG_ReadString ();
if (!str[0])
break;
if (nummodels==MAX_MODELS)
- {
Host_Error ("Server sent too many model precaches\n");
- return;
- }
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (model_precache[nummodels], str);
Mod_TouchModel (str);
}
-// precache sounds
- memset (cl.sound_precache, 0, sizeof(cl.sound_precache));
+ // do the same for sounds
for (numsounds=1 ; ; numsounds++)
{
+ CL_KeepaliveMessage ();
str = MSG_ReadString ();
if (!str[0])
break;
if (numsounds==MAX_SOUNDS)
- {
Host_Error ("Server sent too many sound precaches\n");
- return;
- }
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (sound_precache[numsounds], str);
S_TouchSound (str);
}
+ // purge anything that was not touched
Mod_PurgeUnused();
-//
-// now we try to load everything else until a cache allocation fails
-//
+ // now we try to load everything that is new
+
+ // world model
+ CL_KeepaliveMessage ();
+ cl.model_precache[1] = Mod_ForName (model_precache[1], false, false, true);
+ if (cl.model_precache[1] == NULL)
+ Con_Printf("Map %s not found\n", model_precache[1]);
- for (i=1 ; i<nummodels ; i++)
+ // normal models
+ for (i=2 ; i<nummodels ; i++)
{
- // LordHavoc: i == 1 means the first model is the world model
- cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, i == 1);
- if (cl.model_precache[i] == NULL)
- {
- Con_Printf("Model %s not found\n", model_precache[i]);
- //return;
- }
CL_KeepaliveMessage ();
+ if ((cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, false)) == NULL)
+ Con_Printf("Model %s not found\n", model_precache[i]);
}
+ // sounds
S_BeginPrecaching ();
for (i=1 ; i<numsounds ; i++)
{
- cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
CL_KeepaliveMessage ();
+ cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
}
S_EndPrecaching ();
-// local state
+ // local state
ent = &cl_entities[0];
// entire entity array was cleared, so just fill in a few fields
ent->state_current.active = true;
R_NewMap ();
CL_CGVM_Start();
- noclip_anglehack = false; // noclip is turned off at start
+ // noclip is turned off at start
+ noclip_anglehack = false;
+ // check memory integrity
Mem_CheckSentinelsGlobal();
-
}
void CL_ValidateState(entity_state_t *s)
else// if (ent->state_current.flags & RENDER_STEP)
{
// monster interpolation
- if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01 || cl.mtime[0] - ent->persistent.lerpstarttime >= 0.1)
+ if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01)
{
- ent->persistent.lerpdeltatime = cl.time - ent->persistent.lerpstarttime;
+ ent->persistent.lerpdeltatime = bound(0, cl.mtime[1] - ent->persistent.lerpstarttime, 0.1);
ent->persistent.lerpstarttime = cl.mtime[1];
VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
pos[0] = MSG_ReadCoord ();
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
- CL_AllocDlight (NULL, pos, 1000, 1.25f, 1.25f, 1.25f, 3000, 99.0f);
+ CL_AllocDlight (NULL, pos, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f);
// CL_TeleportSplash (pos);
break;
colorStart = MSG_ReadByte ();
colorLength = MSG_ReadByte ();
CL_ParticleExplosion2 (pos, colorStart, colorLength);
- tempcolor = (qbyte *)&d_8to24table[(rand()%colorLength) + colorStart];
+ tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart];
CL_AllocDlight (NULL, pos, 350, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
break;
+ case TE_TEI_G3:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(pos2);
+ MSG_ReadVector(dir);
+ CL_BeamParticle(pos, pos2, 12, 1, 0.3, 0.1, 1, 1);
+ CL_BeamParticle(pos, pos2, 5, 1, 0.9, 0.3, 1, 1);
+ break;
+
+ case TE_TEI_SMOKE:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(dir);
+ count = MSG_ReadByte ();
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_Tei_Smoke(pos, dir, count);
+ break;
+
+ case TE_TEI_BIGEXPLOSION:
+ MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_ParticleExplosion (pos);
+ CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999);
+ S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+ break;
+
+ case TE_TEI_PLASMAHIT:
+ MSG_ReadVector(pos);
+ MSG_ReadVector(dir);
+ count = MSG_ReadByte ();
+ Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ CL_Tei_PlasmaHit(pos, dir, count);
+ CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999);
+ break;
+
default:
- Host_Error ("CL_ParseTempEntity: bad type %d", type);
+ Host_Error ("CL_ParseTempEntity: bad type %d (hex %02X)", type, type);
}
}
CL_ParseServerMessage
=====================
*/
+int parsingerror = false;
void CL_ParseServerMessage (void)
{
int cmd;
entitiesupdated = false;
+ parsingerror = true;
+
while (1)
{
if (msg_badread)
if (entitiesupdated)
CL_EntityUpdateEnd();
+
+ parsingerror = false;
+}
+
+void CL_Parse_DumpPacket(void)
+{
+ if (!parsingerror)
+ return;
+ Con_Printf("Packet dump:\n");
+ SZ_HexDumpToConsole(&net_message);
+ parsingerror = false;
}
void CL_Parse_Init(void)
projects / xonotic / darkplaces.git / blobdiff