Skip to content

[jak2/3] Fix same-attack-invulnerable-timeout clock drift original game bug #3978

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[jak2/3] Fix same-attack-invulnerable-timeout clock drift original game bug #3978

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion goal_src/jak2/engine/target/target-util.gc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,8 @@
(logior! (-> this mask) (attack-mask attacker))
)
(when (not (logtest? (-> this mask) (attack-mask attack-time)))
(set! (-> this attack-time) (-> *display* base-clock frame-counter))
;; og:preserve-this fix clock drift bug which can lead to ridiculously long invuln timeouts
(set! (-> this attack-time) (current-time)) ;; (-> *display* base-clock frame-counter))
(logior! (-> this mask) (attack-mask attack-time))
)
(if (not (logtest? (attack-mask damage) (-> this mask)))
Expand Down
3 changes: 2 additions & 1 deletion goal_src/jak3/engine/target/target-util.gc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,7 +1763,8 @@
(logior! (-> this mask) (attack-mask attacker))
)
(when (not (logtest? (-> this mask) (attack-mask attack-time)))
(set! (-> this attack-time) (-> *display* base-clock frame-counter))
;; og:preserve-this fix clock drift bug which can lead to ridiculously long invuln timeouts
(set! (-> this attack-time) (current-time)) ;; (-> *display* base-clock frame-counter))
(logior! (-> this mask) (attack-mask attack-time))
)
(if (not (logtest? (attack-mask damage) (-> this mask)))
Expand Down
Loading