mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-10 04:22:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

jak3: fix ragdolls settling too early (#3775)

Browse Source 
`none` methods strike again

Fixes #3774
This commit is contained in:
Hat Kid
2024-11-22 02:36:50 +01:00
committed by GitHub
parent 8f445bda3e
commit 2ff49b9905
9 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak3/engine/physics/ragdoll-h.gc
+1 -1
View File
@@ -218,7 +218,7 @@
(disable-for-duration (_type_ time-frame) none)
(ragdoll-proc-method-17 (_type_ ragdoll-edit-info) none)
(ragdoll-proc-method-18 (_type_ ragdoll-edit-info) none)
(ragdoll-proc-method-19 (_type_) none)
(ragdoll-proc-method-19 (_type_) symbol)
)
)
goal_src/jak3/engine/physics/ragdoll.gc
-2
View File
@@ -1567,13 +1567,11 @@
(none)
)
;; WARN: Return type mismatch symbol vs none.
(defmethod ragdoll-proc-method-19 ((this ragdoll-proc))
(if (nonzero? (-> this ragdoll))
(logtest? (-> this ragdoll ragdoll-flags) (ragdoll-flag rf2))
#t
)
(none)
)
(defstate idle (ragdoll-proc)
goal_src/jak3/engine/target/flut/flut-racer.gc
+1 -2
View File
@@ -512,8 +512,7 @@
(set! (-> s5-0 danger-level) 0.5)
(set! (-> s5-0 notify-radius) 491520.0)
(set! (-> s5-0 decay-rate) 0.0)
;; og:preserve-this not-yet-implemented
; (add-danger *traffic-engine* s5-0)
(add-danger *traffic-engine* s5-0)
)
(let ((s5-1 (new 'stack-no-clear 'vector)))
(vector-normalize!
goal_src/jak3/game.gp
+1 -1
View File
@@ -105,10 +105,10 @@
(cgo-file "wasseem.gd" common-dep)
(cgo-file "wca.gd" common-dep)
(cgo-file "wcb.gd" common-dep)
(cgo-file "wasleapr.gd" common-dep)
(cgo-file "wcaseem.gd" common-dep)
(cgo-file "wascast.gd" common-dep)
(cgo-file "cwi.gd" common-dep) ;; ctywide
(cgo-file "wasleapr.gd" common-dep)
(cgo-file "wasall.gd" common-dep)
(cgo-file "desresc.gd" common-dep)
(cgo-file "wsd.gd" common-dep) ;; wasdoors (garage)