From 27980218aa7b81e3845beca8f15647f2478a8685 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:39:35 +0100 Subject: [PATCH] [jak2] fix minor original game visual bugs (#3072) Fixes #2994 the underport and consite icons being green (same color as the goal, likely copy-pasta). Fixes the hundredths timer in the race timer actually being a 60ths timer. --- goal_src/jak2/engine/ui/minimap.gc | 6 ++++++ goal_src/jak2/levels/common/race/race-hud.gc | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/goal_src/jak2/engine/ui/minimap.gc b/goal_src/jak2/engine/ui/minimap.gc index 935cae41b..907a4b44f 100644 --- a/goal_src/jak2/engine/ui/minimap.gc +++ b/goal_src/jak2/engine/ui/minimap.gc @@ -833,6 +833,12 @@ ) ) +(#when PC_PORT +;; og:preserve-this fix icon colors +(set! (-> *minimap-class-list* (minimap-class consite) color) (static-rgba #xff #xff #xff #x80)) +(set! (-> *minimap-class-list* (minimap-class underport) color) (static-rgba #xff #xff #xff #x80)) +) + (let ((gp-0 *minimap*)) ;; og:preserve-this minimap engine connections raised for pc port (set! (-> gp-0 engine) (new 'global 'engine-minimap '*minimap* (#if PC_PORT 256 64) connection-minimap)) diff --git a/goal_src/jak2/levels/common/race/race-hud.gc b/goal_src/jak2/levels/common/race/race-hud.gc index 94d51649d..183053b8e 100644 --- a/goal_src/jak2/levels/common/race/race-hud.gc +++ b/goal_src/jak2/levels/common/race/race-hud.gc @@ -36,9 +36,11 @@ ) (defmethod update-values hud-race-timer ((this hud-race-timer)) - (set! (-> this values 0 target) (/ (the-as int (-> *game-info* race-timer)) #x4650)) - (set! (-> this values 1 target) (/ (mod (the-as int (-> *game-info* race-timer)) #x4650) 300)) - (set! (-> this values 2 target) (/ (mod (mod (the-as int (-> *game-info* race-timer)) #x4650) 300) 5)) + (set! (-> this values 0 target) (/ (the-as int (-> *game-info* race-timer)) (seconds 60))) + (set! (-> this values 1 target) (/ (mod (the-as int (-> *game-info* race-timer)) (seconds 60)) (seconds 1))) + ;(set! (-> this values 2 target) (/ (mod (mod (the-as int (-> *game-info* race-timer)) (seconds 60)) (seconds 1)) (/ (seconds 1) 60))) + ;; og:preserve-this fix wrong hundredths counter... + (set! (-> this values 2 target) (/ (mod (mod (the-as int (-> *game-info* race-timer)) (seconds 60)) (seconds 1)) (seconds 0.01))) (logclear! (-> this flags) (hud-flags disable)) ((method-of-type hud update-values) this) 0