jak3: fix ragdolls settling too early (#3775)
Some checks failed
Build / 🖥️ Windows (push) Has been cancelled
Build / 🐧 Linux (push) Has been cancelled
Build / 🍎 MacOS (push) Has been cancelled
Inform Pages Repo / Generate Documentation (push) Has been cancelled
Lint / 📝 Formatting (push) Has been cancelled
Lint / 📝 Required Checks (push) Has been cancelled
Lint / 📝 Optional Checks (push) Has been cancelled

`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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 15 additions and 12 deletions

View File

@ -23125,7 +23125,7 @@
(disable-for-duration (_type_ time-frame) none) ;; 16 (disable-for-duration (_type_ time-frame) none) ;; 16
(ragdoll-proc-method-17 (_type_ ragdoll-edit-info) none) ;; 17 (ragdoll-proc-method-17 (_type_ ragdoll-edit-info) none) ;; 17
(ragdoll-proc-method-18 (_type_ ragdoll-edit-info) none) ;; 18 (ragdoll-proc-method-18 (_type_ ragdoll-edit-info) none) ;; 18
(ragdoll-proc-method-19 (_type_) none) ;; 19 (ragdoll-proc-method-19 (_type_) symbol) ;; 19
) )
) )

View File

@ -218,7 +218,7 @@
(disable-for-duration (_type_ time-frame) none) (disable-for-duration (_type_ time-frame) none)
(ragdoll-proc-method-17 (_type_ ragdoll-edit-info) none) (ragdoll-proc-method-17 (_type_ ragdoll-edit-info) none)
(ragdoll-proc-method-18 (_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)
) )
) )

View File

@ -1567,13 +1567,11 @@
(none) (none)
) )
;; WARN: Return type mismatch symbol vs none.
(defmethod ragdoll-proc-method-19 ((this ragdoll-proc)) (defmethod ragdoll-proc-method-19 ((this ragdoll-proc))
(if (nonzero? (-> this ragdoll)) (if (nonzero? (-> this ragdoll))
(logtest? (-> this ragdoll ragdoll-flags) (ragdoll-flag rf2)) (logtest? (-> this ragdoll ragdoll-flags) (ragdoll-flag rf2))
#t #t
) )
(none)
) )
(defstate idle (ragdoll-proc) (defstate idle (ragdoll-proc)

View File

@ -512,8 +512,7 @@
(set! (-> s5-0 danger-level) 0.5) (set! (-> s5-0 danger-level) 0.5)
(set! (-> s5-0 notify-radius) 491520.0) (set! (-> s5-0 notify-radius) 491520.0)
(set! (-> s5-0 decay-rate) 0.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))) (let ((s5-1 (new 'stack-no-clear 'vector)))
(vector-normalize! (vector-normalize!

View File

@ -105,10 +105,10 @@
(cgo-file "wasseem.gd" common-dep) (cgo-file "wasseem.gd" common-dep)
(cgo-file "wca.gd" common-dep) (cgo-file "wca.gd" common-dep)
(cgo-file "wcb.gd" common-dep) (cgo-file "wcb.gd" common-dep)
(cgo-file "wasleapr.gd" common-dep)
(cgo-file "wcaseem.gd" common-dep) (cgo-file "wcaseem.gd" common-dep)
(cgo-file "wascast.gd" common-dep) (cgo-file "wascast.gd" common-dep)
(cgo-file "cwi.gd" common-dep) ;; ctywide (cgo-file "cwi.gd" common-dep) ;; ctywide
(cgo-file "wasleapr.gd" common-dep)
(cgo-file "wasall.gd" common-dep) (cgo-file "wasall.gd" common-dep)
(cgo-file "desresc.gd" common-dep) (cgo-file "desresc.gd" common-dep)
(cgo-file "wsd.gd" common-dep) ;; wasdoors (garage) (cgo-file "wsd.gd" common-dep) ;; wasdoors (garage)

View File

@ -294,7 +294,7 @@
(disable-for-duration (_type_ time-frame) none) (disable-for-duration (_type_ time-frame) none)
(ragdoll-proc-method-17 (_type_ ragdoll-edit-info) none) (ragdoll-proc-method-17 (_type_ ragdoll-edit-info) none)
(ragdoll-proc-method-18 (_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)
) )
) )
@ -334,3 +334,7 @@
;; failed to figure out what this is: ;; failed to figure out what this is:
0 0

View File

@ -1616,13 +1616,11 @@
) )
;; definition for method 19 of type ragdoll-proc ;; definition for method 19 of type ragdoll-proc
;; WARN: Return type mismatch symbol vs none.
(defmethod ragdoll-proc-method-19 ((this ragdoll-proc)) (defmethod ragdoll-proc-method-19 ((this ragdoll-proc))
(if (nonzero? (-> this ragdoll)) (if (nonzero? (-> this ragdoll))
(logtest? (-> this ragdoll ragdoll-flags) (ragdoll-flag rf2)) (logtest? (-> this ragdoll ragdoll-flags) (ragdoll-flag rf2))
#t #t
) )
(none)
) )
;; failed to figure out what this is: ;; failed to figure out what this is:
@ -1748,3 +1746,7 @@
) )
(go-virtual idle) (go-virtual idle)
) )

View File

@ -2164,7 +2164,7 @@
) )
) )
:code (behavior () :code (behavior ()
(local-vars (v1-31 object) (v1-72 symbol)) (local-vars (v1-31 symbol) (v1-72 symbol))
(cond (cond
((handle->process (-> self ragdoll-proc)) ((handle->process (-> self ragdoll-proc))
(ja-channel-push! 1 0) (ja-channel-push! 1 0)

View File

@ -1790,7 +1790,7 @@
(defstate knocked-recover (grunt) (defstate knocked-recover (grunt)
:virtual #t :virtual #t
:code (behavior () :code (behavior ()
(local-vars (v1-49 object)) (local-vars (v1-49 symbol))
(ja-channel-push! 1 0) (ja-channel-push! 1 0)
(let ((gp-0 (-> (the-as ragdoll-proc (handle->process (-> self ragdoll-proc))) ragdoll))) (let ((gp-0 (-> (the-as ragdoll-proc (handle->process (-> self ragdoll-proc))) ragdoll)))
(when gp-0 (when gp-0