Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-23 06:09:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

g/j1: some minor cleanup

Browse Source
This commit is contained in:
Tyler Wilding 2024-07-20 15:19:58 -04:00
parent 8ccb709281
commit 65d58c428c
No known key found for this signature in database
GPG Key ID: BF7B068C2FEFD7EF
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decompiler/config/jak1/all-types.gc
View File

@ -21102,7 +21102,7 @@
:size-assert #x94
:flag-assert #xf00300094
(:methods
(dumb-15 (_type_) none))
(spawn-particles! (_type_) none))
(:states
hud-normal
hud-coming-in

8
goal_src/jak1/engine/target/target2.gc
View File

@ -109,7 +109,7 @@
(sides-y-scale float)
(x-offset int32))
(:methods
(dumb-15 (_type_) none))
(spawn-particles! (_type_) none))
(:states
hud-coming-in
hud-going-out
@ -172,7 +172,7 @@
(if (nonzero? (-> this particles v1-0 part)) (&+! (-> this particles v1-0 part) arg0))))
(the-as first-person-hud ((method-of-type process relocate) this arg0)))
(defmethod dumb-15 ((this first-person-hud))
(defmethod spawn-particles! ((this first-person-hud))
(dotimes (s5-0 (-> this nb-of-particles))
(set! (-> this particles s5-0 pos x) (+ -256.0 (-> this particles s5-0 init-pos x)))
(set! (-> this particles s5-0 pos y)
@ -219,7 +219,7 @@
(suspend)))
:post
(behavior ()
(dumb-15 self)))
(spawn-particles! self)))
(defstate hud-normal (first-person-hud)
:event
@ -244,7 +244,7 @@
(suspend)))
:post
(behavior ()
(dumb-15 self)))
(spawn-particles! self)))
(defun part-first-person-hud-left-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((s5-0 (handle->process (-> *target* fp-hud))))

6
goal_src/jak1/engine/ui/progress/progress-part.gc
View File

@ -824,9 +824,9 @@
(progress-new-particle :part 97 :x -320.0 :y 194.0 :z 14.0)
(progress-new-particle :part 98 :x -320.0 :y 224.0 :z 14.0)
(progress-new-particle :part 99 :x -320.0 :y 224.0 :z 14.0)
(progress-new-particle :part 97 :x -320.0 :y 112.0 :z 4.0)
(progress-new-particle :part 100 :x -320.0 :y 193.0 :z 4.0)
(progress-new-particle :part 101 :x -320.0 :y 40.0 :z 4.0)
(progress-new-particle :part 97 :x -320.0 :y 112.0 :z 4.0) ;; powercell
(progress-new-particle :part 100 :x -320.0 :y 193.0 :z 4.0) ;; scout fly
(progress-new-particle :part 101 :x -320.0 :y 40.0 :z 4.0) ;; orb glow
(progress-new-particle :part 92 :x -320.0 :y 90.0 :z 16.0)
(progress-new-particle :part 93 :x -320.0 :y 172.0 :z 16.0)
(progress-new-particle :part 94 :x -320.0 :y 254.0 :z 16.0)

2
goal_src/jak1/engine/ui/progress/progress.gc
View File

@ -500,7 +500,9 @@
(defmethod adjust-sprites ((this progress))
(let ((f0-1 (* (1/ METER_LENGTH) (the float (-> this in-out-position)))))
;; right position
(set! (-> this particles 2 init-pos x) (the float (+ (-> this right-x-offset) 409 (the int (* 301.5 f0-1)))))
;; left position
(set! (-> this particles 1 init-pos x) (the float (+ (-> this left-x-offset) 59)))
(set! (-> this left-side-x-scale)
(meters (+ (/ (if (= (-> *pc-settings* aspect-custom-x) 16) 5.0 3.5) (-> this sides-x-scale)) (* 10.0 f0-1))))