"?", // 47
"?", // 48
"?", // 49
- "svc_skyboxsize", // [coord] size
- "svc_fog" // [byte] enable <optional past this point, only included if enable is true> [float] density [byte] red [byte] green [byte] blue
+ "svc_farclip", // [coord] size
+ "svc_fog", // [byte] enable <optional past this point, only included if enable is true> [short * 4096] density [byte] red [byte] green [byte] blue
+ "svc_playerposition" // [float] x [float] y [float] z
};
//=============================================================================
-int Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments
+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
/*
===============
Host_Error ("CL_EntityNum: %i is an invalid number",num);
while (cl.num_entities<=num)
{
- cl_entities[cl.num_entities].colormap = vid.colormap;
+ cl_entities[cl.num_entities].colormap = -1; // no special coloring
cl.num_entities++;
}
}
extern qboolean isworldmodel;
extern char skyname[];
-extern cvar_t r_fogdensity;
-extern cvar_t r_fogred;
-extern cvar_t r_foggreen;
-extern cvar_t r_fogblue;
extern void R_SetSkyBox (char *sky);
extern void FOG_clear();
+extern cvar_t r_farclip;
void CL_ParseEntityLump(char *entdata)
{
int i, j, k;
FOG_clear(); // LordHavoc: no fog until set
skyname[0] = 0; // LordHavoc: no enviroment mapped sky until set
-// r_skyboxsize.value = 4096; // LordHavoc: default skyboxsize
+ r_farclip.value = 6144; // LordHavoc: default farclip distance
data = entdata;
if (!data)
return;
R_SetSkyBox(value);
else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
R_SetSkyBox(value);
-// else if (!strcmp("skyboxsize", key))
-// {
-// r_skyboxsize.value = atof(value);
-// if (r_skyboxsize.value < 64)
-// r_skyboxsize.value = 64;
-// }
+ else if (!strcmp("farclip", key))
+ {
+ r_farclip.value = atof(value);
+ if (r_farclip.value < 64)
+ r_farclip.value = 64;
+ }
+ else if (!strcmp("fog", key))
+ {
+ scanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue);
+ j = 0;
+ }
else if (!strcmp("fog_density", key))
- r_fogdensity.value = atof(value);
+ fog_density = atof(value);
else if (!strcmp("fog_red", key))
- r_fogred.value = atof(value);
+ fog_red = atof(value);
else if (!strcmp("fog_green", key))
- r_foggreen.value = atof(value);
+ fog_green = atof(value);
else if (!strcmp("fog_blue", key))
- r_fogblue.value = atof(value);
+ fog_blue = atof(value);
else if (!strcmp("wad", key)) // for HalfLife maps
{
j = 0;
Nehahrademcompatibility = true;
if (cls.demoplayback && demo_nehahra.value)
Nehahrademcompatibility = true;
+ dpprotocol = i == DPPROTOCOL_VERSION;
// parse maxclients
cl.maxclients = MSG_ReadByte ();
relinked. Other attributes can change without relinking.
==================
*/
-//int bitcounts[16];
-
void CL_ParseUpdate (int bits)
{
- int i, modnum, num, skin, alpha, scale, glowsize, glowcolor, colormod;
+ int i, modnum, num, alpha, scale, glowsize, glowcolor, colormod;
model_t *model;
qboolean forcelink;
entity_t *ent;
}
if (bits & U_MOREBITS)
- {
- i = MSG_ReadByte ();
- bits |= (i<<8);
- }
+ bits |= (MSG_ReadByte()<<8);
if (bits & U_EXTEND1 && !Nehahrademcompatibility)
{
bits |= MSG_ReadByte() << 16;
ent = CL_EntityNum (num);
-//for (i=0 ; i<16 ; i++)
-//if (bits&(1<<i))
-// bitcounts[i]++;
-
forcelink = ent->msgtime != cl.mtime[1]; // no previous frame to lerp from
ent->msgtime = cl.mtime[0];
if (bits & U_DELTA)
baseline = &ent->deltabaseline;
+ if (forcelink)
+ {
+ ent->deltabaseline.origin[0] = ent->deltabaseline.origin[1] = ent->deltabaseline.origin[2] = 0;
+ ent->deltabaseline.angles[0] = ent->deltabaseline.angles[1] = ent->deltabaseline.angles[2] = 0;
+ ent->deltabaseline.effects = 0;
+ ent->deltabaseline.modelindex = 0;
+ ent->deltabaseline.frame = 0;
+ ent->deltabaseline.colormap = 0;
+ ent->deltabaseline.skin = 0;
+ ent->deltabaseline.alpha = 255;
+ ent->deltabaseline.scale = 16;
+ ent->deltabaseline.glowsize = 0;
+ ent->deltabaseline.glowcolor = 254;
+ ent->deltabaseline.colormod = 255;
+ }
+
modnum = bits & U_MODEL ? MSG_ReadByte() : baseline->modelindex;
if (modnum >= MAX_MODELS)
Host_Error ("CL_ParseModel: bad modnum");
ent->syncbase = model->synctype == ST_RAND ? (float)(rand()&0x7fff) / 0x7fff : 0.0;
else
forcelink = true; // hack to make null model players work
- if (num > 0 && num <= cl.maxclients)
- R_TranslatePlayerSkin (num - 1);
}
ent->frame = ((bits & U_FRAME) ? MSG_ReadByte() : (baseline->frame & 0xFF));
i = bits & U_COLORMAP ? MSG_ReadByte() : baseline->colormap;
ent->deltabaseline.colormap = i;
if (!i)
- ent->colormap = vid.colormap;
+ ent->colormap = -1; // no special coloring
else
{
if (i > cl.maxclients)
Host_Error ("i >= cl.maxclients");
- ent->colormap = cl.scores[i-1].translations;
+ ent->colormap = cl.scores[i-1].colors; // color it
}
- skin = bits & U_SKIN ? MSG_ReadByte() : baseline->skin;
- if (skin != ent->skinnum)
- {
- ent->skinnum = skin;
- if (num > 0 && num <= cl.maxclients)
- R_TranslatePlayerSkin (num - 1);
- }
- ent->deltabaseline.skin = skin;
+ ent->deltabaseline.skin = ent->skinnum = bits & U_SKIN ? MSG_ReadByte() : baseline->skin;
ent->effects = ((bits & U_EFFECTS) ? MSG_ReadByte() : (baseline->effects & 0xFF));
ent->deltabaseline.frame = ent->frame;
ent->alpha = (float) alpha * (1.0 / 255.0);
ent->scale = (float) scale * (1.0 / 16.0);
- ent->glowsize = glowsize < 128 ? glowsize * 8.0 : (glowsize - 256) * 8.0;
+ ent->glowsize = glowsize * 4.0;
ent->glowcolor = glowcolor;
ent->colormod[0] = (float) ((colormod >> 5) & 7) * (1.0 / 7.0);
ent->colormod[1] = (float) ((colormod >> 2) & 7) * (1.0 / 7.0);
cl.mvelocity[0][i] = 0;
}
-// [always sent] if (bits & SU_ITEMS)
- i = MSG_ReadLong ();
-
+ i = MSG_ReadLong ();
if (cl.items != i)
{ // set flash times
-// Sbar_Changed ();
for (j=0 ; j<32 ; j++)
if ( (i & (1<<j)) && !(cl.items & (1<<j)))
cl.item_gettime[j] = cl.time;
cl.onground = (bits & SU_ONGROUND) != 0;
cl.inwater = (bits & SU_INWATER) != 0;
- if (bits & SU_WEAPONFRAME)
- cl.stats[STAT_WEAPONFRAME] = MSG_ReadByte ();
- else
- cl.stats[STAT_WEAPONFRAME] = 0;
-
- if (bits & SU_ARMOR)
- i = MSG_ReadByte ();
- else
- i = 0;
- if (cl.stats[STAT_ARMOR] != i)
- {
- cl.stats[STAT_ARMOR] = i;
-// Sbar_Changed ();
- }
-
- if (bits & SU_WEAPON)
- i = MSG_ReadByte ();
- else
- i = 0;
- if (cl.stats[STAT_WEAPON] != i)
- {
- cl.stats[STAT_WEAPON] = i;
-// Sbar_Changed ();
- }
-
- i = MSG_ReadShort ();
- if (cl.stats[STAT_HEALTH] != i)
- {
- cl.stats[STAT_HEALTH] = i;
-// Sbar_Changed ();
- }
-
- i = MSG_ReadByte ();
- if (cl.stats[STAT_AMMO] != i)
- {
- cl.stats[STAT_AMMO] = i;
-// Sbar_Changed ();
- }
+ cl.stats[STAT_WEAPONFRAME] = (bits & SU_WEAPONFRAME) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_ARMOR] = (bits & SU_ARMOR) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_WEAPON] = (bits & SU_WEAPON) ? MSG_ReadByte() : 0;
+ cl.stats[STAT_HEALTH] = MSG_ReadShort();
+ cl.stats[STAT_AMMO] = MSG_ReadByte();
- for (i=0 ; i<4 ; i++)
- {
- j = MSG_ReadByte ();
- if (cl.stats[STAT_SHELLS+i] != j)
- {
- cl.stats[STAT_SHELLS+i] = j;
-// Sbar_Changed ();
- }
- }
+ cl.stats[STAT_SHELLS] = MSG_ReadByte();
+ cl.stats[STAT_NAILS] = MSG_ReadByte();
+ cl.stats[STAT_ROCKETS] = MSG_ReadByte();
+ cl.stats[STAT_CELLS] = MSG_ReadByte();
i = MSG_ReadByte ();
if (standard_quake)
- {
- if (cl.stats[STAT_ACTIVEWEAPON] != i)
- {
- cl.stats[STAT_ACTIVEWEAPON] = i;
-// Sbar_Changed ();
- }
- }
+ cl.stats[STAT_ACTIVEWEAPON] = i;
else
- {
- if (cl.stats[STAT_ACTIVEWEAPON] != (1<<i))
- {
- cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
-// Sbar_Changed ();
- }
- }
-}
-
-/*
-=====================
-CL_NewTranslation
-=====================
-*/
-void CL_NewTranslation (int slot)
-{
- int i, j;
- int top, bottom;
- byte *dest, *source;
-
- if (slot > cl.maxclients)
- Host_Error ("CL_NewTranslation: slot > cl.maxclients");
- dest = cl.scores[slot].translations;
- source = vid.colormap;
- memcpy (dest, vid.colormap, sizeof(cl.scores[slot].translations));
- top = cl.scores[slot].colors & 0xf0;
- bottom = (cl.scores[slot].colors &15)<<4;
- R_TranslatePlayerSkin (slot);
-
- for (i=0 ; i<VID_GRADES ; i++, dest += 256, source+=256)
- {
- // LordHavoc: corrected color ranges
- if (top < 128 || (top >= 224 && top < 240)) // the artists made some backwards ranges. sigh.
- memcpy (dest + TOP_RANGE, source + top, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[TOP_RANGE+j] = source[top+15-j];
-
- // LordHavoc: corrected color ranges
- if (bottom < 128 || (bottom >= 224 && bottom < 240))
- memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[BOTTOM_RANGE+j] = source[bottom+15-j];
- }
+ cl.stats[STAT_ACTIVEWEAPON] = (1<<i);
}
/*
// copy it to the current state
ent->model = cl.model_precache[ent->baseline.modelindex];
ent->frame = ent->baseline.frame;
- ent->colormap = vid.colormap;
+ ent->colormap = -1; // no special coloring
ent->skinnum = ent->baseline.skin;
ent->effects = ent->baseline.effects;
ent->alpha = 1;
extern void SHOWLMP_decodeshow();
extern void R_SetSkyBox(char* sky);
-extern cvar_t r_fogdensity;
-extern cvar_t r_fogred;
-extern cvar_t r_foggreen;
-extern cvar_t r_fogblue;
-
/*
=====================
CL_ParseServerMessage
break;
case svc_updatename:
-// Sbar_Changed ();
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatename > MAX_SCOREBOARD");
break;
case svc_updatefrags:
-// Sbar_Changed ();
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatefrags > MAX_SCOREBOARD");
break;
case svc_updatecolors:
-// Sbar_Changed ();
i = MSG_ReadByte ();
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatecolors > MAX_SCOREBOARD");
cl.scores[i].colors = MSG_ReadByte ();
- CL_NewTranslation (i);
break;
case svc_particle:
cl.paused = MSG_ReadByte ();
if (cl.paused)
- {
CDAudio_Pause ();
-#ifdef _WIN32
- VID_HandlePause (true);
-#endif
- }
else
- {
CDAudio_Resume ();
-#ifdef _WIN32
- VID_HandlePause (false);
-#endif
- }
}
break;
case svc_showlmp:
SHOWLMP_decodeshow();
break;
- // LordHavoc: extra worldspawn fields (fog, sky, skyboxsize)
+ // LordHavoc: extra worldspawn fields (fog, sky, farclip)
case svc_skybox:
R_SetSkyBox(MSG_ReadString());
break;
- case svc_skyboxsize:
- /*r_skyboxsize.value = */MSG_ReadCoord();
+ case svc_farclip:
+ r_farclip.value = MSG_ReadCoord();
break;
case svc_fog:
if (MSG_ReadByte())
{
- r_fogdensity.value = MSG_ReadFloat();
- r_fogred.value = MSG_ReadByte() * (1.0 / 255.0);
- r_foggreen.value = MSG_ReadByte() * (1.0 / 255.0);
- r_fogblue.value = MSG_ReadByte() * (1.0 / 255.0);
+ fog_density = MSG_ReadShort() * (1.0f / 4096.0f);
+ fog_red = MSG_ReadByte() * (1.0 / 255.0);
+ fog_green = MSG_ReadByte() * (1.0 / 255.0);
+ fog_blue = MSG_ReadByte() * (1.0 / 255.0);
}
else
- r_fogdensity.value = 0.0f;
+ fog_density = 0.0f;
break;
}
}
projects / xonotic / darkplaces.git / blobdiff