mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 12:55:22 -04:00
[goos] fix pretty printer bugs, update ref after pretty printer changes (#1063)
* update ref after pretty printer changes * another try
This commit is contained in:
+19
-23
@@ -121,15 +121,14 @@
|
||||
;; Used lq/sq
|
||||
(defmethod lookup-tag-idx res-lump ((obj res-lump) (name-sym symbol) (mode symbol) (time float))
|
||||
(local-vars (tag-idx int))
|
||||
(when (or
|
||||
(= name-sym 'id)
|
||||
(= name-sym 'aid)
|
||||
(= name-sym 'trans)
|
||||
(= name-sym 'rot)
|
||||
(= name-sym 'nav-mesh)
|
||||
(= name-sym 'process-type)
|
||||
(= name-sym 'task)
|
||||
)
|
||||
(when (or (= name-sym 'id)
|
||||
(= name-sym 'aid)
|
||||
(= name-sym 'trans)
|
||||
(= name-sym 'rot)
|
||||
(= name-sym 'nav-mesh)
|
||||
(= name-sym 'process-type)
|
||||
(= name-sym 'task)
|
||||
)
|
||||
(crash!)
|
||||
0
|
||||
)
|
||||
@@ -169,10 +168,9 @@
|
||||
(if (< tag-idx 0)
|
||||
(return (the-as res-tag-pair tag-idx))
|
||||
)
|
||||
(while (and
|
||||
(> tag-idx 0)
|
||||
(= type-chars (-> (the-as (pointer uint64) (-> (symbol->string (-> obj tag (+ tag-idx -1) name)) data)) 0))
|
||||
)
|
||||
(while (and (> tag-idx 0)
|
||||
(= type-chars (-> (the-as (pointer uint64) (-> (symbol->string (-> obj tag (+ tag-idx -1) name)) data)) 0))
|
||||
)
|
||||
(+! tag-idx -1)
|
||||
)
|
||||
(when (= mode 'base)
|
||||
@@ -183,10 +181,9 @@
|
||||
(let ((interp-tag-idx tag-idx)
|
||||
(tag-ptr (&-> (-> obj tag) tag-idx))
|
||||
)
|
||||
(while (not (or
|
||||
(>= interp-tag-idx (-> obj length))
|
||||
(< type-chars (-> (the-as (pointer uint64) (-> (symbol->string (-> tag-ptr 0 name)) data)) 0))
|
||||
)
|
||||
(while (not (or (>= interp-tag-idx (-> obj length))
|
||||
(< type-chars (-> (the-as (pointer uint64) (-> (symbol->string (-> tag-ptr 0 name)) data)) 0))
|
||||
)
|
||||
)
|
||||
(cond
|
||||
((!= name-sym (-> tag-ptr 0 name))
|
||||
@@ -236,12 +233,11 @@
|
||||
((zero? (-> tag-lo inlined?))
|
||||
(&+ (-> obj data-base) (-> tag-lo data-offset))
|
||||
)
|
||||
((or
|
||||
(not buf)
|
||||
(= (-> result lo) (-> result hi))
|
||||
(!= elt-count (-> tag-hi elt-count))
|
||||
(!= (-> tag-lo elt-type) (-> tag-hi elt-type))
|
||||
)
|
||||
((or (not buf)
|
||||
(= (-> result lo) (-> result hi))
|
||||
(!= elt-count (-> tag-hi elt-count))
|
||||
(!= (-> tag-lo elt-type) (-> tag-hi elt-type))
|
||||
)
|
||||
(let ((a0-4 tag-lo))
|
||||
(&+ (-> obj data-base) (-> a0-4 data-offset))
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user