@@ -1513,8 +1513,6 @@ void DollController::process(double p_delta) {
15131513
15141514void DollController::on_state_validated (FrameIndex p_frame_index, bool p_detected_desync) {
15151515 notify_frame_checked (last_doll_compared_input);
1516- is_last_doll_compared_input_valid = false ;
1517- last_doll_compared_input = FrameIndex::NONE;
15181516}
15191517
15201518void DollController::notify_frame_checked (FrameIndex p_doll_frame_index) {
@@ -1650,7 +1648,7 @@ void DollController::copy_controlled_objects_snapshot(
16501648 is_doll_snap_A_older);
16511649}
16521650
1653- FrameIndex DollController::fetch_last_processed_recoverable_snapshot (DollSnapshot *&r_client_snapshot, DollSnapshot *&r_server_snapshot) {
1651+ FrameIndex DollController::fetch_checkable_snapshot (DollSnapshot *&r_client_snapshot, DollSnapshot *&r_server_snapshot) {
16541652 for (auto client_snap_it = client_snapshots.rbegin (); client_snap_it != client_snapshots.rend (); client_snap_it++) {
16551653 if (client_snap_it->doll_executed_input != FrameIndex::NONE) {
16561654 auto server_snap_it = VecFunc::find (server_snapshots, client_snap_it->doll_executed_input );
@@ -1695,15 +1693,13 @@ bool DollController::__pcr__fetch_recovery_info(
16951693 DollSnapshot *server_snapshot;
16961694
16971695 // This is valid until we reset it again.
1698- is_last_doll_compared_input_valid = true ;
1699- last_doll_compared_input = fetch_last_processed_recoverable_snapshot (client_snapshot, server_snapshot);
1700-
1701- if (last_doll_compared_input == FrameIndex::NONE) {
1696+ const FrameIndex checkable_input = fetch_checkable_snapshot (client_snapshot, server_snapshot);
1697+ if (checkable_input == FrameIndex::NONE) {
17021698 // Nothing to check.
17031699 return true ;
17041700 }
17051701
1706- last_doll_compared_input = client_snapshot-> doll_executed_input ;
1702+ last_doll_compared_input = checkable_input ;
17071703
17081704 // Now just compare the two snapshots.
17091705 return Snapshot::compare (
0 commit comments