diff --git a/goal_src/jak1/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc index 822c438d89..29a8b3b2fc 100644 --- a/goal_src/jak1/engine/entity/entity.gc +++ b/goal_src/jak1/engine/entity/entity.gc @@ -1779,7 +1779,7 @@ (set! sv-32 (-> s3-5 data s1-2)) (cond ((and (#if PC_PORT - (or (with-pc (-> *pc-settings* force-actors?)) (is-object-visible? s4-2 (-> sv-32 vis-id))) + (or (with-pc (not (-> *pc-settings* ps2-actor-vis?))) (is-object-visible? s4-2 (-> sv-32 vis-id))) (is-object-visible? s4-2 (-> sv-32 vis-id)) ) (zero? (logand (-> sv-32 perm status) (entity-perm-status bit-9 bit-10))) diff --git a/goal_src/jak1/engine/level/level.gc b/goal_src/jak1/engine/level/level.gc index 867990d7fe..c3eb5583ca 100644 --- a/goal_src/jak1/engine/level/level.gc +++ b/goal_src/jak1/engine/level/level.gc @@ -1055,7 +1055,7 @@ "Is arg0 visible? Note that this will return #f if the visibility data is not loaded." ;; note : pc port added option to show every actor regardless - (with-pc (if (-> *pc-settings* force-actors?) (return #t))) + (with-pc (if (not (-> *pc-settings* ps2-actor-vis?)) (return #t))) ;; check the vis bits! (let* (;; lwu v1, 388(a0) diff --git a/goal_src/jak1/pc/debug/default-menu-pc.gc b/goal_src/jak1/pc/debug/default-menu-pc.gc index 3f1f994dca..a09bb75dcf 100644 --- a/goal_src/jak1/pc/debug/default-menu-pc.gc +++ b/goal_src/jak1/pc/debug/default-menu-pc.gc @@ -795,7 +795,7 @@ (flag "heat" #f ,(dm-lambda-boolean-flag (-> *pc-settings* controller-heat-led?))) ) (flag "V-sync" #f ,(dm-lambda-boolean-flag (-> *pc-settings* vsync?))) - (flag "All actors" #f ,(dm-lambda-boolean-flag (-> *pc-settings* force-actors?))) + (flag "PS2 Actor vis" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-actor-vis?))) (flag "Display actor counts" *display-actor-counts* dm-boolean-toggle-pick-func) (flag "Display git commit" *display-sha* dm-boolean-toggle-pick-func) (flag "Extra hud elements" #f ,(dm-lambda-boolean-flag (-> *pc-settings* extra-hud?))) diff --git a/goal_src/jak1/pc/features/speedruns.gc b/goal_src/jak1/pc/features/speedruns.gc index c8bd152b3e..f72f691d0f 100644 --- a/goal_src/jak1/pc/features/speedruns.gc +++ b/goal_src/jak1/pc/features/speedruns.gc @@ -232,8 +232,8 @@ (format 0 "start-speedrun: unrecognized category ~S~%" (enum->string speedrun-category (-> *speedrun-info* category))) ) ) - ;; ensure `force actors` is not enabled - (set! (-> *pc-settings* force-actors?) #f) + ;; ensure actor vis is enabled + (set! (-> *pc-settings* ps2-actor-vis?) #t) ;; force FPS to `60` (set-frame-rate! *pc-settings* 60 #t) ;; enable auto saving by default diff --git a/goal_src/jak1/pc/pckernel-common.gc b/goal_src/jak1/pc/pckernel-common.gc index 7f5ea5e3b2..20306f8dc7 100644 --- a/goal_src/jak1/pc/pckernel-common.gc +++ b/goal_src/jak1/pc/pckernel-common.gc @@ -302,7 +302,7 @@ (update-video-hacks obj) ) (cond - ((-> obj force-actors?) + ((not (-> *pc-settings* ps2-actor-vis?)) ;; kinda overkill. (set! (-> *ACTOR-bank* birth-dist) (meters 10000)) (set! (-> *ACTOR-bank* pause-dist) (meters 10000)) @@ -697,7 +697,7 @@ (("ps2-hints?") (set! (-> obj ps2-hints?) (file-stream-read-symbol file))) (("ps2-lod-dist?") (set! (-> obj ps2-lod-dist?) (file-stream-read-symbol file))) (("force-envmap?") (set! (-> obj force-envmap?) (file-stream-read-symbol file))) - (("force-actors?") (set! (-> obj force-actors?) (file-stream-read-symbol file))) + (("force-actors?") (set! (-> obj ps2-actor-vis?) (not (file-stream-read-symbol file)))) (("music-fade?") (file-stream-read-symbol file)) ;; TODO remove (("use-vis?") (set! (-> obj use-vis?) (file-stream-read-symbol file))) (("hinttitles?") (set! (-> obj hinttitles?) (file-stream-read-symbol file))) @@ -784,7 +784,7 @@ (format file " (first-camera-v-inverted? ~A)~%" (-> obj first-camera-v-inverted?)) (format file " (third-camera-h-inverted? ~A)~%" (-> obj third-camera-h-inverted?)) (format file " (third-camera-v-inverted? ~A)~%" (-> obj third-camera-v-inverted?)) - (format file " (force-actors? ~A)~%" (-> obj force-actors?)) + (format file " (force-actors? ~A)~%" (not (-> obj ps2-actor-vis?))) (format file " (music-fadein? ~A)~%" (-> obj music-fadein?)) (format file " (music-fadeout? ~A)~%" (-> obj music-fadeout?)) (format file " (hinttitles? ~A)~%" (-> obj hinttitles?)) diff --git a/goal_src/jak1/pc/pckernel-h.gc b/goal_src/jak1/pc/pckernel-h.gc index 147659796d..29afa78c7d 100644 --- a/goal_src/jak1/pc/pckernel-h.gc +++ b/goal_src/jak1/pc/pckernel-h.gc @@ -214,7 +214,7 @@ (lod-force-actor int8) ;; merc lod tier override ;; misc settings - (force-actors? symbol) ;; skips vis check for actor entity + (ps2-actor-vis? symbol) ;; skips vis check for actor entity if disabled (use-vis? symbol) ;; if off, don't use vis trees. this MUST be off for custom (non-cropping) aspect ratios. (hinttitles? symbol) ;; if on, non-cutscene subtitles will show up (subtitle-speaker? symbol) ;; #f (force off), #t (force on), auto (on for offscreen) @@ -424,7 +424,7 @@ (defmethod reset-misc pc-settings ((obj pc-settings) (call-handlers symbol)) "Set the default misc settings" - (set! (-> obj force-actors?) #f) + (set! (-> obj ps2-actor-vis?) #t) (set! (-> obj hinttitles?) #t) (set! (-> obj subtitle-speaker?) 'auto) (reset-camera obj call-handlers) diff --git a/goal_src/jak1/pc/progress-pc.gc b/goal_src/jak1/pc/progress-pc.gc index df8618b078..72aeccb489 100644 --- a/goal_src/jak1/pc/progress-pc.gc +++ b/goal_src/jak1/pc/progress-pc.gc @@ -1012,7 +1012,7 @@ (set! (-> *gfx-ps2-options* 1 value-to-modify) (&-> *progress-carousell* int-backup)) (set! (-> *gfx-ps2-options* 2 value-to-modify) (&-> *pc-settings* ps2-parts?)) (set! (-> *gfx-ps2-options* 3 value-to-modify) (&-> *pc-settings* force-envmap?)) - (set! (-> *gfx-ps2-options* 4 value-to-modify) (&-> *pc-settings* force-actors?)) + (set! (-> *gfx-ps2-options* 4 value-to-modify) (&-> *pc-settings* ps2-actor-vis?)) (set! (-> *sound-options-pc* 0 value-to-modify) (&-> *setting-control* default sfx-volume)) (set! (-> *sound-options-pc* 1 value-to-modify) (&-> *setting-control* default music-volume)) diff --git a/goal_src/jak2/engine/entity/entity.gc b/goal_src/jak2/engine/entity/entity.gc index c4f4d815a8..581df87aa6 100644 --- a/goal_src/jak2/engine/entity/entity.gc +++ b/goal_src/jak2/engine/entity/entity.gc @@ -2229,7 +2229,7 @@ (dotimes (s1-1 s2-3) (set! sv-48 (-> s3-4 data s1-1)) (cond - ((and (#if PC_PORT (or (with-pc (and (-> *pc-settings* force-actors?) + ((and (#if PC_PORT (or (with-pc (and (not (-> *pc-settings* ps2-actor-vis?)) ;; ban specific entities (not (let ((name (res-lump-struct (-> sv-48 entity) 'name string))) (or (string= name "fort-entry-gate-11") diff --git a/goal_src/jak2/pc/debug/default-menu-pc.gc b/goal_src/jak2/pc/debug/default-menu-pc.gc index 219089694e..6cd5134211 100644 --- a/goal_src/jak2/pc/debug/default-menu-pc.gc +++ b/goal_src/jak2/pc/debug/default-menu-pc.gc @@ -883,7 +883,7 @@ (flag "heat" #f ,(dm-lambda-boolean-flag (-> *pc-settings* controller-heat-led?))) ) (flag "V-sync" #f ,(dm-lambda-boolean-flag (-> *pc-settings* vsync?))) - (flag "All actors" #f ,(dm-lambda-boolean-flag (-> *pc-settings* force-actors?))) + (flag "PS2 actor vis" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-actor-vis?))) (flag "Display actor counts" *display-actor-counts* dm-boolean-toggle-pick-func) (flag "Display git commit" *display-sha* dm-boolean-toggle-pick-func) (flag "Music fadein" #f ,(dm-lambda-boolean-flag (-> *pc-settings* music-fadein?)))