Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes some player's origin displacements for fire events, impulses commands… #442

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes some player's origin displacements for fire events, impulses commands… #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff47d39
Fixes some player's origin displacements for fire events, impulses co…
XutaxKamay Dec 20, 2017
d370302
Sometimes teleports wouldn't work because physics impacts were proces…
XutaxKamay Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mp/src/game/client/prediction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,9 +909,9 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper
pVehicle->ProcessMovement( player, g_pMoveData );
}

FinishMove( player, ucmd, g_pMoveData );
RunPostThink( player );

RunPostThink( player );
FinishMove( player, ucmd, g_pMoveData );

g_pGameMovement->FinishTrackPredictionErrors( player );

Expand Down
14 changes: 7 additions & 7 deletions mp/src/game/server/player_command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,11 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
{
player->pl.v_angle = ucmd->viewangles + player->pl.anglechange;
}

// Let server invoke any needed impact functions
VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
moveHelper->ProcessImpacts();
VPROF_SCOPE_END();

// Call standard client pre-think
RunPreThink( player );
Expand All @@ -440,6 +445,8 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
pVehicle->ProcessMovement( player, g_pMoveData );
}

RunPostThink( player );

// Copy output
FinishMove( player, ucmd, g_pMoveData );

Expand All @@ -449,13 +456,6 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
player->pl.v_angle = player->GetLockViewanglesData();
}

// Let server invoke any needed impact functions
VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
moveHelper->ProcessImpacts();
VPROF_SCOPE_END();

RunPostThink( player );

g_pGameMovement->FinishTrackPredictionErrors( player );

FinishCommand( player );
Expand Down
4 changes: 2 additions & 2 deletions sp/src/game/client/prediction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,9 +903,9 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper
pVehicle->ProcessMovement( player, g_pMoveData );
}

FinishMove( player, ucmd, g_pMoveData );
RunPostThink( player );

RunPostThink( player );
FinishMove( player, ucmd, g_pMoveData );

g_pGameMovement->FinishTrackPredictionErrors( player );

Expand Down
14 changes: 7 additions & 7 deletions sp/src/game/server/player_command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,11 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
{
player->pl.v_angle = ucmd->viewangles + player->pl.anglechange;
}

// Let server invoke any needed impact functions
VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
moveHelper->ProcessImpacts();
VPROF_SCOPE_END();

// Call standard client pre-think
RunPreThink( player );
Expand All @@ -439,16 +444,11 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
pVehicle->ProcessMovement( player, g_pMoveData );
}

RunPostThink( player );

// Copy output
FinishMove( player, ucmd, g_pMoveData );

// Let server invoke any needed impact functions
VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
moveHelper->ProcessImpacts();
VPROF_SCOPE_END();

RunPostThink( player );

g_pGameMovement->FinishTrackPredictionErrors( player );

FinishCommand( player );
Expand Down