/*
* Copyright (c) 2011 Rudolf Polzer
+ * Copyright (c) 2015 Micah Talkiewicz
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
#include "common.qh"
#include "cl_model.qh"
#include "cl_player.qh"
+ #include "../common/triggers/trigger/viewloc.qh"
+ #include "../common/viewloc.qh"
#elif defined(MENUQC)
#elif defined(SVQC)
#endif
float autocvar_cl_movement_errorcompensation = 0;
+int autocvar_cl_movement = 1;
// engine stuff
float pmove_onground; // weird engine flag we shouldn't really use but have to for now
}
void CSQCPlayer_Unpredict()
-{
+{SELFPARAM();
if(csqcplayer_status == CSQCPLAYERSTATUS_UNPREDICTED)
return;
if(csqcplayer_status != CSQCPLAYERSTATUS_PREDICTED)
self.origin = csqcplayer_origin;
self.velocity = csqcplayer_velocity;
csqcplayer_moveframe = csqcplayer_sequence+1; //+1 because the recieved frame has the move already done (server side)
- self.pmove_flags = player_pmflags;
+ self.flags = player_pmflags;
}
void CSQCPlayer_SetMinsMaxs()
-{
- if(self.pmove_flags & PMF_DUCKED)
+{SELFPARAM();
+ if(self.flags & FL_DUCKED)
{
self.mins = PL_CROUCH_MIN;
self.maxs = PL_CROUCH_MAX;
}
void CSQCPlayer_SavePrediction()
-{
- player_pmflags = self.pmove_flags;
+{SELFPARAM();
+ player_pmflags = self.flags;
csqcplayer_origin = self.origin;
csqcplayer_velocity = self.velocity;
csqcplayer_sequence = servercommandframe;
csqcplayer_status = CSQCPLAYERSTATUS_PREDICTED;
}
-void CSQCPlayer_PredictTo(float endframe, float apply_error)
+void CSQC_ClientMovement_PlayerMove_Frame();
+
+void PM_Movement_Move()
+{SELFPARAM();
+ runstandardplayerphysics(self);
+#ifdef CSQC
+ self.flags =
+ ((self.pmove_flags & PMF_DUCKED) ? FL_DUCKED : 0) |
+ (!(self.pmove_flags & PMF_JUMP_HELD) ? FL_JUMPRELEASED : 0) |
+ ((self.pmove_flags & PMF_ONGROUND) ? FL_ONGROUND : 0);
+#endif
+}
+
+void CSQCPlayer_Physics(void)
{
+ switch(autocvar_cl_movement)
+ {
+ case 1: CSQC_ClientMovement_PlayerMove_Frame(); break;
+ case 2: PM_Movement_Move(); break;
+ }
+}
+
+void CSQCPlayer_PredictTo(float endframe, float apply_error)
+{SELFPARAM();
CSQCPlayer_Unpredict();
if(apply_error)
{
{
csqcplayer_moveframe = clientcommandframe;
getinputstate(csqcplayer_moveframe-1);
- print("the Weird code path got hit\n");
+ LOG_INFO("the Weird code path got hit\n");
return;
}
#endif
{
if (!getinputstate(csqcplayer_moveframe))
break;
- runstandardplayerphysics(self);
+ CSQCPlayer_Physics();
CSQCPlayer_SetMinsMaxs();
csqcplayer_moveframe++;
}
input_angles = view_angles;
}
-float CSQCPlayer_IsLocalPlayer()
-{
+bool CSQCPlayer_IsLocalPlayer()
+{SELFPARAM();
return (self == csqcplayer);
}
-void CSQCPlayer_SetCamera()
+void CSQCPlayer_SetViewLocation()
{
+ viewloc_SetViewLocation();
+}
+
+void CSQCPlayer_SetCamera()
+{SELFPARAM();
vector v0;
v0 = pmove_vel; // TRICK: pmove_vel is set by the engine when we get here. No need to network velocity
if(csqcplayer)
{
- entity oldself;
- oldself = self;
- self = csqcplayer;
+ setself(csqcplayer);
if(servercommandframe == 0 || clientcommandframe == 0)
{
self.view_ofs = '0 0 1' * getstati(STAT_VIEWHEIGHT);
// get crouch state from the server
- if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS_z)
- self.pmove_flags &= ~PMF_DUCKED;
- else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS_z)
- self.pmove_flags |= PMF_DUCKED;
+ if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS.z)
+ self.flags &= ~FL_DUCKED;
+ else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS.z)
+ self.flags |= FL_DUCKED;
// get onground state from the server
if(pmove_onground)
- self.pmove_flags |= PMF_ONGROUND;
+ self.flags |= FL_ONGROUND;
else
- self.pmove_flags &= ~PMF_ONGROUND;
+ self.flags &= ~FL_ONGROUND;
CSQCPlayer_SetMinsMaxs();
v = v0;
csqcplayer_status = CSQCPLAYERSTATUS_PREDICTED;
CSQCPlayer_PredictTo(servercommandframe + 1, false);
- CSQCPlayer_SetPredictionError(self.origin - o, self.velocity - v, pmove_onground - !!(self.pmove_flags & PMF_ONGROUND));
+ CSQCPlayer_SetPredictionError(self.origin - o, self.velocity - v, pmove_onground - !!(self.flags & FL_ONGROUND));
self.origin = o;
self.velocity = v;
// get crouch state from the server
- if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS_z)
- self.pmove_flags &= ~PMF_DUCKED;
- else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS_z)
- self.pmove_flags |= PMF_DUCKED;
+ if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS.z)
+ self.flags &= ~FL_DUCKED;
+ else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS.z)
+ self.flags |= FL_DUCKED;
// get onground state from the server
if(pmove_onground)
- self.pmove_flags |= PMF_ONGROUND;
+ self.flags |= FL_ONGROUND;
else
- self.pmove_flags &= ~PMF_ONGROUND;
+ self.flags &= ~FL_ONGROUND;
CSQCPlayer_SavePrediction();
}
#ifdef CSQCMODEL_SERVERSIDE_CROUCH
// get crouch state from the server (LAG)
- if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS_z)
- self.pmove_flags &= ~PMF_DUCKED;
- else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS_z)
- self.pmove_flags |= PMF_DUCKED;
+ if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS.z)
+ self.flags &= ~FL_DUCKED;
+ else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS.z)
+ self.flags |= FL_DUCKED;
#endif
CSQCPlayer_SetMinsMaxs();
// relink
setorigin(self, self.origin);
- self = oldself;
+ setself(this);
}
- entity view;
- view = CSQCModel_server2csqc(player_localentnum);
+ entity view = CSQCModel_server2csqc(player_localentnum);
if(view && view != csqcplayer)
{
- entity oldself = self;
- self = view;
- InterpolateOrigin_Do();
- self.view_ofs = '0 0 1' * getstati(STAT_VIEWHEIGHT);
- self = oldself;
+ WITH(entity, self, view, InterpolateOrigin_Do());
+ view.view_ofs = '0 0 1' * getstati(STAT_VIEWHEIGHT);
}
if(view)
}
float CSQCPlayer_PreUpdate()
-{
+{SELFPARAM();
if(self != csqcplayer)
return 0;
if(csqcplayer_status != CSQCPLAYERSTATUS_FROMSERVER)
}
float CSQCPlayer_PostUpdate()
-{
+{SELFPARAM();
if(self.entnum != player_localnum + 1)
return 0;
csqcplayer = self;