From 65f47f2bfc9dcd1105d1775ff9a036b80c619174 Mon Sep 17 00:00:00 2001 From: Brent Hickey Date: Tue, 21 Jun 2022 15:21:57 -0700 Subject: [PATCH] [game] Scale first-person and progress HUD for pc 16:9 (#1504) * [game] Scale first-person and progress HUD for pc 16:9 * oops --- goal_src/engine/target/target2.gc | 2 +- goal_src/engine/ui/progress/progress.gc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/goal_src/engine/target/target2.gc b/goal_src/engine/target/target2.gc index 56c5efc115..4cf2be00f4 100644 --- a/goal_src/engine/target/target2.gc +++ b/goal_src/engine/target/target2.gc @@ -224,7 +224,7 @@ ) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> self sides-x-scale) 3.5) + (set! (-> self sides-x-scale) (if (= (-> *pc-settings* aspect-custom-x) 16) 5.0 3.5)) (set! (-> self sides-y-scale) 13.0) (set! (-> self x-offset) 0) 0 diff --git a/goal_src/engine/ui/progress/progress.gc b/goal_src/engine/ui/progress/progress.gc index 68a50db5c8..787da31d20 100644 --- a/goal_src/engine/ui/progress/progress.gc +++ b/goal_src/engine/ui/progress/progress.gc @@ -700,9 +700,9 @@ (let ((f0-1 (* (1/ METER_LENGTH) (the float (-> obj in-out-position))))) (set! (-> obj particles 2 init-pos x) (the float (+ (-> obj right-x-offset) 409 (the int (* 301.5 f0-1))))) (set! (-> obj particles 1 init-pos x) (the float (+ (-> obj left-x-offset) 59))) - (set! (-> obj left-side-x-scale) (meters (+ (/ 3.5 (-> obj sides-x-scale)) (* 10.0 f0-1)))) + (set! (-> obj left-side-x-scale) (meters (+ (/ (if (= (-> *pc-settings* aspect-custom-x) 16) 5.0 3.5) (-> obj sides-x-scale)) (* 10.0 f0-1)))) (set! (-> obj left-side-y-scale) (meters (+ (-> obj sides-y-scale) (* 10.0 f0-1)))) - (set! (-> obj right-side-x-scale) (meters (+ (/ 6.0 (-> obj sides-x-scale)) (* 4.0 f0-1)))) + (set! (-> obj right-side-x-scale) (meters (+ (/ (if (= (-> *pc-settings* aspect-custom-x) 16) 8.5 6.0) (-> obj sides-x-scale)) (* 4.0 f0-1)))) (set! (-> obj right-side-y-scale) (meters (+ (-> obj sides-y-scale) (* 4.0 f0-1)))) ) (dotimes (s5-0 (-> obj nb-of-particles))