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

fix the slide (#1188)

Browse Source
This commit is contained in:
water111
2022-02-20 13:30:08 -05:00
committed by GitHub
parent ff6362d181
commit a1480b5b6e
22 changed files with 63 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/ui/text-h_REF.gc
Generated Vendored
+2 -2
View File
@@ -3,8 +3,8 @@
;; definition of type game-text
(deftype game-text (structure)
((id uint32 :offset-assert 0)
(text string :offset-assert 4)
((id game-text-id :offset-assert 0)
(text string :offset-assert 4)
)
:pack-me
:method-count-assert 9
test/decompiler/reference/engine/ui/text_REF.gc
Generated Vendored
+5 -5
View File
@@ -72,7 +72,7 @@
)
(let ((t0-0 -1))
(while (and (!= (-> obj data v1-2 id) arg0) (!= v1-2 t0-0))
(if (< (the-as uint arg0) (-> obj data v1-2 id))
(if (< (the-as uint arg0) (the-as uint (-> obj data v1-2 id)))
(set! a3-0 v1-2)
(set! a1-1 v1-2)
)
@@ -353,7 +353,7 @@
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 132 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
(defun print-game-text ((str string) (font-ctxt font-context) (alpha symbol) (offset-thing int) (arg4 int))
(defun print-game-text ((str string) (font-ctxt font-context) (opaque symbol) (alpha int) (line-height int))
(local-vars
(sv-112 float)
(sv-116 float)
@@ -428,7 +428,7 @@
(set! sv-156 (+ (-> gp-0 origin y) (-> font-ctxt height)))
(set! sv-160 (* (get-string-length " " gp-0) (-> *video-parms* relative-x-scale)))
(set! sv-164 (* (if (logtest? (-> gp-0 flags) (font-flags large))
(the float arg4)
(the float line-height)
14.0
)
sv-136
@@ -505,11 +505,11 @@
(if (nonzero? (-> *game-text-line* data 0))
(set! sv-168 (+ sv-168 1))
)
(when (not alpha)
(when (not opaque)
(let* ((s1-1 (-> *display* frames (-> *display* on-screen) frame global-buf))
(s2-1 (-> s1-1 base))
)
(set-font-color-alpha (-> font-ctxt color) offset-thing)
(set-font-color-alpha (-> font-ctxt color) alpha)
(draw-string *game-text-line* s1-1 gp-0)
(set-font-color-alpha (-> font-ctxt color) 128)
(set! (-> gp-0 color) (-> *font-work* last-color))