diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc index 5799419850..37ada73bd0 100644 --- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc +++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc @@ -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) ) diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc index 3f936a2dc9..7193ae0a8a 100644 --- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc +++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle.gc @@ -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*)) diff --git a/goal_src/jak1/engine/ui/hud.gc b/goal_src/jak1/engine/ui/hud.gc index 5822000d4f..a7448092d5 100644 --- a/goal_src/jak1/engine/ui/hud.gc +++ b/goal_src/jak1/engine/ui/hud.gc @@ -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))