Skip to content

[TF2] Use correct activity in C_BaseObject placement hack #1813

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

Open
inco-cc wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

[TF2] Use correct activity in C_BaseObject placement hack #1813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/game/client/tf/c_baseobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,18 @@ void C_BaseObject::Simulate( void )
}
else if ( !IsPlacing() && !IsCarried() && m_iLastPlacementPosValid == 0 )
{
// HACK HACK: This sentry has been placed, but was placed on the server before the client updated
float flPlaybackRate = GetPlaybackRate();

// HACK HACK: This object has been placed, but was placed on the server before the client updated
// from the carry position to see that was a valid placement.
// It missed its chance to set the correct activity, so we're doing it now.
SetActivity( ACT_OBJ_RUNNING );
SetActivity( IsBuilding() ? ACT_OBJ_ASSEMBLING : ACT_OBJ_RUNNING );
SetPlaybackRate( flPlaybackRate );

// Check if the activity was valid because it might have still been using the older placement model
if ( GetActivity() != ACT_INVALID )
{
// Remember to retest our placement, but don't keep forcing the running activity
// Remember to retest our placement, but don't keep forcing the new activity
m_iLastPlacementPosValid = -1;
}
}
Expand Down