#include "cl_collision.h"
#include "csprogs.h"
#include "libcurl.h"
+#include "utf8lib.h"
char *svc_strings[128] =
{
{
float time;
static double nextmsg = -1;
+ static double nextupdate = -1;
+#if 0
+ static double lasttime = -1;
+#endif
int oldreadcount;
qboolean oldbadread;
sizebuf_t old;
+ if(cls.state != ca_dedicated)
+ {
+ if((time = Sys_DoubleTime()) >= nextupdate)
+ {
+ SCR_UpdateLoadingScreenIfShown();
+ nextupdate = time + 2;
+ }
+ }
+
// no need if server is local and definitely not if this is a demo
- if (!cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD)
+ if (!cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD || cls.signon >= SIGNONS)
return;
if (readmessages)
memcpy(net_message.data, olddata, net_message.cursize);
}
+#if 0
+ if((time = Sys_DoubleTime()) >= lasttime + 1)
+ {
+ Con_Printf("long delta: %f\n", time - lasttime);
+ }
+ lasttime = Sys_DoubleTime();
+#endif
+
if (cls.netcon && (time = Sys_DoubleTime()) >= nextmsg)
{
sizebuf_t msg;
r_refdef.fog_start = 0;
r_refdef.fog_alpha = 1;
r_refdef.fog_end = 16384;
+ r_refdef.fog_height = 1<<30;
+ r_refdef.fog_fadedepth = 128;
#if _MSC_VER >= 1400
#define sscanf sscanf_s
#endif
- sscanf(value, "%f %f %f %f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue, &r_refdef.fog_alpha, &r_refdef.fog_start, &r_refdef.fog_end);
+ sscanf(value, "%f %f %f %f %f %f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue, &r_refdef.fog_alpha, &r_refdef.fog_start, &r_refdef.fog_end, &r_refdef.fog_height, &r_refdef.fog_fadedepth);
}
else if (!strcmp("fog_density", key))
r_refdef.fog_density = atof(value);
r_refdef.fog_start = atof(value);
else if (!strcmp("fog_end", key))
r_refdef.fog_end = atof(value);
+ else if (!strcmp("fog_height", key))
+ r_refdef.fog_height = atof(value);
+ else if (!strcmp("fog_fadedepth", key))
+ r_refdef.fog_fadedepth = atof(value);
}
}
static void CL_SetupWorldModel(void)
{
// update the world model
- cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+ cl.entities[0].render.model = cl.worldmodel = CL_GetModelByIndex(1);
CL_UpdateRenderEntity(&cl.entities[0].render);
// set up csqc world for collision culling
World_SetSize(&cl.world, cl.worldmodel->name, cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
else
World_SetSize(&cl.world, "", defaultmins, defaultmaxs);
+ World_Start(&cl.world);
// load or reload .loc file for team chat messages
CL_Locs_Reload_f();
+ // make sure we send enough keepalives
+ CL_KeepaliveMessage(false);
+
// reset particles and other per-level things
R_Modules_NewMap();
+ // make sure we send enough keepalives
+ CL_KeepaliveMessage(false);
+
// load the team chat beep if possible
cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
if (!sv.active)
Mod_ClearUsed();
for (i = 1;i < MAX_MODELS && cl.model_name[i][0];i++)
- Mod_FindName(cl.model_name[i]);
+ Mod_FindName(cl.model_name[i], cl.model_name[i][0] == '*' ? cl.model_name[1] : NULL);
// precache any models used by the client (this also marks them used)
- cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false);
- cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false);
- cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false);
- cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false);
- Mod_PurgeUnused();
+ cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, NULL);
+ cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, NULL);
+ cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, NULL);
+ cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, NULL);
+
+ // we purge the models and sounds later in CL_SignonReply
+ //Mod_PurgeUnused();
// now we try to load everything that is new
// world model
- cl.model_precache[1] = Mod_ForName(cl.model_name[1], false, false, true);
+ cl.model_precache[1] = Mod_ForName(cl.model_name[1], false, false, NULL);
if (cl.model_precache[1]->Draw == NULL)
Con_Printf("Map %s could not be found or downloaded\n", cl.model_name[1]);
// normal models
for (i = 2;i < MAX_MODELS && cl.model_name[i][0];i++)
- if ((cl.model_precache[i] = Mod_ForName(cl.model_name[i], false, false, false))->Draw == NULL)
+ if ((cl.model_precache[i] = Mod_ForName(cl.model_name[i], false, false, cl.model_name[i][0] == '*' ? cl.model_name[1] : NULL))->Draw == NULL)
Con_Printf("Model %s could not be found or downloaded\n", cl.model_name[i]);
// check memory integrity
cls.qw_downloadtype = dl_none;
- // load new sounds and unload old ones
- // FIXME: S_ServerSounds does not know about cl.sfx_ sounds
- S_ServerSounds(cl.sound_name, cls.qw_downloadnumber);
+ // clear sound usage flags for purging of unused sounds
+ S_ClearUsed();
// precache any sounds used by the client
cl.sfx_wizhit = S_PrecacheSound(cl_sound_wizardhit.string, false, true);
cl.sfx_ric3 = S_PrecacheSound(cl_sound_ric3.string, false, true);
cl.sfx_r_exp3 = S_PrecacheSound(cl_sound_r_exp3.string, false, true);
- // sounds
+ // sounds used by the game
for (i = 1;i < MAX_SOUNDS && cl.sound_name[i][0];i++)
- {
- // Don't lock the sfx here, S_ServerSounds already did that
- cl.sound_precache[i] = S_PrecacheSound(cl.sound_name[i], true, false);
- }
+ cl.sound_precache[i] = S_PrecacheSound(cl.sound_name[i], true, true);
+
+ // we purge the models and sounds later in CL_SignonReply
+ //S_PurgeUnused();
// check memory integrity
Mem_CheckSentinelsGlobal();
cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON];
}
+#define LOADPROGRESSWEIGHT_SOUND 1.0
+#define LOADPROGRESSWEIGHT_MODEL 4.0
+#define LOADPROGRESSWEIGHT_WORLDMODEL 30.0
+#define LOADPROGRESSWEIGHT_WORLDMODEL_INIT 2.0
+
void CL_BeginDownloads(qboolean aborteddownload)
{
// quakeworld works differently
// if we got here...
// curl is done, so let's start with the business
+ if(!cl.loadbegun)
+ SCR_PushLoadingScreen(false, "Loading precaches", 1);
cl.loadbegun = true;
// if already downloading something from the previous level, don't stop it
if (cl.loadmodel_current < cl.loadmodel_total)
{
// loading models
-
+ if(cl.loadmodel_current == 1)
+ {
+ // worldmodel counts as 16 models (15 + world model setup), for better progress bar
+ SCR_PushLoadingScreen(false, "Loading precached models",
+ (
+ (cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL_INIT
+ ) / (
+ (cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL_INIT
+ + cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND
+ )
+ );
+ SCR_BeginLoadingPlaque();
+ }
for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++)
{
+ SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current],
+ (
+ (cl.loadmodel_current == 1) ? LOADPROGRESSWEIGHT_WORLDMODEL : LOADPROGRESSWEIGHT_MODEL
+ ) / (
+ (cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL_INIT
+ )
+ );
if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw)
+ {
+ SCR_PopLoadingScreen(false);
+ if(cl.loadmodel_current == 1)
+ {
+ SCR_PushLoadingScreen(false, cl.model_name[cl.loadmodel_current], 1.0 / cl.loadmodel_total);
+ SCR_PopLoadingScreen(false);
+ }
continue;
- if (cls.signon < SIGNONS)
- CL_KeepaliveMessage(true);
- cl.model_precache[cl.loadmodel_current] = Mod_ForName(cl.model_name[cl.loadmodel_current], false, false, cl.loadmodel_current == 1);
+ }
+ CL_KeepaliveMessage(true);
+
+ if(cl.loadmodel_current == 1)
+ {
+ // they'll be soon loaded, but make sure we apply freshly downloaded shaders from a curled pk3
+ Mod_FreeQ3Shaders();
+ }
+
+ cl.model_precache[cl.loadmodel_current] = Mod_ForName(cl.model_name[cl.loadmodel_current], false, false, cl.model_name[cl.loadmodel_current][0] == '*' ? cl.model_name[1] : NULL);
+ SCR_PopLoadingScreen(false);
if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1)
{
// we now have the worldmodel so we can set up the game world
+ SCR_PushLoadingScreen(true, "world model setup",
+ (
+ LOADPROGRESSWEIGHT_WORLDMODEL_INIT
+ ) / (
+ (cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL_INIT
+ )
+ );
CL_SetupWorldModel();
+ SCR_PopLoadingScreen(true);
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
cl.loadfinished = true;
}
}
}
-
+ SCR_PopLoadingScreen(false);
// finished loading models
}
if (cl.loadsound_current < cl.loadsound_total)
{
// loading sounds
-
+ if(cl.loadsound_current == 1)
+ SCR_PushLoadingScreen(false, "Loading precached sounds",
+ (
+ cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND
+ ) / (
+ (cl.loadmodel_total - 1) * LOADPROGRESSWEIGHT_MODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL
+ + LOADPROGRESSWEIGHT_WORLDMODEL_INIT
+ + cl.loadsound_total * LOADPROGRESSWEIGHT_SOUND
+ )
+ );
for (;cl.loadsound_current < cl.loadsound_total;cl.loadsound_current++)
{
+ SCR_PushLoadingScreen(false, cl.sound_name[cl.loadsound_current], 1.0 / cl.loadsound_total);
if (cl.sound_precache[cl.loadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.loadsound_current]))
+ {
+ SCR_PopLoadingScreen(false);
continue;
- if (cls.signon < SIGNONS)
- CL_KeepaliveMessage(true);
- // Don't lock the sfx here, S_ServerSounds already did that
- cl.sound_precache[cl.loadsound_current] = S_PrecacheSound(cl.sound_name[cl.loadsound_current], false, false);
+ }
+ CL_KeepaliveMessage(true);
+ cl.sound_precache[cl.loadsound_current] = S_PrecacheSound(cl.sound_name[cl.loadsound_current], false, true);
+ SCR_PopLoadingScreen(false);
}
-
+ SCR_PopLoadingScreen(false);
// finished loading sounds
}
{
if (aborteddownload)
{
+
if (cl.downloadmodel_current == 1)
{
// the worldmodel failed, but we need to set up anyway
+ Mod_FreeQ3Shaders();
CL_SetupWorldModel();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
}
if (cl.model_precache[cl.downloadmodel_current] && cl.model_precache[cl.downloadmodel_current]->Draw)
continue;
- if (cls.signon < SIGNONS)
- CL_KeepaliveMessage(true);
- if (strcmp(cl.model_name[cl.downloadmodel_current], "null") && !FS_FileExists(cl.model_name[cl.downloadmodel_current]))
+ CL_KeepaliveMessage(true);
+ if (cl.model_name[cl.downloadmodel_current][0] != '*' && strcmp(cl.model_name[cl.downloadmodel_current], "null") && !FS_FileExists(cl.model_name[cl.downloadmodel_current]))
{
if (cl.downloadmodel_current == 1)
Con_Printf("Map %s not found\n", cl.model_name[cl.downloadmodel_current]);
return;
}
}
- cl.model_precache[cl.downloadmodel_current] = Mod_ForName(cl.model_name[cl.downloadmodel_current], false, false, cl.downloadmodel_current == 1);
+
+ if(cl.downloadmodel_current == 1)
+ {
+ // they'll be soon loaded, but make sure we apply freshly downloaded shaders from a curled pk3
+ Mod_FreeQ3Shaders();
+ }
+
+ cl.model_precache[cl.downloadmodel_current] = Mod_ForName(cl.model_name[cl.downloadmodel_current], false, false, cl.model_name[cl.downloadmodel_current][0] == '*' ? cl.model_name[1] : NULL);
if (cl.downloadmodel_current == 1)
{
// we now have the worldmodel so we can set up the game world
}
if (cl.sound_precache[cl.downloadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.downloadsound_current]))
continue;
- if (cls.signon < SIGNONS)
- CL_KeepaliveMessage(true);
+ CL_KeepaliveMessage(true);
dpsnprintf(soundname, sizeof(soundname), "sound/%s", cl.sound_name[cl.downloadsound_current]);
if (!FS_FileExists(soundname) && !FS_FileExists(cl.sound_name[cl.downloadsound_current]))
{
return;
}
}
- // Don't lock the sfx here, S_ServerSounds already did that
- cl.sound_precache[cl.downloadsound_current] = S_PrecacheSound(cl.sound_name[cl.downloadsound_current], false, false);
+ cl.sound_precache[cl.downloadsound_current] = S_PrecacheSound(cl.sound_name[cl.downloadsound_current], false, true);
}
// finished loading sounds
}
+ SCR_PopLoadingScreen(false);
+
if (!cl.loadfinished)
{
cl.loadfinished = true;
size_t inflated_size;
out = FS_Inflate(cls.qw_downloadmemory, cls.qw_downloadmemorycursize, &inflated_size, tempmempool);
Mem_Free(cls.qw_downloadmemory);
- Con_Printf("Inflated download: new size: %u (%g%%)\n", (unsigned)inflated_size, 100.0 - 100.0*(cls.qw_downloadmemorycursize / (float)inflated_size));
- cls.qw_downloadmemory = out;
- cls.qw_downloadmemorycursize = inflated_size;
+ if(out)
+ {
+ Con_Printf("Inflated download: new size: %u (%g%%)\n", (unsigned)inflated_size, 100.0 - 100.0*(cls.qw_downloadmemorycursize / (float)inflated_size));
+ cls.qw_downloadmemory = out;
+ cls.qw_downloadmemorycursize = inflated_size;
+ }
+ else
+ {
+ cls.qw_downloadmemory = NULL;
+ cls.qw_downloadmemorycursize = 0;
+ Con_Printf("Cannot inflate download, possibly corrupt or zlib not present\n");
+ }
}
if(!cls.qw_downloadmemory)
void CL_ParseDownload(void)
{
int i, start, size;
- unsigned char data[65536];
+ static unsigned char data[NET_MAXMESSAGE];
start = MSG_ReadLong();
size = (unsigned short)MSG_ReadShort();
*/
static void CL_SignonReply (void)
{
- if (developer.integer >= 100)
- Con_Printf("CL_SignonReply: %i\n", cls.signon);
+ Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
switch (cls.signon)
{
break;
case 4:
+ // after the level has been loaded, we shouldn't need the shaders, and
+ // if they are needed again they will be automatically loaded...
+ // we also don't need the unused models or sounds from the last level
+ Mod_FreeQ3Shaders();
+ Mod_PurgeUnused();
+ S_PurgeUnused();
+
Con_ClearNotify();
if (COM_CheckParm("-profilegameonly"))
Sys_AllowProfiling(true);
{
SCR_BeginLoadingPlaque();
S_StopAllSounds();
+ // free q3 shaders so that any newly downloaded shaders will be active
+ Mod_FreeQ3Shaders();
}
// check memory integrity
cl.movevars_airaccel_sideways_friction = 0;
// seperate the printfs so the server message can have a color
- Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str);
+ Con_Printf("\n\n<===================================>\n\n\2%s\n", str);
// check memory integrity
Mem_CheckSentinelsGlobal();
// seperate the printfs so the server message can have a color
if (cls.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie
- Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str);
+ Con_Printf("\n<===================================>\n\n\2%s\n", str);
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!sv.active)
Mod_ClearUsed();
for (i = 1;i < nummodels;i++)
- Mod_FindName(cl.model_name[i]);
+ Mod_FindName(cl.model_name[i], cl.model_name[i][0] == '*' ? cl.model_name[1] : NULL);
// precache any models used by the client (this also marks them used)
- cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false);
- cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false);
- cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false);
- cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false);
- Mod_PurgeUnused();
+ cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, NULL);
+ cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, NULL);
+ cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, NULL);
+ cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, NULL);
- // do the same for sounds
- // FIXME: S_ServerSounds does not know about cl.sfx_ sounds
- S_ServerSounds (cl.sound_name, numsounds);
+ // we purge the models and sounds later in CL_SignonReply
+ //Mod_PurgeUnused();
+ //S_PurgeUnused();
+
+ // clear sound usage flags for purging of unused sounds
+ S_ClearUsed();
// precache any sounds used by the client
cl.sfx_wizhit = S_PrecacheSound(cl_sound_wizardhit.string, false, true);
cl.sfx_ric3 = S_PrecacheSound(cl_sound_ric3.string, false, true);
cl.sfx_r_exp3 = S_PrecacheSound(cl_sound_r_exp3.string, false, true);
+ // sounds used by the game
+ for (i = 1;i < MAX_SOUNDS && cl.sound_name[i][0];i++)
+ cl.sound_precache[i] = S_PrecacheSound(cl.sound_name[i], true, true);
+
// now we try to load everything that is new
cl.loadmodel_current = 1;
cl.downloadmodel_current = 1;
if (!(s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients)
Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients);
- model = cl.model_precache[s->modelindex];
+ model = CL_GetModelByIndex(s->modelindex);
if (model && model->type && s->frame >= model->numframes)
Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
VectorCopy(ent->state_current.angles, ent->persistent.newangles);
// reset animation interpolation as well
- ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
- ent->render.frame1time = ent->render.frame2time = cl.time;
- ent->render.framelerp = 1;
+ ent->render.framegroupblend[0].frame = ent->render.framegroupblend[1].frame = ent->state_current.frame;
+ ent->render.framegroupblend[0].start = ent->render.framegroupblend[1].start = cl.time;
+ ent->render.framegroupblend[0].lerp = 1;ent->render.framegroupblend[1].lerp = 0;
ent->render.shadertime = cl.time;
// reset various persistent stuff
ent->persistent.muzzleflash = 0;
ent->persistent.trail_allowed = false;
}
- else if (DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
+ else if ((ent->state_previous.effects & EF_TELEPORT_BIT) != (ent->state_current.effects & EF_TELEPORT_BIT))
+ {
+ // don't interpolate the move
+ ent->persistent.lerpdeltatime = 0;
+ ent->persistent.lerpstarttime = cl.mtime[1];
+ VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
+ VectorCopy(ent->state_current.angles, ent->persistent.oldangles);
+ VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+ VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+ ent->persistent.trail_allowed = false;
+
+ // if(ent->state_current.frame != ent->state_previous.frame)
+ // do this even if we did change the frame
+ // teleport bit is only used if an animation restart, or a jump, is necessary
+ // so it should be always harmless to do this
+ {
+ ent->render.framegroupblend[0].frame = ent->render.framegroupblend[1].frame = ent->state_current.frame;
+ ent->render.framegroupblend[0].start = ent->render.framegroupblend[1].start = cl.time;
+ ent->render.framegroupblend[0].lerp = 1;ent->render.framegroupblend[1].lerp = 0;
+ }
+
+ // note that this case must do everything the following case does too
+ }
+ else if ((ent->state_previous.effects & EF_RESTARTANIM_BIT) != (ent->state_current.effects & EF_RESTARTANIM_BIT))
+ {
+ ent->render.framegroupblend[1] = ent->render.framegroupblend[0];
+ ent->render.framegroupblend[1].lerp = 1;
+ ent->render.framegroupblend[0].frame = ent->state_current.frame;
+ ent->render.framegroupblend[0].start = cl.time;
+ ent->render.framegroupblend[0].lerp = 0;
+ }
+ else if (DotProduct(odelta, odelta) > 1000*1000
+ || (cl.fixangle[0] && !cl.fixangle[1])
+ || (ent->state_previous.tagindex != ent->state_current.tagindex)
+ || (ent->state_previous.tagentity != ent->state_current.tagentity))
{
// don't interpolate the move
// (the fixangle[] check detects teleports, but not constant fixangles
}
// copy it to the current state
- ent->render.model = cl.model_precache[ent->state_baseline.modelindex];
- ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame;
- ent->render.framelerp = 0;
+ ent->render.model = CL_GetModelByIndex(ent->state_baseline.modelindex);
+ ent->render.framegroupblend[0].frame = ent->state_baseline.frame;
+ ent->render.framegroupblend[0].lerp = 1;
// make torchs play out of sync
- ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1);
+ ent->render.framegroupblend[0].start = lhrandom(-10, -1);
ent->render.skinnum = ent->state_baseline.skin;
ent->render.effects = ent->state_baseline.effects;
ent->render.alpha = 1;
//VectorCopy (ent->state_baseline.angles, ent->render.angles);
Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1);
+ ent->render.allowdecals = true;
CL_UpdateRenderEntity(&ent->render);
}
// LordHavoc: for compatibility with the Nehahra movie...
case TE_LIGHTNING4NEH:
- CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, false), false);
+ CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, NULL), false);
break;
case TE_LAVASPLASH:
return;
if (!cl_iplog_loaded)
CL_IPLog_Load();
- if (developer.integer >= 100)
- Con_Printf("CL_IPLog_Add(\"%s\", \"%s\", %i, %i);\n", address, name, checkexisting, addtofile);
+ if (developer_extra.integer)
+ Con_DPrintf("CL_IPLog_Add(\"%s\", \"%s\", %i, %i);\n", address, name, checkexisting, addtofile);
// see if it already exists
if (checkexisting)
{
{
if (!strcmp(cl_iplog_items[i].address, address) && !strcmp(cl_iplog_items[i].name, name))
{
- if (developer.integer >= 100)
- Con_Printf("... found existing \"%s\" \"%s\"\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
+ if (developer_extra.integer)
+ Con_DPrintf("... found existing \"%s\" \"%s\"\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
return;
}
}
// TODO: this ought to open the one in the userpath version of the base
// gamedir, not the current gamedir
Log_Printf(cl_iplog_name.string, "%s %s\n", address, name);
- if (developer.integer >= 100)
- Con_Printf("CL_IPLog_Add: appending this line to %s: %s %s\n", cl_iplog_name.string, address, name);
+ if (developer_extra.integer)
+ Con_DPrintf("CL_IPLog_Add: appending this line to %s: %s %s\n", cl_iplog_name.string, address, name);
}
}
if (cl.parsingtextmode == CL_PARSETEXTMODE_PING)
{
// if anything goes wrong, we'll assume this is not a ping report
- qboolean expected = cl.parsingtextexpectingpingforscores;
+ qboolean expected = cl.parsingtextexpectingpingforscores != 0;
cl.parsingtextexpectingpingforscores = 0;
cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
t = text;
double timehigh;
cl.mtime[1] = cl.mtime[0];
cl.mtime[0] = newtime;
- if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
+ if (cl_nolerp.integer || cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
cl.time = cl.mtime[1] = newtime;
else if (cls.demoplayback)
{
else if (cls.protocol != PROTOCOL_QUAKEWORLD)
{
cl.mtime[1] = max(cl.mtime[1], cl.mtime[0] - 0.1);
- if (developer.integer >= 100 && vid_activewindow)
+ if (developer_extra.integer && vid_activewindow)
{
if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1]))
- Con_Printf("--- cl.time < cl.mtime[1] (%f < %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
+ Con_DPrintf("--- cl.time < cl.mtime[1] (%f < %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
else if (cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1]))
- Con_Printf("--- cl.time > cl.mtime[0] (%f > %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
+ Con_DPrintf("--- cl.time > cl.mtime[0] (%f > %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
}
cl.time += (cl.mtime[1] - cl.time) * bound(0, cl_nettimesyncfactor.value, 1);
timehigh = cl.mtime[1] + (cl.mtime[0] - cl.mtime[1]) * cl_nettimesyncboundtolerance.value;
VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
// update the csqc's server timestamps, critical for proper sync
CSQC_UpdateNetworkTimes(cl.mtime[0], cl.mtime[1]);
+
+ if (cl.mtime[0] > cl.mtime[1])
+ World_Physics_Frame(&cl.world, cl.mtime[0] - cl.mtime[1], cl.movevars_gravity);
}
#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s(%i)\n", msg_readcount-1, x, cmd);
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
qboolean qwplayerupdatereceived;
+ qboolean strip_pqc;
// LordHavoc: moved demo message writing from before the packet parse to
// after the packet parse so that CL_Stop_f can be called by cl_autodemo
cl.last_received_message = realtime;
- if (cls.netcon && cls.signon < SIGNONS)
- CL_KeepaliveMessage(false);
+ CL_KeepaliveMessage(false);
//
// if recording demos, copy the message out
break;
case qw_svc_setpause:
- cl.paused = MSG_ReadByte ();
+ cl.paused = MSG_ReadByte () != 0;
if (cl.paused)
CDAudio_Pause ();
else
break;
case svc_stufftext:
- CL_VM_Parse_StuffCmd(MSG_ReadString ()); //[515]: csqc
+ temp = MSG_ReadString();
+ /* if(utf8_enable.integer)
+ {
+ strip_pqc = true;
+ // we can safely strip and even
+ // interpret these in utf8 mode
+ }
+ else */ switch(cls.protocol)
+ {
+ case PROTOCOL_QUAKE:
+ case PROTOCOL_QUAKEDP:
+ // maybe add other protocols if
+ // so desired, but not DP7
+ strip_pqc = true;
+ break;
+ case PROTOCOL_DARKPLACES7:
+ default:
+ // ProQuake does not support
+ // these protocols
+ strip_pqc = false;
+ break;
+ }
+ if(strip_pqc)
+ {
+ // skip over ProQuake messages,
+ // TODO actually interpret them
+ // (they are sbar team score
+ // updates), see proquake cl_parse.c
+ if(*temp == 0x01)
+ {
+ ++temp;
+ while(*temp >= 0x01 && *temp <= 0x1F)
+ ++temp;
+ }
+ }
+ CL_VM_Parse_StuffCmd(temp); //[515]: csqc
break;
case svc_damage:
{
if (i >= 1 && i < MAX_MODELS)
{
- dp_model_t *model = Mod_ForName(s, false, false, i == 1);
+ dp_model_t *model = Mod_ForName(s, false, false, s[0] == '*' ? cl.model_name[1] : NULL);
if (!model)
Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
cl.model_precache[i] = model;
i -= 32768;
if (i >= 1 && i < MAX_SOUNDS)
{
- sfx_t *sfx = S_PrecacheSound (s, true, false);
+ sfx_t *sfx = S_PrecacheSound (s, true, true);
if (!sfx && snd_initialized.integer)
Con_DPrintf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
cl.sound_precache[i] = sfx;
break;
case svc_setpause:
- cl.paused = MSG_ReadByte ();
+ cl.paused = MSG_ReadByte () != 0;
if (cl.paused)
CDAudio_Pause ();
else
projects / xonotic / darkplaces.git / blobdiff