Skip to content

Commit 47f8484

Browse files
authored
fix collision retiming to never be in the future (#3599)
1 parent 2fe789f commit 47f8484

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

code/object/objcollide.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,10 @@ void obj_reset_colliders()
604604
Collision_cached_pairs.clear();
605605
}
606606

607-
void obj_collide_retime_cached_pairs(int checkdly)
607+
void obj_collide_retime_cached_pairs()
608608
{
609609
for ( auto& pair : Collision_cached_pairs ) {
610-
pair.second.next_check_time = timestamp(checkdly);
610+
pair.second.next_check_time = timestamp(0);
611611
}
612612
}
613613

code/object/objcollide.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ void obj_remove_collider(int obj_index);
7070
void obj_reset_colliders();
7171
void obj_sort_and_collide(SCP_vector<int>* Collision_list = nullptr);
7272

73-
// retimes all collision pairs to be checked (in 25ms by default)
74-
void obj_collide_retime_cached_pairs(int checkdly=25);
73+
// retimes all collision pairs to be checked immediately
74+
void obj_collide_retime_cached_pairs();
7575

7676
// Returns TRUE if the weapon will never hit the other object.
7777
// If it can it predicts how long until these two objects need

0 commit comments

Comments
 (0)