cvar_t freelook = {CVAR_SAVE, "freelook", "1","mouse controls pitch instead of forward/back"};
-#ifdef AUTODEMO_BROKEN
-cvar_t cl_autodemo = {0, "cl_autodemo", "0", "records every game played, using the date/time and map name to name the demo file" };
-cvar_t cl_autodemo_nameformat = {0, "cl_autodemo_nameformat", "%Y-%m-%d_%H-%M", "The format of the cl_autodemo filename, followed by the map name" };
-#endif
+cvar_t cl_autodemo = {CVAR_SAVE, "cl_autodemo", "0", "records every game played, using the date/time and map name to name the demo file" };
+cvar_t cl_autodemo_nameformat = {CVAR_SAVE, "cl_autodemo_nameformat", "autodemos/%Y-%m-%d_%H-%M", "The format of the cl_autodemo filename, followed by the map name" };
cvar_t r_draweffects = {0, "r_draweffects", "1","renders temporary sprite effects"};
cvar_t cl_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1","use beam polygons instead of models"};
cvar_t cl_beams_quakepositionhack = {CVAR_SAVE, "cl_beams_quakepositionhack", "1", "makes your lightning gun appear to fire from your waist (as in Quake and QuakeWorld)"};
-cvar_t cl_beams_instantaimhack = {CVAR_SAVE, "cl_beams_instantaimhack", "1", "makes your lightning gun aiming update instantly"};
+cvar_t cl_beams_instantaimhack = {CVAR_SAVE, "cl_beams_instantaimhack", "0", "makes your lightning gun aiming update instantly"};
cvar_t cl_beams_lightatend = {CVAR_SAVE, "cl_beams_lightatend", "0", "make a light at the end of the beam"};
cvar_t cl_noplayershadow = {CVAR_SAVE, "cl_noplayershadow", "0","hide player shadow"};
Con_DPrint("Sending clc_disconnect\n");
MSG_WriteByte(&buf, clc_disconnect);
}
- NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
- NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
- NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
+ NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000);
+ NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000);
+ NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000);
NetConn_Close(cls.netcon);
cls.netcon = NULL;
}
cls.demonum = -1;
// stop demo loop in case this fails
- CL_Disconnect();
+ if (cls.demoplayback)
+ CL_StopPlayback();
// if downloads are running, cancel their finishing action
Curl_Clear_forthismap();
{
float f;
- if (cl_nettimesyncmode.integer == 3)
+ if (cl_nettimesyncboundmode.integer == 1)
cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
// LordHavoc: lerp in listen games as the server is being capped below the client (usually)
// also don't use the predicted location if fixangle was set on both of
// the most recent server messages, as that cause means you are spectating
// someone or watching a cutscene of some sort
+ if (cl_nolerp.integer || cls.timedemo)
+ interpolate = false;
if (e == cl.entities + cl.playerentity && cl.movement_predicted && (!cl.fixangle[1] || !cl.fixangle[0]))
{
lerp = (cl.time - cl.movement_time[2]) / (cl.movement_time[0] - cl.movement_time[1]);
lerp = bound(0, lerp, 1);
- if (!interpolate || cl_nolerp.integer || cl.fixangle[0])
+ if (!interpolate)
lerp = 1;
VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin);
VectorSet(angles, 0, cl.viewangles[1], 0);
&& !(e->render.flags & RENDER_VIEWMODEL)
&& (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
e->render.flags |= RENDER_SHADOW;
+ if (e->render.flags & RENDER_VIEWMODEL)
+ e->render.flags |= RENDER_NOSELFSHADOW;
}
// creates light and trails from an entity
// start on the entity after the world
cl.num_brushmodel_entities = 0;
- for (i = 1;i < cl.num_entities;i++)
+ for (i = cl.maxclients + 1;i < cl.num_entities;i++)
{
if (cl.entities_active[i])
{
{
// do not interpolate the bmodels for this
CL_UpdateNetworkEntity(ent, 32, false);
- cl.brushmodel_entities[cl.num_brushmodel_entities++] = ent->state_current.number;
+ cl.brushmodel_entities[cl.num_brushmodel_entities++] = i;
}
}
}
void CL_RelinkWorld(void)
{
entity_t *ent = &cl.entities[0];
- cl.brushmodel_entities[cl.num_brushmodel_entities++] = 0;
// FIXME: this should be done at load
ent->render.matrix = identitymatrix;
CL_UpdateRenderEntity(&ent->render);
/*
===============
-CL_ReadFromServer
+CL_UpdateWorld
-Read all incoming data from the server
+Update client game world for a new frame
===============
*/
-int CL_ReadFromServer(void)
+void CL_UpdateWorld(void)
{
- CL_ReadDemoMessage();
- CL_SendMove();
-
- r_refdef.time = cl.time;
r_refdef.extraupdate = !r_speeds.integer;
r_refdef.numentities = 0;
r_refdef.numlights = 0;
V_DriftPitch();
V_FadeViewFlashs();
- if (cl.movement_predicted)
- {
- // if prediction is enabled we have to update all the collidable
- // network entities before the prediction code can be run
- CL_UpdateNetworkCollisionEntities();
- }
+ // if prediction is enabled we have to update all the collidable
+ // network entities before the prediction code can be run
+ CL_UpdateNetworkCollisionEntities();
// now update the player prediction
CL_ClientMovement_Replay();
// move particles
CL_MoveParticles();
R_MoveExplosions();
-
- // update the r_refdef time again because cl.time may have changed in
- // CL_LerpPoint()
- r_refdef.time = cl.time;
}
- return 0;
+ r_refdef.time = cl.time;
}
// LordHavoc: pausedemo command
static void CL_TimeRefresh_f (void)
{
int i;
- float timestart, timedelta, oldangles[3];
+ float timestart, timedelta;
r_refdef.extraupdate = false;
- VectorCopy(cl.viewangles, oldangles);
- VectorClear(cl.viewangles);
timestart = Sys_DoubleTime();
for (i = 0;i < 128;i++)
}
timedelta = Sys_DoubleTime() - timestart;
- VectorCopy(oldangles, cl.viewangles);
Con_Printf("%f seconds (%f fps)\n", timedelta, 128/timedelta);
}
Con_Printf("CL_Locs_FreeNode: no such node! (%p)\n", node);
}
-void CL_Locs_AddNode(vec3_t mins, vec3_t maxs, const char *namestart, const char *nameend)
+void CL_Locs_AddNode(vec3_t mins, vec3_t maxs, const char *name)
{
cl_locnode_t *node, **pointer;
- int namelen = (int)(nameend - namestart);
+ int namelen;
+ if (!name)
+ name = "";
+ namelen = strlen(name);
node = Mem_Alloc(cls.levelmempool, sizeof(cl_locnode_t) + namelen + 1);
VectorSet(node->mins, min(mins[0], maxs[0]), min(mins[1], maxs[1]), min(mins[2], maxs[2]));
VectorSet(node->maxs, max(mins[0], maxs[0]), max(mins[1], maxs[1]), max(mins[2], maxs[2]));
node->name = (char *)(node + 1);
- memcpy(node->name, namestart, namelen);
+ memcpy(node->name, name, namelen);
node->name[namelen] = 0;
// link it into the tail of the list to preserve the order
for (pointer = &cl.locnodes;*pointer;pointer = &(*pointer)->next)
maxs[0] = atof(Cmd_Argv(4));
maxs[1] = atof(Cmd_Argv(5));
maxs[2] = atof(Cmd_Argv(6));
- CL_Locs_AddNode(mins, maxs, Cmd_Argv(7), Cmd_Argv(7) + strlen(Cmd_Argv(7)));
+ CL_Locs_AddNode(mins, maxs, Cmd_Argv(7));
}
else
- CL_Locs_AddNode(mins, mins, Cmd_Argv(4), Cmd_Argv(4) + strlen(Cmd_Argv(4)));
+ CL_Locs_AddNode(mins, mins, Cmd_Argv(4));
}
void CL_Locs_RemoveNearest_f(void)
for (loc = cl.locnodes;loc;loc = loc->next)
{
if (VectorCompare(loc->mins, loc->maxs))
- FS_Printf(outfile, "%.0f %.0f %.0f %s\n", loc->mins[0]*8, loc->mins[1]*8, loc->mins[2]*8, loc->name);
+ {
+ int len;
+ const char *s;
+ const char *in = loc->name;
+ char name[MAX_INPUTLINE];
+ for (len = 0;len < (int)sizeof(name) - 1 && *in;)
+ {
+ if (*in == ' ') {s = "$loc_name_separator";in++;}
+ else if (!strncmp(in, "SSG", 3)) {s = "$loc_name_ssg";in += 3;}
+ else if (!strncmp(in, "NG", 2)) {s = "$loc_name_ng";in += 2;}
+ else if (!strncmp(in, "SNG", 3)) {s = "$loc_name_sng";in += 3;}
+ else if (!strncmp(in, "GL", 2)) {s = "$loc_name_gl";in += 2;}
+ else if (!strncmp(in, "RL", 2)) {s = "$loc_name_rl";in += 2;}
+ else if (!strncmp(in, "LG", 2)) {s = "$loc_name_lg";in += 2;}
+ else if (!strncmp(in, "GA", 2)) {s = "$loc_name_ga";in += 2;}
+ else if (!strncmp(in, "YA", 2)) {s = "$loc_name_ya";in += 2;}
+ else if (!strncmp(in, "RA", 2)) {s = "$loc_name_ra";in += 2;}
+ else if (!strncmp(in, "MEGA", 4)) {s = "$loc_name_mh";in += 4;}
+ else s = NULL;
+ if (s)
+ {
+ while (len < (int)sizeof(name) - 1 && *s)
+ name[len++] = *s++;
+ continue;
+ }
+ name[len++] = *in++;
+ }
+ name[len] = 0;
+ FS_Printf(outfile, "%.0f %.0f %.0f %s\n", loc->mins[0]*8, loc->mins[1]*8, loc->mins[2]*8, name);
+ }
else
FS_Printf(outfile, "%.1f,%.1f,%.1f,%.1f,%.1f,%.1f,\"%s\"\n", loc->mins[0], loc->mins[1], loc->mins[2], loc->maxs[0], loc->maxs[1], loc->maxs[2], loc->name);
}
void CL_Locs_Reload_f(void)
{
- int i, linenumber, limit;
+ int i, linenumber, limit, len;
+ const char *s;
char *filedata, *text, *textend, *linestart, *linetext, *lineend;
fs_offset_t filesize;
vec3_t mins, maxs;
char locfilename[MAX_QPATH];
+ char name[MAX_INPUTLINE];
if (cls.state != ca_connected || !cl.worldmodel)
{
continue; // proquake location names are always quoted
lineend--;
linetext++;
+ len = min(lineend - linetext, (int)sizeof(name) - 1);
+ memcpy(name, linetext, len);
+ name[len] = 0;
+ // add the box to the list
+ CL_Locs_AddNode(mins, maxs, name);
}
// if a point was parsed, it needs to be scaled down by 8 (since
// point-based loc files were invented by a proxy which dealt
// it into a box
else if (i == 3)
{
+ // interpret silly fuhquake macros
+ for (len = 0;len < (int)sizeof(name) - 1 && linetext < lineend;)
+ {
+ if (*linetext == '$')
+ {
+ if (linetext + 18 <= lineend && !strncmp(linetext, "$loc_name_separator", 19)) {s = " ";linetext += 19;}
+ else if (linetext + 13 <= lineend && !strncmp(linetext, "$loc_name_ssg", 13)) {s = "SSG";linetext += 13;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ng", 12)) {s = "NG";linetext += 12;}
+ else if (linetext + 13 <= lineend && !strncmp(linetext, "$loc_name_sng", 13)) {s = "SNG";linetext += 13;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_gl", 12)) {s = "GL";linetext += 12;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_rl", 12)) {s = "RL";linetext += 12;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_lg", 12)) {s = "LG";linetext += 12;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ga", 12)) {s = "GA";linetext += 12;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ya", 12)) {s = "YA";linetext += 12;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_ra", 12)) {s = "RA";linetext += 12;}
+ else if (linetext + 12 <= lineend && !strncmp(linetext, "$loc_name_mh", 12)) {s = "MEGA";linetext += 12;}
+ else s = NULL;
+ if (s)
+ {
+ while (len < (int)sizeof(name) - 1 && *s)
+ name[len++] = *s++;
+ continue;
+ }
+ }
+ name[len++] = *linetext++;
+ }
+ name[len] = 0;
+ // add the point to the list
VectorScale(mins, (1.0 / 8.0), mins);
- VectorCopy(mins, maxs);
+ CL_Locs_AddNode(mins, mins, name);
}
else
continue;
- // valid line parsed
- // add the point or box to the list
- CL_Locs_AddNode(mins, maxs, linetext, lineend);
}
}
Cmd_AddCommand ("playdemo", CL_PlayDemo_f, "watch a demo file");
Cmd_AddCommand ("timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log");
-#ifdef AUTODEMO_BROKEN
Cvar_RegisterVariable (&cl_autodemo);
Cvar_RegisterVariable (&cl_autodemo_nameformat);
-#endif
Cmd_AddCommand ("fog", CL_Fog_f, "set global fog parameters (density red green blue)");
projects / xonotic / darkplaces.git / blobdiff