mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-05-30 08:56:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

make aux list not get cleared when game is paused (#1673)

Browse Source 
* make aux list not get cleared when game is paused

* remove unnecessary hud hack
This commit is contained in:
ManDude
2022-07-18 01:16:41 +01:00
committed by GitHub
parent b88175aa56
commit edbc7af256
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc
+5 -5
View File
@@ -692,11 +692,11 @@
"relaunch a 2d particle"
(sp-relaunch-setup-fields arg0 arg1 arg2 arg3)
(when (logtest? (-> arg2 flags) (sp-cpuinfo-flag aux-list))
(set! (-> arg2 func) add-to-sprite-aux-list)
(set! (-> arg3 r-g-b-a w) 0.0)
(set! (-> arg2 fade w) 0.0)
(logclear! (-> arg2 flags) (sp-cpuinfo-flag bit2))
)
(set! (-> arg2 func) add-to-sprite-aux-list)
(set! (-> arg3 r-g-b-a w) 0.0)
(set! (-> arg2 fade w) 0.0)
(logclear! (-> arg2 flags) (sp-cpuinfo-flag bit2))
)
0
(none)
)
goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc
+4 -4
View File
@@ -128,9 +128,7 @@
)
(defmacro launch-particles (&key (system *sp-particle-system-2d*) particle origin &key (launch-state (the-as sparticle-launch-state #f)) &key (launch-control (the-as sparticle-launch-control #f))
&key (rate (if (= (-> *setting-control* current video-mode) '150fps)
(if (= (-> *setting-control* current video-mode) '100fps) 0.6 0.4)
1.0)))
&key (rate DISPLAY_FPS_RATIO))
`(sp-launch-particles-var ,system ,particle ,origin ,launch-state ,launch-control ,rate)
)
@@ -727,7 +725,9 @@
)
;; process the particles
(clear-sprite-aux-list)
;; pc port note : made this not run when paused, since aux sprites wont get added.
(unless (paused?)
(clear-sprite-aux-list))
(sp-process-particle-system *sp-particle-system-2d* 0 *sprite-array-2d*)
(sp-process-particle-system *sp-particle-system-2d* 1 *sprite-array-2d*)
(sp-process-particle-system *sp-particle-system-3d* 0 (the-as sprite-array-2d *sprite-array-3d*))
goal_src/jak1/engine/ui/hud.gc
-2
View File
@@ -158,8 +158,6 @@
)
(set! (-> obj particles s5-0 pos z) (-> obj particles s5-0 init-pos z))
)
(#when PC_PORT
(if (= *cheat-mode* 'camera) (set! (-> obj particles s5-0 pos x) 1024.0)))
(if (> (-> obj particles s5-0 part matrix) 0)
(set-vector!
(sprite-get-user-hvdf (-> obj particles s5-0 part matrix))