Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

jak3: fix bbush rings (#3593)
Some checks failed
Build / 🖥️ Windows (push) Has been cancelled
Details
Build / 🐧 Linux (push) Has been cancelled
Details
Build / 🍎 MacOS (push) Has been cancelled
Details
Inform Pages Repo / Generate Documentation (push) Has been cancelled
Details
Lint / 📝 Formatting (push) Has been cancelled
Details
Lint / 📝 Required Checks (push) Has been cancelled
Details
Lint / 📝 Optional Checks (push) Has been cancelled
Details

Browse source 
Fixes #3592
This commit is contained in:
Hat Kid 2024-07-17 21:49:07 +02:00 committed by GitHub
parent 3d04ac958c
commit 365fae4913
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
decompiler/config/jak3/all-types.gc
View file

@ -42779,7 +42779,7 @@
:size-assert #xfc :size-assert #xfc
:flag-assert #x22008000fc :flag-assert #x22008000fc
(:methods (:methods
(task-manager-desert-bbush-ring-method-32 (_type_) none) ;; 32 (get-mgr-name (_type_) string) ;; 32
(task-manager-desert-bbush-ring-method-33 (_type_) none) ;; 33 (task-manager-desert-bbush-ring-method-33 (_type_) none) ;; 33
) )
) )

28
goal_src/jak3/levels/desert/des-bush.gc
View file

@ -503,7 +503,7 @@
(current-ring int32) (current-ring int32)
) )
(:methods (:methods
(task-manager-desert-bbush-ring-method-32 (_type_) none) (get-mgr-name (_type_) string)
(task-manager-desert-bbush-ring-method-33 (_type_) none) (task-manager-desert-bbush-ring-method-33 (_type_) none)
) )
) )
@ -566,10 +566,8 @@
) )
) )
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring))
"t-manager-1" "t-manager-1"
(none)
) )
(defmethod task-manager-desert-bbush-ring-method-33 ((this task-manager-desert-bbush-ring)) (defmethod task-manager-desert-bbush-ring-method-33 ((this task-manager-desert-bbush-ring))
@ -606,7 +604,7 @@
(set! (-> this current-ring) 0) (set! (-> this current-ring) 0)
(task-manager-desert-bbush-ring-method-33 this) (task-manager-desert-bbush-ring-method-33 this)
(logclear! (-> this mask) (process-mask actor-pause)) (logclear! (-> this mask) (process-mask actor-pause))
(let ((a0-8 (entity-by-name (the-as string (task-manager-desert-bbush-ring-method-32 this))))) (let ((a0-8 (entity-by-name (get-mgr-name this))))
(when a0-8 (when a0-8
(set! (-> this entity) (the-as entity-actor a0-8)) (set! (-> this entity) (the-as entity-actor a0-8))
(set! sv-16 (new 'static 'res-tag)) (set! sv-16 (new 'static 'res-tag))
@ -834,10 +832,8 @@
) )
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-2))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-2))
"t-manager-10" "t-manager-10"
(none)
) )
(defmethod task-manager-desert-bbush-ring-method-33 ((this task-manager-desert-bbush-ring-2)) (defmethod task-manager-desert-bbush-ring-method-33 ((this task-manager-desert-bbush-ring-2))
@ -852,11 +848,9 @@
) )
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-3))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-3))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-2" "t-manager-2"
(none)
) )
(deftype task-manager-desert-bbush-ring-4 (task-manager-desert-bbush-ring) (deftype task-manager-desert-bbush-ring-4 (task-manager-desert-bbush-ring)
@ -864,11 +858,9 @@
) )
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-4))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-4))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-6" "t-manager-6"
(none)
) )
(deftype task-manager-desert-bbush-ring-5 (task-manager-desert-bbush-ring) (deftype task-manager-desert-bbush-ring-5 (task-manager-desert-bbush-ring)
@ -882,11 +874,9 @@
(none) (none)
) )
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-5))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-5))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-7" "t-manager-7"
(none)
) )
(defmethod task-manager-desert-bbush-ring-method-33 ((this task-manager-desert-bbush-ring-5)) (defmethod task-manager-desert-bbush-ring-method-33 ((this task-manager-desert-bbush-ring-5))
@ -928,11 +918,9 @@
(none) (none)
) )
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-6))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-6))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-8" "t-manager-8"
(none)
) )
(deftype desert-chase-ring (process-drawable) (deftype desert-chase-ring (process-drawable)

32
test/decompiler/reference/jak3/levels/desert/des-bush_REF.gc generated vendored
View file

@ -508,7 +508,7 @@
(current-ring int32) (current-ring int32)
) )
(:methods (:methods
(task-manager-desert-bbush-ring-method-32 (_type_) none) (get-mgr-name (_type_) string)
(task-manager-desert-bbush-ring-method-33 (_type_) none) (task-manager-desert-bbush-ring-method-33 (_type_) none)
) )
) )
@ -591,10 +591,8 @@
) )
;; definition for method 32 of type task-manager-desert-bbush-ring ;; definition for method 32 of type task-manager-desert-bbush-ring
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring))
"t-manager-1" "t-manager-1"
(none)
) )
;; definition for method 33 of type task-manager-desert-bbush-ring ;; definition for method 33 of type task-manager-desert-bbush-ring
@ -637,7 +635,7 @@
(set! (-> this current-ring) 0) (set! (-> this current-ring) 0)
(task-manager-desert-bbush-ring-method-33 this) (task-manager-desert-bbush-ring-method-33 this)
(logclear! (-> this mask) (process-mask actor-pause)) (logclear! (-> this mask) (process-mask actor-pause))
(let ((a0-8 (entity-by-name (the-as string (task-manager-desert-bbush-ring-method-32 this))))) (let ((a0-8 (entity-by-name (get-mgr-name this))))
(when a0-8 (when a0-8
(set! (-> this entity) (the-as entity-actor a0-8)) (set! (-> this entity) (the-as entity-actor a0-8))
(set! sv-16 (new 'static 'res-tag)) (set! sv-16 (new 'static 'res-tag))
@ -883,10 +881,8 @@
) )
;; definition for method 32 of type task-manager-desert-bbush-ring-2 ;; definition for method 32 of type task-manager-desert-bbush-ring-2
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-2))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-2))
"t-manager-10" "t-manager-10"
(none)
) )
;; definition for method 33 of type task-manager-desert-bbush-ring-2 ;; definition for method 33 of type task-manager-desert-bbush-ring-2
@ -917,11 +913,9 @@
) )
;; definition for method 32 of type task-manager-desert-bbush-ring-3 ;; definition for method 32 of type task-manager-desert-bbush-ring-3
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-3))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-3))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-2" "t-manager-2"
(none)
) )
;; definition of type task-manager-desert-bbush-ring-4 ;; definition of type task-manager-desert-bbush-ring-4
@ -943,11 +937,9 @@
) )
;; definition for method 32 of type task-manager-desert-bbush-ring-4 ;; definition for method 32 of type task-manager-desert-bbush-ring-4
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-4))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-4))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-6" "t-manager-6"
(none)
) )
;; definition of type task-manager-desert-bbush-ring-5 ;; definition of type task-manager-desert-bbush-ring-5
@ -976,11 +968,9 @@
) )
;; definition for method 32 of type task-manager-desert-bbush-ring-5 ;; definition for method 32 of type task-manager-desert-bbush-ring-5
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-5))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-5))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-7" "t-manager-7"
(none)
) )
;; definition for method 33 of type task-manager-desert-bbush-ring-5 ;; definition for method 33 of type task-manager-desert-bbush-ring-5
@ -1043,11 +1033,9 @@
) )
;; definition for method 32 of type task-manager-desert-bbush-ring-6 ;; definition for method 32 of type task-manager-desert-bbush-ring-6
;; WARN: Return type mismatch string vs none. (defmethod get-mgr-name ((this task-manager-desert-bbush-ring-6))
(defmethod task-manager-desert-bbush-ring-method-32 ((this task-manager-desert-bbush-ring-6))
(format 0 "tag1~%") (format 0 "tag1~%")
"t-manager-8" "t-manager-8"
(none)
) )
;; definition of type desert-chase-ring ;; definition of type desert-chase-ring
@ -3225,3 +3213,7 @@
#f #f
) )
) )