X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_user.c;h=1213e6f11b3368333cf4a00bcc4bb4854fb5e026;hp=303d6ede02cd350bc833e9013f22a820993efd0d;hb=9bfb5fe81e3494eb30d9ceb26f290bb8cb3100a9;hpb=1b601105a1d4228358fa0245329cdcb5768c49df diff --git a/sv_user.c b/sv_user.c index 303d6ede..1213e6f1 100644 --- a/sv_user.c +++ b/sv_user.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -21,27 +21,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -edict_t *sv_player; +edict_t *sv_player; -extern cvar_t sv_friction; -cvar_t sv_edgefriction = {"edgefriction", "2"}; -extern cvar_t sv_stopspeed; +cvar_t sv_edgefriction = {0, "edgefriction", "2"}; +cvar_t sv_predict = {0, "sv_predict", "1"}; +cvar_t sv_deltacompress = {0, "sv_deltacompress", "1"}; +cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8"}; +cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320"}; +cvar_t sv_accelerate = {0, "sv_accelerate", "10"}; -static vec3_t forward, right, up; +static vec3_t forward, right, up; -vec3_t wishdir; -float wishspeed; +vec3_t wishdir; +float wishspeed; // world -float *angles; -float *origin; -float *velocity; +float *angles; +float *origin; +float *velocity; -qboolean onground; +qboolean onground; -usercmd_t cmd; - -cvar_t sv_idealpitchscale = {"sv_idealpitchscale","0.8"}; +usercmd_t cmd; /* @@ -61,7 +62,7 @@ void SV_SetIdealPitch (void) if (!((int)sv_player->v.flags & FL_ONGROUND)) return; - + angleval = sv_player->v.angles[YAW] * M_PI*2 / 360; sinval = sin(angleval); cosval = cos(angleval); @@ -71,21 +72,23 @@ void SV_SetIdealPitch (void) top[0] = sv_player->v.origin[0] + cosval*(i+3)*12; top[1] = sv_player->v.origin[1] + sinval*(i+3)*12; top[2] = sv_player->v.origin[2] + sv_player->v.view_ofs[2]; - + bottom[0] = top[0]; bottom[1] = top[1]; bottom[2] = top[2] - 160; - - tr = SV_Move (top, vec3_origin, vec3_origin, bottom, 1, sv_player); + + tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, sv_player); + // if looking at a wall, leave ideal the way is was if (tr.allsolid) - return; // looking at a wall, leave ideal the way is was + return; + // near a dropoff if (tr.fraction == 1) - return; // near a dropoff - + return; + z[i] = top[2] + tr.fraction*(bottom[2]-top[2]); } - + dir = 0; steps = 0; for (j=1 ; j -ON_EPSILON && step < ON_EPSILON) continue; + // mixed changes if (dir && ( step-dir > ON_EPSILON || step-dir < -ON_EPSILON ) ) - return; // mixed changes + return; - steps++; + steps++; dir = step; } - + if (!dir) { sv_player->v.idealpitch = 0; return; } - + if (steps < 2) return; sv_player->v.idealpitch = -dir * sv_idealpitchscale.value; @@ -121,35 +125,33 @@ SV_UserFriction */ void SV_UserFriction (void) { - float *vel; - float speed, newspeed, control; - vec3_t start, stop; - float friction; - trace_t trace; - + float *vel, speed, newspeed, control, friction; + vec3_t start, stop; + trace_t trace; + vel = velocity; - + speed = sqrt(vel[0]*vel[0] +vel[1]*vel[1]); if (!speed) return; -// if the leading edge is over a dropoff, increase friction + // if the leading edge is over a dropoff, increase friction start[0] = stop[0] = origin[0] + vel[0]/speed*16; start[1] = stop[1] = origin[1] + vel[1]/speed*16; start[2] = origin[2] + sv_player->v.mins[2]; stop[2] = start[2] - 34; - trace = SV_Move (start, vec3_origin, vec3_origin, stop, true, sv_player); + trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, sv_player); if (trace.fraction == 1.0) friction = sv_friction.value*sv_edgefriction.value; else friction = sv_friction.value; -// apply friction + // apply friction control = speed < sv_stopspeed.value ? sv_stopspeed.value : speed; - newspeed = speed - host_frametime*control*friction; - + newspeed = speed - sv.frametime*control*friction; + if (newspeed < 0) newspeed = 0; else @@ -165,51 +167,28 @@ void SV_UserFriction (void) SV_Accelerate ============== */ -cvar_t sv_maxspeed = {"sv_maxspeed", "320", false, true}; -cvar_t sv_accelerate = {"sv_accelerate", "10"}; -#if 0 -void SV_Accelerate (vec3_t wishvel) -{ - int i; - float addspeed, accelspeed; - vec3_t pushvec; - - if (wishspeed == 0) - return; - - VectorSubtract (wishvel, velocity, pushvec); - addspeed = VectorNormalize (pushvec); - - accelspeed = sv_accelerate.value*host_frametime*addspeed; - if (accelspeed > addspeed) - accelspeed = addspeed; - - for (i=0 ; i<3 ; i++) - velocity[i] += accelspeed*pushvec[i]; -} -#endif void SV_Accelerate (void) { - int i; - float addspeed, accelspeed, currentspeed; + int i; + float addspeed, accelspeed, currentspeed; currentspeed = DotProduct (velocity, wishdir); addspeed = wishspeed - currentspeed; if (addspeed <= 0) return; - accelspeed = sv_accelerate.value*host_frametime*wishspeed; + accelspeed = sv_accelerate.value*sv.frametime*wishspeed; if (accelspeed > addspeed) accelspeed = addspeed; - + for (i=0 ; i<3 ; i++) - velocity[i] += accelspeed*wishdir[i]; + velocity[i] += accelspeed*wishdir[i]; } void SV_AirAccelerate (vec3_t wishveloc) { - int i; - float addspeed, wishspd, accelspeed, currentspeed; - + int i; + float addspeed, wishspd, accelspeed, currentspeed; + wishspd = VectorNormalizeLength (wishveloc); if (wishspd > 30) wishspd = 30; @@ -217,26 +196,61 @@ void SV_AirAccelerate (vec3_t wishveloc) addspeed = wishspd - currentspeed; if (addspeed <= 0) return; -// accelspeed = sv_accelerate.value * host_frametime; - accelspeed = sv_accelerate.value*wishspeed * host_frametime; + accelspeed = sv_accelerate.value*wishspeed * sv.frametime; if (accelspeed > addspeed) accelspeed = addspeed; - + for (i=0 ; i<3 ; i++) - velocity[i] += accelspeed*wishveloc[i]; + velocity[i] += accelspeed*wishveloc[i]; } void DropPunchAngle (void) { - float len; - + float len; + eval_t *val; + len = VectorNormalizeLength (sv_player->v.punchangle); - - len -= 10*host_frametime; + + len -= 10*sv.frametime; if (len < 0) len = 0; VectorScale (sv_player->v.punchangle, len, sv_player->v.punchangle); + + if ((val = GETEDICTFIELDVALUE(sv_player, eval_punchvector))) + { + len = VectorNormalizeLength (val->vector); + + len -= 20*sv.frametime; + if (len < 0) + len = 0; + VectorScale (val->vector, len, val->vector); + } +} + +/* +=================== +SV_FreeMove +=================== +*/ +void SV_FreeMove (void) +{ + int i; + float wishspeed; + + AngleVectors (sv_player->v.v_angle, forward, right, up); + + for (i = 0; i < 3; i++) + velocity[i] = forward[i] * cmd.forwardmove + right[i] * cmd.sidemove; + + velocity[2] += cmd.upmove; + + wishspeed = VectorLength (velocity); + if (wishspeed > sv_maxspeed.value) + { + VectorScale (velocity, sv_maxspeed.value / wishspeed, velocity); + wishspeed = sv_maxspeed.value; + } } /* @@ -247,13 +261,11 @@ SV_WaterMove */ void SV_WaterMove (void) { - int i; - vec3_t wishvel; - float speed, newspeed, wishspeed, addspeed, accelspeed; + int i; + vec3_t wishvel; + float speed, newspeed, wishspeed, addspeed, accelspeed, temp; -// -// user intentions -// + // user intentions AngleVectors (sv_player->v.v_angle, forward, right, up); for (i=0 ; i<3 ; i++) @@ -264,31 +276,29 @@ void SV_WaterMove (void) else wishvel[2] += cmd.upmove; - wishspeed = Length(wishvel); + wishspeed = VectorLength(wishvel); if (wishspeed > sv_maxspeed.value) { - VectorScale (wishvel, sv_maxspeed.value/wishspeed, wishvel); + temp = sv_maxspeed.value/wishspeed; + VectorScale (wishvel, temp, wishvel); wishspeed = sv_maxspeed.value; } wishspeed *= 0.7; -// -// water friction -// - speed = Length (velocity); + // water friction + speed = VectorLength (velocity); if (speed) { - newspeed = speed - host_frametime * speed * sv_friction.value; + newspeed = speed - sv.frametime * speed * sv_friction.value; if (newspeed < 0) - newspeed = 0; - VectorScale (velocity, newspeed/speed, velocity); + newspeed = 0; + temp = newspeed/speed; + VectorScale (velocity, temp, velocity); } else newspeed = 0; - -// -// water acceleration -// + + // water acceleration if (!wishspeed) return; @@ -297,7 +307,7 @@ void SV_WaterMove (void) return; VectorNormalize (wishvel); - accelspeed = sv_accelerate.value * wishspeed * host_frametime; + accelspeed = sv_accelerate.value * wishspeed * sv.frametime; if (accelspeed > addspeed) accelspeed = addspeed; @@ -307,8 +317,7 @@ void SV_WaterMove (void) void SV_WaterJump (void) { - if (sv.time > sv_player->v.teleport_time - || !sv_player->v.waterlevel) + if (sv.time > sv_player->v.teleport_time || !sv_player->v.waterlevel) { sv_player->v.flags = (int)sv_player->v.flags & ~FL_WATERJUMP; sv_player->v.teleport_time = 0; @@ -326,41 +335,40 @@ SV_AirMove */ void SV_AirMove (void) { - int i; - vec3_t wishvel; - float fmove, smove; + int i; + vec3_t wishvel; + float fmove, smove, temp; // LordHavoc: correct quake movement speed bug when looking up/down wishvel[0] = wishvel[2] = 0; wishvel[1] = sv_player->v.angles[1]; AngleVectors (wishvel, forward, right, up); -// AngleVectors (sv_player->v.angles, forward, right, up); fmove = cmd.forwardmove; smove = cmd.sidemove; - + // hack to not let you back into teleporter if (sv.time < sv_player->v.teleport_time && fmove < 0) fmove = 0; - + for (i=0 ; i<3 ; i++) wishvel[i] = forward[i]*fmove + right[i]*smove; - if ( (int)sv_player->v.movetype != MOVETYPE_WALK) - wishvel[2] = cmd.upmove; - else - wishvel[2] = 0; + if ((int)sv_player->v.movetype != MOVETYPE_WALK) + wishvel[2] += cmd.upmove; VectorCopy (wishvel, wishdir); wishspeed = VectorNormalizeLength(wishdir); if (wishspeed > sv_maxspeed.value) { - VectorScale (wishvel, sv_maxspeed.value/wishspeed, wishvel); + temp = sv_maxspeed.value/wishspeed; + VectorScale (wishvel, temp, wishvel); wishspeed = sv_maxspeed.value; } - - if ( sv_player->v.movetype == MOVETYPE_NOCLIP) - { // noclip + + if (sv_player->v.movetype == MOVETYPE_NOCLIP) + { + // noclip VectorCopy (wishvel, velocity); } else if ( onground ) @@ -369,9 +377,10 @@ void SV_AirMove (void) SV_Accelerate (); } else - { // not on ground, so little effect on velocity + { + // not on ground, so little effect on velocity SV_AirAccelerate (wishvel); - } + } } /* @@ -384,30 +393,27 @@ the angle fields specify an exact angular motion in degrees */ void SV_ClientThink (void) { - vec3_t v_angle; + vec3_t v_angle; if (sv_player->v.movetype == MOVETYPE_NONE) return; - + onground = (int)sv_player->v.flags & FL_ONGROUND; origin = sv_player->v.origin; velocity = sv_player->v.velocity; DropPunchAngle (); - -// -// if dead, behave differently -// + + // if dead, behave differently if (sv_player->v.health <= 0) return; -// -// angles -// show 1/3 the pitch angle and all the roll angle + // angles + // show 1/3 the pitch angle and all the roll angle cmd = host_client->cmd; angles = sv_player->v.angles; - + VectorAdd (sv_player->v.v_angle, sv_player->v.punchangle, v_angle); angles[ROLL] = V_CalcRoll (sv_player->v.angles, sv_player->v.velocity)*4; if (!sv_player->v.fixangle) @@ -425,17 +431,24 @@ void SV_ClientThink (void) SV_WaterJump (); return; } -// -// walk -// - if ( (sv_player->v.waterlevel >= 2) - && (sv_player->v.movetype != MOVETYPE_NOCLIP) ) + + // Player is (somehow) outside of the map, or flying, or noclipping + if (SV_TestEntityPosition (sv_player) + || sv_player->v.movetype == MOVETYPE_FLY + || sv_player->v.movetype == MOVETYPE_NOCLIP) + { + SV_FreeMove (); + return; + } + + // walk + if ((sv_player->v.waterlevel >= 2) && (sv_player->v.movetype != MOVETYPE_NOCLIP)) { SV_WaterMove (); return; } - SV_AirMove (); + SV_AirMove (); } @@ -446,51 +459,55 @@ SV_ReadClientMove */ void SV_ReadClientMove (usercmd_t *move) { - int i; - vec3_t angle; - int bits; - eval_t *val; - float total; - -// read ping time - host_client->ping_times[host_client->num_pings%NUM_PING_TIMES] - = sv.time - MSG_ReadFloat (); + int i; + vec3_t angle; + int bits; + eval_t *val; + float total; + + // read ping time + host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = sv.time - MSG_ReadFloat (); host_client->num_pings++; - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_ping)) - { - for (i=0, total = 0;i < NUM_PING_TIMES;i++) - total += host_client->ping_times[i]; - val->_float = 1000.0 / NUM_PING_TIMES; - } - -// read current angles - for (i=0 ; i<3 ; i++) - angle[i] = MSG_ReadAngle (); + for (i=0, total = 0;i < NUM_PING_TIMES;i++) + total += host_client->ping_times[i]; + // can be used for prediction + host_client->ping = total / NUM_PING_TIMES; + host_client->latency = 0; + // if paused or a local game, don't predict + if (sv_predict.integer && (svs.maxclients > 1) && (!sv.paused)) + host_client->latency = host_client->ping; + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ping))) + val->_float = host_client->ping * 1000.0; + + // read current angles + // dpprotocol version 2 + for (i = 0;i < 3;i++) + angle[i] = MSG_ReadFloat (); VectorCopy (angle, host_client->edict->v.v_angle); - -// read movement + + // read movement move->forwardmove = MSG_ReadShort (); move->sidemove = MSG_ReadShort (); move->upmove = MSG_ReadShort (); - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_movement)) + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_movement))) { val->vector[0] = move->forwardmove; val->vector[1] = move->sidemove; val->vector[2] = move->upmove; } - -// read buttons + + // read buttons bits = MSG_ReadByte (); host_client->edict->v.button0 = bits & 1; host_client->edict->v.button2 = (bits & 2)>>1; // LordHavoc: added 6 new buttons - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_button3)) val->_float = ((bits >> 2) & 1); - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_button4)) val->_float = ((bits >> 3) & 1); - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_button5)) val->_float = ((bits >> 4) & 1); - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_button6)) val->_float = ((bits >> 5) & 1); - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_button7)) val->_float = ((bits >> 6) & 1); - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_button8)) val->_float = ((bits >> 7) & 1); + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button3))) val->_float = ((bits >> 2) & 1); + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button4))) val->_float = ((bits >> 3) & 1); + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button5))) val->_float = ((bits >> 4) & 1); + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button6))) val->_float = ((bits >> 5) & 1); + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button7))) val->_float = ((bits >> 6) & 1); + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button8))) val->_float = ((bits >> 7) & 1); i = MSG_ReadByte (); if (i) @@ -504,12 +521,13 @@ SV_ReadClientMessage Returns false if the client should be killed =================== */ +extern void SV_SendServerinfo (client_t *client); qboolean SV_ReadClientMessage (void) { int ret; int cmd; char *s; - + do { nextmsg: @@ -521,41 +539,47 @@ nextmsg: } if (!ret) return true; - + MSG_BeginReading (); - + while (1) { if (!host_client->active) - return false; // a command caused an error + // a command caused an error + return false; if (msg_badread) { Sys_Printf ("SV_ReadClientMessage: badread\n"); return false; - } - + } + cmd = MSG_ReadChar (); - + +#ifndef NOROUTINGFIX + if (cmd != -1 && host_client->waitingforconnect) + { + host_client->waitingforconnect = false; + host_client->sendserverinfo = true; + } +#endif + switch (cmd) { case -1: - goto nextmsg; // end of message - + // end of message + goto nextmsg; + default: - Sys_Printf ("SV_ReadClientMessage: unknown command char\n"); + Sys_Printf ("SV_ReadClientMessage: unknown command char %i\n", cmd); return false; - + case clc_nop: -// Sys_Printf ("clc_nop\n"); break; - - case clc_stringcmd: + + case clc_stringcmd: s = MSG_ReadString (); - if (host_client->privileged) - ret = 2; - else - ret = 0; + ret = 0; if (Q_strncasecmp(s, "status", 6) == 0 || Q_strncasecmp(s, "name", 4) == 0 || Q_strncasecmp(s, "say", 3) == 0 @@ -571,28 +595,31 @@ nextmsg: || Q_strncasecmp(s, "ping", 4) == 0 || Q_strncasecmp(s, "ban", 3) == 0 || Q_strncasecmp(s, "pmodel", 6) == 0 - || (nehahra && (Q_strncasecmp(s, "max", 3) == 0 || Q_strncasecmp(s, "monster", 7) == 0 || Q_strncasecmp(s, "scrag", 5) == 0 || Q_strncasecmp(s, "gimme", 5) == 0 || Q_strncasecmp(s, "wraith", 6) == 0)) - || (!nehahra && (Q_strncasecmp(s, "god", 3) == 0 || Q_strncasecmp(s, "notarget", 8) == 0 || Q_strncasecmp(s, "fly", 3) == 0 || Q_strncasecmp(s, "give", 4) == 0 || Q_strncasecmp(s, "noclip", 6) == 0))) + || (gamemode == GAME_NEHAHRA && (Q_strncasecmp(s, "max", 3) == 0 || Q_strncasecmp(s, "monster", 7) == 0 || Q_strncasecmp(s, "scrag", 5) == 0 || Q_strncasecmp(s, "gimme", 5) == 0 || Q_strncasecmp(s, "wraith", 6) == 0)) + || (gamemode != GAME_NEHAHRA && (Q_strncasecmp(s, "god", 3) == 0 || Q_strncasecmp(s, "notarget", 8) == 0 || Q_strncasecmp(s, "fly", 3) == 0 || Q_strncasecmp(s, "give", 4) == 0 || Q_strncasecmp(s, "noclip", 6) == 0))) + { ret = 1; - if (ret == 2) - Cbuf_InsertText (s); - else if (ret == 1) Cmd_ExecuteString (s, src_client); + } else Con_DPrintf("%s tried to %s\n", host_client->name, s); break; - + case clc_disconnect: -// Sys_Printf ("SV_ReadClientMessage: client disconnected\n"); return false; - + case clc_move: SV_ReadClientMove (&host_client->cmd); break; + + case clc_ackentities: + EntityFrame_AckFrame(&host_client->entitydatabase, MSG_ReadLong()); + break; } } - } while (ret == 1); - + } + while (ret == 1); + return true; } @@ -602,40 +629,39 @@ nextmsg: SV_RunClients ================== */ -extern dfunction_t *SV_PlayerPhysicsQC; void SV_RunClients (void) { - int i; + int i; for (i=0, host_client = svs.clients ; iactive) continue; - + sv_player = host_client->edict; if (!SV_ReadClientMessage ()) { - SV_DropClient (false); // client misbehaved... + // client misbehaved... + SV_DropClient (false); continue; } if (!host_client->spawned) { - // clear client movement until a new packet is received + // clear client movement until a new packet is received memset (&host_client->cmd, 0, sizeof(host_client->cmd)); continue; } -// always pause in single player if in console or menus - if (!sv.paused && (svs.maxclients > 1 || key_dest == key_game) ) + if (sv.frametime) { // LordHavoc: QuakeC replacement for SV_ClientThink (player movement) if (SV_PlayerPhysicsQC) { pr_global_struct->time = sv.time; pr_global_struct->self = EDICT_TO_PROG(sv_player); - PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions)); + PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions), ""); } else SV_ClientThink ();