Revision | 25733958457cc23a82ce233794f48ce041108a3d (tree) |
---|---|
Time | 2021-11-19 10:39:45 |
Author | Adam Kaminski <kaminskiadam9@gmai...> |
Commiter | Adam Kaminski |
Backed out changeset: 6efa764c923f
Removes: "Don't perform a backtrace on a player who activated any specials during extrapolation."
@@ -3925,16 +3925,7 @@ | ||
3925 | 3925 | { |
3926 | 3926 | if (num >= 0 && num <= 255) |
3927 | 3927 | { |
3928 | - // [AK] If the activator is a player who executed a special while they're being extrapolated, | |
3929 | - // then play it safe and don't perform a backtrace in case something happened. Note that it's | |
3930 | - // possible for ACS_ExecuteWithResult to execute but still return zero. | |
3931 | - int result = LineSpecials[num](line, activator, backSide, arg1, arg2, arg3, arg4, arg5); | |
3932 | - if (( activator ) && ( activator->player ) && ( result || num == ACS_ExecuteWithResult )) | |
3933 | - { | |
3934 | - if ( SERVER_IsExtrapolatingPlayer( activator->player - players )) | |
3935 | - SERVER_GetClient( activator->player - players )->OldData->bActivatedSpecial = true; | |
3936 | - } | |
3937 | - return result; | |
3928 | + return LineSpecials[num](line, activator, backSide, arg1, arg2, arg3, arg4, arg5); | |
3938 | 3929 | } |
3939 | 3930 | return 0; |
3940 | 3931 | } |
@@ -7008,15 +7008,6 @@ | ||
7008 | 7008 | if (death || (thing->activationtype & THINGSPEC_ClearSpecial && res)) thing->special = 0; |
7009 | 7009 | } |
7010 | 7010 | |
7011 | - // [AK] We should double-check if a player triggered a thing's special but wasn't the activator. | |
7012 | - // In case they're being extrapolated, play it safe and don't perform a backtrace in case something | |
7013 | - // happened. Note that it's possible for ACS_ExecuteWithResult to execute but still return zero. | |
7014 | - if (( trigger ) && ( trigger->player ) && ( res || thing->special == ACS_ExecuteWithResult )) | |
7015 | - { | |
7016 | - if ( SERVER_IsExtrapolatingPlayer( trigger->player - players )) | |
7017 | - SERVER_GetClient( trigger->player - players )->OldData->bActivatedSpecial = true; | |
7018 | - } | |
7019 | - | |
7020 | 7011 | // Returns the result |
7021 | 7012 | return res; |
7022 | 7013 | } |
@@ -5305,7 +5305,6 @@ | ||
5305 | 5305 | crouchViewDelta = player->crouchviewdelta; |
5306 | 5306 | bTookEnvironmentalDamage = false; |
5307 | 5307 | bTeleported = false; |
5308 | - bActivatedSpecial = false; | |
5309 | 5308 | } |
5310 | 5309 | |
5311 | 5310 | //***************************************************************************** |
@@ -7608,11 +7607,6 @@ | ||
7608 | 7607 | reason = "took environmental damage during extrapolation"; |
7609 | 7608 | bShouldPerform = false; |
7610 | 7609 | } |
7611 | - else if ( g_aClients[ulClient].OldData->bActivatedSpecial ) | |
7612 | - { | |
7613 | - reason = "activated special during extrapolation"; | |
7614 | - bShouldPerform = false; | |
7615 | - } | |
7616 | 7610 | else if ( gametic - g_aClients[ulClient].OldData->ulSavedGametic >= UNLAGGEDTICS ) |
7617 | 7611 | { |
7618 | 7612 | // [AK] Since the backtrace needs to hijack the unlagged's sector reconciliation, we don't want |
@@ -248,7 +248,6 @@ | ||
248 | 248 | fixed_t crouchViewDelta; |
249 | 249 | bool bTookEnvironmentalDamage; |
250 | 250 | bool bTeleported; |
251 | - bool bActivatedSpecial; | |
252 | 251 | |
253 | 252 | CLIENT_PLAYER_DATA_s ( player_t *player ); |
254 | 253 |