X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmovetypes%2Fmovetypes.qh;h=7578ae2fa446faae30fe97a44e84522c2a58e67d;hp=5f04fc9db2ee92c7b04f66261ceb8f1ae0da2a68;hb=00150d254602fa31f9dad646575697b2fc6b8ba3;hpb=1cbef966e133966c5b5f0f5b58fbd1a5851ed35b diff --git a/qcsrc/common/movetypes/movetypes.qh b/qcsrc/common/movetypes/movetypes.qh index 5f04fc9db..7578ae2fa 100644 --- a/qcsrc/common/movetypes/movetypes.qh +++ b/qcsrc/common/movetypes/movetypes.qh @@ -31,27 +31,27 @@ float autocvar_cl_gameplayfix_fixedcheckwatertransition = 1; .float move_suspendedinair; .float move_didgravity; -void _Movetype_WallFriction(vector stepnormal); -int _Movetype_FlyMove(float dt, bool applygravity, vector stepnormal, float stepheight); -void _Movetype_CheckVelocity(); +void _Movetype_WallFriction(entity this, vector stepnormal); +int _Movetype_FlyMove(entity this, float dt, bool applygravity, vector stepnormal, float stepheight); +void _Movetype_CheckVelocity(entity this); void _Movetype_CheckWaterTransition(entity ent); float _Movetype_CheckWater(entity ent); -void _Movetype_LinkEdict_TouchAreaGrid(); -void _Movetype_LinkEdict(float touch_triggers); -float _Movetype_TestEntityPosition(vector ofs); -float _Movetype_UnstickEntity(); +void _Movetype_LinkEdict_TouchAreaGrid(entity this); +void _Movetype_LinkEdict(entity this, float touch_triggers); +float _Movetype_TestEntityPosition(entity this, vector ofs); +float _Movetype_UnstickEntity(entity this); vector _Movetype_ClipVelocity(vector vel, vector norm, float f); -void _Movetype_PushEntityTrace(vector push); -float _Movetype_PushEntity(vector push, float failonstartsolid); +void _Movetype_PushEntityTrace(entity this, vector push); +float _Movetype_PushEntity(entity this, vector push, float failonstartsolid); void makevectors_matrix(vector myangles); -void Movetype_Physics_MatchTicrate(float tr, bool sloppy); -void Movetype_Physics_MatchServer(bool sloppy); -void Movetype_Physics_NoMatchServer(); -void _Movetype_LinkEdict(float touch_triggers); -void _Movetype_LinkEdict_TouchAreaGrid(); +void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy); +void Movetype_Physics_MatchServer(entity this, bool sloppy); +void Movetype_Physics_NoMatchServer(entity this); +void _Movetype_LinkEdict(entity this, float touch_triggers); +void _Movetype_LinkEdict_TouchAreaGrid(entity this); -float _Movetype_UnstickEntity(); +float _Movetype_UnstickEntity(entity this); const int MAX_CLIP_PLANES = 5; @@ -69,6 +69,7 @@ const int MOVETYPE_FLYMISSILE = 9; const int MOVETYPE_BOUNCE = 10; const int MOVETYPE_BOUNCEMISSILE = 11; // Like bounce but doesn't lose speed on bouncing const int MOVETYPE_FOLLOW = 12; +const int MOVETYPE_PHYSICS = 32; const int MOVETYPE_FLY_WORLDONLY = 33; const int FL_ITEM = 256;