mirror of
https://github.com/open-goal/jak-project
synced 2026-05-28 08:25:56 -04:00
ManDude
46db6a36da
This is the more correct way of doing what that code is trying to do. Fixes #3296 Also fixed some type inconsistencies with related code, probably wasn't causing issues though. May also fix the "black screen on startup" issues people keep having, but that would simply be a nice bonus and isn't the aim of this PR.
62 lines
1.1 KiB
Common Lisp
62 lines
1.1 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
#|
|
|
|
|
Additional PC port specific file for overriding/expanding the progress menu
|
|
This gives us more freedom to write code how we want.
|
|
|
|
|#
|
|
|
|
|
|
(defmacro push-and-set-state (progress state)
|
|
`(begin
|
|
(push-state ,progress)
|
|
(set-next-state ,progress ,state 0)))
|
|
|
|
(deftype menu-aspect-ratio-custom-option (menu-option)
|
|
()
|
|
)
|
|
|
|
(deftype menu-frame-rate-disclaimer-option (menu-option)
|
|
()
|
|
)
|
|
|
|
(deftype menu-exit-game-option (menu-yes-no-option)
|
|
()
|
|
)
|
|
|
|
(deftype menu-resolution-option (menu-option)
|
|
((last-move time-frame)
|
|
(selected-index int16)
|
|
(scroll-index float)
|
|
(valid? symbol)
|
|
|
|
;; OS state kept for drawing later, avoids desync and duplicate fetching
|
|
(num-resolutions int)
|
|
(win-aspect float)
|
|
(win-w int64)
|
|
(win-h int64)
|
|
)
|
|
)
|
|
|
|
(deftype menu-music-player-option (menu-option)
|
|
((last-move time-frame)
|
|
|
|
;; player params
|
|
(music-index int16)
|
|
(flava-index int8)
|
|
(excitement int8)
|
|
|
|
;; scroll
|
|
(current-scroll float)
|
|
(max-scroll float)
|
|
|
|
;; sprites 0-3 used to show level icon
|
|
(sprites hud-sprite 4 :inline)
|
|
)
|
|
)
|
|
|
|
|
|
|