X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Fcsqcmodel%2Fcl_player.qc;h=58c5f71f039d6686141fffc0806567fdf87a70d2;hp=7bceb538388d109b669f3cc0bdc9f8321501593e;hb=7666560c6a475aefe6b55ff74a20444f328e0093;hpb=e57480382bd4cdd42b6fbe16fb72f31d136668a1 diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc index 7bceb53838..58c5f71f03 100644 --- a/qcsrc/lib/csqcmodel/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -25,16 +25,17 @@ #include "cl_model.qh" #include "common.qh" #include "interpolate.qh" -#include "../../client/defs.qh" -#include "../../client/main.qh" -#include "../../common/constants.qh" -#include "../../common/physics/player.qh" -#include "../../common/stats.qh" -#include "../../common/triggers/trigger/viewloc.qh" -#include "../../common/util.qh" -#include "../../common/viewloc.qh" +#include +#include +#include +#include +#include +#include +#include +#include float autocvar_cl_movement_errorcompensation = 0; +bool autocvar_cl_movement_intermissionrunning = false; // engine stuff float pmove_onground; // weird engine flag we shouldn't really use but have to for now @@ -75,7 +76,7 @@ void CSQCPlayer_SetPredictionError(vector o, vector v, float onground_diff) return; } */ - if(vlen(o) > 32 || vlen(v) > 192) + if(vdist(o, >, 32) || vdist(v, >, 192)) { //printf("TOO BIG: x=%v v=%v\n", o, v); return; @@ -107,15 +108,15 @@ void CSQCPlayer_SetMinsMaxs(entity this) { if ((this.flags & FL_DUCKED) || !this.isplayermodel) { - this.mins = PL_CROUCH_MIN; - this.maxs = PL_CROUCH_MAX; - this.view_ofs = PL_CROUCH_VIEW_OFS; + this.mins = STAT(PL_CROUCH_MIN, NULL); + this.maxs = STAT(PL_CROUCH_MAX, NULL); + this.view_ofs = STAT(PL_CROUCH_VIEW_OFS, NULL); } else { - this.mins = PL_MIN; - this.maxs = PL_MAX; - this.view_ofs = PL_VIEW_OFS; + this.mins = STAT(PL_MIN, NULL); + this.maxs = STAT(PL_MAX, NULL); + this.view_ofs = STAT(PL_VIEW_OFS, NULL); } } @@ -137,24 +138,12 @@ void Movetype_Physics_Spam(entity this) // optimized if(wasfreed(this)) return; - this.avelocity = this.move_avelocity; - this.velocity = this.move_velocity; - this.angles = this.move_angles; - this.flags = BITSET(this.flags, FL_ONGROUND, boolean(this.move_flags & FL_ONGROUND)); - this.flags = BITSET(this.flags, FL_WATERJUMP, boolean(this.move_flags & FL_WATERJUMP)); - this.waterlevel = this.move_waterlevel; - this.watertype = this.move_watertype; - setorigin(this, this.move_origin); + setorigin(this, this.origin); } void CSQCPlayer_CheckWater(entity this) { - this.move_origin = this.origin; - this.move_waterlevel = this.waterlevel; - this.move_watertype = this.watertype; _Movetype_CheckWater(this); - this.waterlevel = this.move_waterlevel; - this.watertype = this.move_watertype; } void CSQCPlayer_Physics(entity this) @@ -164,26 +153,25 @@ void CSQCPlayer_Physics(entity this) if(autocvar_cl_movement == 1) CSQCPlayer_CheckWater(this); // we apparently need to check water *before* physics so it can use this for water jump + vector oldv_angle = this.v_angle; + vector oldangles = this.angles; // we need to save these, as they're abused by other code + this.v_angle = PHYS_INPUT_ANGLES(this); + this.angles = PHYS_WORLD_ANGLES(this); + CSQC_ClientMovement_PlayerMove_Frame(this); if(autocvar_cl_movement == 1) - { - this.move_origin = this.origin; - this.move_angles = this.angles; - //this.move_movetype = MOVETYPE_WALK; // temp - this.move_velocity = this.velocity; - this.move_avelocity = this.avelocity; - this.move_flags = BITSET(this.move_flags, FL_ONGROUND, boolean(this.flags & FL_ONGROUND)); - this.move_flags = BITSET(this.move_flags, FL_WATERJUMP, boolean(this.flags & FL_WATERJUMP)); - this.move_waterlevel = this.waterlevel; - this.move_watertype = this.watertype; Movetype_Physics_Spam(this); - } + + view_angles = this.v_angle; + input_angles = this.angles; + this.v_angle = oldv_angle; + this.angles = oldangles; this.pmove_flags = ((this.flags & FL_DUCKED) ? PMF_DUCKED : 0) | (!(this.flags & FL_JUMPRELEASED) ? PMF_JUMP_HELD : 0) | - ((this.flags & FL_ONGROUND) ? PMF_ONGROUND : 0); + ((IS_ONGROUND(this)) ? PMF_ONGROUND : 0); } } @@ -244,10 +232,10 @@ void CSQCPlayer_SetViewLocation() /** Called once per CSQC_UpdateView() */ void CSQCPlayer_SetCamera() { - const vector v0 = pmove_vel; // TRICK: pmove_vel is set by the engine when we get here. No need to network velocity + const vector v0 = ((intermission && !autocvar_cl_movement_intermissionrunning) ? '0 0 0' : pmove_vel); // TRICK: pmove_vel is set by the engine when we get here. No need to network velocity const float vh = STAT(VIEWHEIGHT); - const vector pl_viewofs = PL_VIEW_OFS; - const vector pl_viewofs_crouch = PL_CROUCH_VIEW_OFS; + const vector pl_viewofs = STAT(PL_VIEW_OFS, NULL); + const vector pl_viewofs_crouch = STAT(PL_CROUCH_VIEW_OFS, NULL); const entity e = csqcplayer; if (e) { @@ -282,7 +270,7 @@ void CSQCPlayer_SetCamera() const vector o = e.origin; csqcplayer_status = CSQCPLAYERSTATUS_PREDICTED; CSQCPlayer_PredictTo(e, servercommandframe + 1, false); - CSQCPlayer_SetPredictionError(e.origin - o, e.velocity - v0, pmove_onground - boolean(e.flags & FL_ONGROUND)); + CSQCPlayer_SetPredictionError(e.origin - o, e.velocity - v0, pmove_onground - IS_ONGROUND(e)); e.origin = o; e.velocity = v0; @@ -323,7 +311,7 @@ void CSQCPlayer_SetCamera() if (view.csqcmodel_teleported) refdefflags |= REFDEFFLAG_TELEPORTED; if (input_buttons & BIT(1)) refdefflags |= REFDEFFLAG_JUMPING; // note: these two only work in WIP2, but are harmless in WIP1 - if (STAT(HEALTH) <= 0) refdefflags |= REFDEFFLAG_DEAD; + if (STAT(HEALTH) <= 0 && STAT(HEALTH) != -666 && STAT(HEALTH) != -2342) refdefflags |= REFDEFFLAG_DEAD; if (intermission) refdefflags |= REFDEFFLAG_INTERMISSION; V_CalcRefdef(view, refdefflags); } @@ -339,7 +327,7 @@ void CSQCPlayer_SetCamera() CSQCPLAYER_HOOK_POSTCAMERASETUP(); } -void CSQCPlayer_Remove() +void CSQCPlayer_Remove(entity this) { csqcplayer = NULL; cvar_settemp("cl_movement_replay", "1");