void IN_Impulse (void) {in_impulse=atoi(Cmd_Argv(1));}
-int in_bestweapon_info[][5] =
+struct
{
- {'1', 1, IT_AXE, STAT_SHELLS, 0},
- {'2', 2, IT_SHOTGUN, STAT_SHELLS, 1},
- {'3', 3, IT_SUPER_SHOTGUN, STAT_SHELLS, 1},
- {'4', 4, IT_NAILGUN, STAT_NAILS, 1},
- {'5', 5, IT_SUPER_NAILGUN, STAT_NAILS, 1},
- {'6', 6, IT_GRENADE_LAUNCHER, STAT_ROCKETS, 1},
- {'7', 7, IT_ROCKET_LAUNCHER, STAT_ROCKETS, 1},
- {'8', 8, IT_LIGHTNING, STAT_CELLS, 1},
- {'9', 9, 128, STAT_CELLS, 1}, // generic energy weapon for mods
- {'p', 209, 128, STAT_CELLS, 1}, // dpmod plasma gun
- {'w', 210, 8388608, STAT_CELLS, 1}, // dpmod plasma wave cannon
- {'l', 225, HIT_LASER_CANNON, STAT_CELLS, 1}, // hipnotic laser cannon
- {'h', 226, HIT_MJOLNIR, STAT_CELLS, 0}, // hipnotic mjolnir hammer
- {-1, 0, 0, 0, 0}
+ const char *name;
+ int impulse;
+ int weaponbit;
+ int ammostat;
+ int ammomin;
+}
+in_bestweapon_info[] =
+{
+ {"1", 1, IT_AXE, STAT_SHELLS, 0},
+ {"2", 2, IT_SHOTGUN, STAT_SHELLS, 1},
+ {"3", 3, IT_SUPER_SHOTGUN, STAT_SHELLS, 1},
+ {"4", 4, IT_NAILGUN, STAT_NAILS, 1},
+ {"5", 5, IT_SUPER_NAILGUN, STAT_NAILS, 1},
+ {"6", 6, IT_GRENADE_LAUNCHER, STAT_ROCKETS, 1},
+ {"7", 7, IT_ROCKET_LAUNCHER, STAT_ROCKETS, 1},
+ {"8", 8, IT_LIGHTNING, STAT_CELLS, 1},
+ {"9", 9, 128, STAT_CELLS, 1}, // generic energy weapon for mods
+ {"p", 209, 128, STAT_CELLS, 1}, // dpmod plasma gun
+ {"w", 210, 8388608, STAT_CELLS, 1}, // dpmod plasma wave cannon
+ {"l", 225, HIT_LASER_CANNON, STAT_CELLS, 1}, // hipnotic laser cannon
+ {"h", 226, HIT_MJOLNIR, STAT_CELLS, 0}, // hipnotic mjolnir hammer
+ {NULL, 0, 0, 0, 0}
};
void IN_BestWeapon (void)
{
int i, n;
- const char *s;
- if (Cmd_Argc() != 2)
+ const char *t;
+ if (Cmd_Argc() < 2)
{
- Con_Printf("bestweapon requires 1 parameter\n");
+ Con_Printf("bestweapon requires 1 or more parameters\n");
return;
}
- s = Cmd_Argv(1);
- for (i = 0;s[i];i++)
+ for (i = 1;i < Cmd_Argc();i++)
{
+ t = Cmd_Argv(i);
// figure out which weapon this character refers to
- for (n = 0;in_bestweapon_info[n][0] >= 0;n++)
+ for (n = 0;in_bestweapon_info[n].name;n++)
{
- if (in_bestweapon_info[n][0] == s[i])
+ if (!strcmp(in_bestweapon_info[n].name, t))
{
// we found out what weapon this character refers to
// check if the inventory contains the weapon and enough ammo
- if ((cl.stats[STAT_ITEMS] & in_bestweapon_info[n][2]) && (cl.stats[in_bestweapon_info[n][3]] >= in_bestweapon_info[n][4]))
+ if ((cl.stats[STAT_ITEMS] & in_bestweapon_info[n].weaponbit) && (cl.stats[in_bestweapon_info[n].ammostat] >= in_bestweapon_info[n].ammomin))
{
// we found one of the weapons the player wanted
// send an impulse to switch to it
- in_impulse = in_bestweapon_info[n][1];
+ in_impulse = in_bestweapon_info[n].impulse;
return;
}
break;
cvar_t cl_anglespeedkey = {CVAR_SAVE, "cl_anglespeedkey","1.5","how much +speed multiplies keyboard turning speed"};
cvar_t cl_movement = {CVAR_SAVE, "cl_movement", "0", "enables clientside prediction of your player movement"};
-cvar_t cl_movement_latency = {0, "cl_movement_latency", "0", "compensates for this much latency (ping time) on quake servers which do not really support prediction, no effect on darkplaces7 protocol servers or quakeworld servers"};
+cvar_t cl_movement_minping = {CVAR_SAVE, "cl_movement_minping", "50", "whether to use prediction when ping is lower than this value in milliseconds"};
cvar_t cl_movement_maxspeed = {0, "cl_movement_maxspeed", "320", "how fast you can move (should match sv_maxspeed)"};
cvar_t cl_movement_maxairspeed = {0, "cl_movement_maxairspeed", "30", "how fast you can move while in the air (should match sv_maxairspeed)"};
cvar_t cl_movement_stopspeed = {0, "cl_movement_stopspeed", "100", "speed below which you will be slowed rapidly to a stop rather than sliding endlessly (should match sv_stopspeed)"};
cvar_t cl_gravity = {0, "cl_gravity", "800", "how much gravity to apply in client physics (should match sv_gravity)"};
cvar_t cl_slowmo = {0, "cl_slowmo", "1", "speed of game time (should match slowmo)"};
-cvar_t in_pitch_min = {0, "in_pitch_min", "-90", "how far downward you can aim (quake used -70"}; // quake used -70
-cvar_t in_pitch_max = {0, "in_pitch_max", "90", "how far upward you can aim (quake used 80"}; // quake used 80
+cvar_t in_pitch_min = {0, "in_pitch_min", "-90", "how far downward you can aim (quake used -70"};
+cvar_t in_pitch_max = {0, "in_pitch_max", "90", "how far upward you can aim (quake used 80"};
cvar_t m_filter = {CVAR_SAVE, "m_filter","0", "smoothes mouse movement, less responsive but smoother aiming"};
cvar_t cl_netinputpacketspersecond = {CVAR_SAVE, "cl_netinputpacketspersecond","50", "how many input packets to send to server each second"};
-cvar_t cl_netinputpacketlosstolerance = {CVAR_SAVE, "cl_netinputpacketlosstolerance", "4", "how many packets in a row can be lost without movement issues when using cl_movement (technically how many input messages to repeat in each packet that have not yet been acknowledged by the server)"};
+cvar_t cl_netinputpacketlosstolerance = {CVAR_SAVE, "cl_netinputpacketlosstolerance", "1", "how many packets in a row can be lost without movement issues when using cl_movement (technically how many input messages to repeat in each packet that have not yet been acknowledged by the server), only affects DP7 servers (Quake uses 0, QuakeWorld uses 2, and just for comparison Quake3 uses 1)"};
cvar_t cl_nodelta = {0, "cl_nodelta", "0", "disables delta compression of non-player entities in QW network protocol"};
cl.cmd.cursor_fraction = CL_SelectTraceLine(cl.cmd.cursor_start, cl.cmd.cursor_end, cl.cmd.cursor_impact, cl.cmd.cursor_normal, &cl.cmd.cursor_entitynumber, (chase_active.integer || cl.intermission) ? &cl.entities[cl.playerentity].render : NULL);
}
-void CL_ClientMovement_Replay(void);
-
void CL_ClientMovement_InputQW(void)
{
int i;
cl.movement_queue[cl.movement_numqueue].crouch = false;
cl.movement_numqueue++;
}
- CL_ClientMovement_Replay();
+
+ cl.movement_replay = true;
}
void CL_ClientMovement_Input(qboolean buttonjump, qboolean buttoncrouch)
cl.movement_replay_canjump = !cl.movement_queue[i].jump; // FIXME: this logic is quite broken
}
}
- else
- {
- for (i = 0;i < n;i++)
- {
- if (cl.movement_queue[i].time >= cl.movecmd[0].time - cl_movement_latency.value / 1000.0 && cl.movement_queue[i].time <= cl.movecmd[0].time)
- cl.movement_queue[cl.movement_numqueue++] = cl.movement_queue[i];
- else if (i == 0)
- cl.movement_replay_canjump = !cl.movement_queue[i].jump; // FIXME: this logic is quite broken
- }
- }
// add to input queue if there is room
if (cl.movement_numqueue < (int)(sizeof(cl.movement_queue)/sizeof(cl.movement_queue[0])))
{
cl.movement_queue[cl.movement_numqueue].crouch = buttoncrouch;
cl.movement_numqueue++;
}
- CL_ClientMovement_Replay();
+
+ cl.movement_replay = true;
}
typedef enum waterlevel_e
void CL_ClientMovement_Replay(void)
{
int i;
+ double totalmovetime;
cl_clientmovement_state_t s;
// set up starting state for the series of moves
s.movevars_airaccel_sideways_friction = cl_movement_airaccel_sideways_friction.value;
}
- cl.movement_predicted = (cl_movement.integer && !cls.demoplayback && cls.signon == SIGNONS && cl.stats[STAT_HEALTH] > 0 && !cl.intermission) && ((cls.protocol != PROTOCOL_DARKPLACES6 && cls.protocol != PROTOCOL_DARKPLACES7) || cls.servermovesequence);
+ totalmovetime = 0;
+ for (i = 0;i < cl.movement_numqueue - 1;i++)
+ totalmovetime += cl.movement_queue[i].frametime;
+ cl.movement_predicted = totalmovetime * 1000.0 >= cl_movement_minping.value && cls.servermovesequence && (cl_movement.integer && !cls.demoplayback && cls.signon == SIGNONS && cl.stats[STAT_HEALTH] > 0 && !cl.intermission);
if (cl.movement_predicted)
{
//Con_Printf("%f: ", cl.movecmd[0].time);
}
CL_ClientMovement_UpdateStatus(&s);
- // store replay location
- if (cl.movecmd[0].time > cl.movecmd[1].time)
+ if (cl.movement_replay)
{
- cl.movement_time[1] = cl.movecmd[1].time;
- cl.movement_time[0] = cl.movecmd[0].time;
- cl.movement_time[2] = cl.time;
- VectorCopy(cl.movement_origin, cl.movement_oldorigin);
+ cl.movement_replay = false;
+ // update interpolation timestamps if time has passed
+ if (cl.movecmd[0].time != cl.movecmd[1].time)
+ {
+ cl.movement_time[1] = cl.movecmd[1].time;
+ cl.movement_time[0] = cl.movecmd[0].time;
+ cl.movement_time[2] = cl.time;
+ VectorCopy(cl.movement_origin, cl.movement_oldorigin);
+ //VectorCopy(s.origin, cl.entities[cl.playerentity].state_current.origin);
+ //VectorSet(cl.entities[cl.playerentity].state_current.angles, 0, cl.viewangles[1], 0);
+ }
+
+ // update the interpolation target position and velocity
VectorCopy(s.origin, cl.movement_origin);
VectorCopy(s.velocity, cl.movement_velocity);
- //VectorCopy(s.origin, cl.entities[cl.playerentity].state_current.origin);
- //VectorSet(cl.entities[cl.playerentity].state_current.angles, 0, cl.viewangles[1], 0);
-
- // update the onground flag if appropriate
- // when not predicted, cl.onground is only cleared by cl_parse.c, but can
- // be set forcefully here to hide server inconsistencies in the onground
- // flag (such as when stepping up stairs, the onground flag tends to turn
- // off briefly due to precision errors, particularly at high framerates),
- // such inconsistencies can mess up the gun bobbing and stair smoothing,
- // so they must be avoided.
- if (cl.movement_predicted)
- cl.onground = s.onground;
- else if (s.onground)
+ }
+
+ // update the onground flag if appropriate
+ if (cl.movement_predicted)
+ {
+ // when predicted we simply set the flag according to the UpdateStatus
+ cl.onground = s.onground;
+ }
+ else
+ {
+ // when not predicted, cl.onground is cleared by cl_parse.c each time
+ // an update packet is received, but can be forced on here to hide
+ // server inconsistencies in the onground flag
+ // (which mostly occur when stepping up stairs at very high framerates
+ // where after the step up the move continues forward and not
+ // downward so the ground is not detected)
+ //
+ // such onground inconsistencies can cause jittery gun bobbing and
+ // stair smoothing, so we set onground if UpdateStatus says so
+ if (s.onground)
cl.onground = true;
+ }
- // react to onground state changes (for gun bob)
- if (cl.onground)
- {
- if (!cl.oldonground)
- cl.hitgroundtime = cl.movecmd[0].time;
- cl.lastongroundtime = cl.movecmd[0].time;
- }
- cl.oldonground = cl.onground;
+ // react to onground state changes (for gun bob)
+ if (cl.onground)
+ {
+ if (!cl.oldonground)
+ cl.hitgroundtime = cl.movecmd[0].time;
+ cl.lastongroundtime = cl.movecmd[0].time;
}
+ cl.oldonground = cl.onground;
}
void QW_MSG_WriteDeltaUsercmd(sizebuf_t *buf, usercmd_t *from, usercmd_t *to)
// configurable number of unacknowledged moves
maxusercmds = bound(1, cl_netinputpacketlosstolerance.integer + 1, CL_MAX_USERCMDS);
// when movement prediction is off, there's not much point in repeating old input as it will just be ignored
- if (!cl.movement_predicted)
+ if (!cl.cmd.sequence)
maxusercmds = 1;
}
Cmd_AddCommand ("-button16", IN_Button16Up, "deactivate button16");
// LordHavoc: added bestweapon command
- Cmd_AddCommand ("bestweapon", IN_BestWeapon, "send an impulse number to server to select the first usable weapon out of several (example: 87654321)");
+ Cmd_AddCommand ("bestweapon", IN_BestWeapon, "send an impulse number to server to select the first usable weapon out of several (example: 8 7 6 5 4 3 2 1)");
Cvar_RegisterVariable(&cl_movement);
- Cvar_RegisterVariable(&cl_movement_latency);
+ Cvar_RegisterVariable(&cl_movement_minping);
Cvar_RegisterVariable(&cl_movement_maxspeed);
Cvar_RegisterVariable(&cl_movement_maxairspeed);
Cvar_RegisterVariable(&cl_movement_stopspeed);
projects / xonotic / darkplaces.git / blobdiff