Skip to content

Commit

Permalink
fix jak 1
Browse files Browse the repository at this point in the history
  • Loading branch information
dallmeyer committed Jun 29, 2024
1 parent fac7f02 commit abc6a82
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 33 deletions.
2 changes: 1 addition & 1 deletion goal_src/jak1/pc/features/speedruns.gc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
(require "pc/features/autosplit-h.gc")


(define *speedrun-info* (new 'static 'speedrun-info-jak1 :should-display? #t :should-display-deload-info? #f :needs-post-blackout-setup? #f :show-input-display? #f))
(define *speedrun-info* (new 'static 'speedrun-info-jak1 :should-display? #t :needs-post-blackout-setup? #f :should-display-idle-deload-info? #f :should-display-plant-deload-info? #f :show-input-display? #f))

(define *last-speedrun-practice-option* (speedrun-practice-option none))
(define *practice-spawn-post-init* (the-as (function none) #f))
Expand Down
32 changes: 0 additions & 32 deletions goal_src/jak1/pc/progress-pc.gc
Original file line number Diff line number Diff line change
Expand Up @@ -764,38 +764,6 @@
(-> *pc-settings* speedrunner-mode?)))
(new 'static 'game-option :option-type (game-option-type button) :name (text-id back) :scale #t)))

(define *input-options* (new 'static 'boxed-array :type game-option
(new 'static 'game-option :option-type (game-option-type menu) :name (text-id camera-options) :scale #t :param3 (game-option-menu camera-options))
(new 'static 'game-option :option-type (game-option-type menu) :name (text-id input-opts-controller-opts) :scale #t :param3 (game-option-menu controller-options)
:option-disabled-func (lambda () (<= (pc-get-controller-count) 0)))
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id input-opts-enable-kb) :scale #t
:on-change (lambda ((val object))
(let ((val-sym (the-as symbol val)))
(set-enable-keyboard! *pc-settings* val-sym)
(none))))
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id input-opts-enable-mouse) :scale #t
:on-change (lambda ((val object))
(let ((val-sym (the-as symbol val)))
(set! (-> *pc-settings* mouse-enabled?) val-sym)
(update-mouse-controls! *pc-settings*)
(none))))
(new 'static 'game-option :option-type (game-option-type menu) :name (text-id input-opts-mouse-opts) :scale #t :param3 (game-option-menu mouse-options)
:option-disabled-func (lambda () (not (-> *pc-settings* mouse-enabled?))))
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id input-opts-auto-hide-cursor) :scale #t
:on-change (lambda ((val object))
(let ((val-sym (the-as symbol val)))
(set! (-> *pc-settings* auto-hide-cursor?) val-sym)
(update-mouse-controls! *pc-settings*)
(none))))
(new 'static 'game-option :option-type (game-option-type menu) :name (text-id input-opts-reassign-binds) :scale #t :param3 (game-option-menu reassign-binds-options))
(new 'static 'game-option :option-type (game-option-type confirmation) :name (text-id restore-defaults) :scale #t
:on-confirm (lambda ()
(reset-input *pc-settings* 'input #t)
(set-enable-keyboard! *pc-settings* (-> *pc-settings* keyboard-enabled?))
(update-mouse-controls! *pc-settings*)
(none)))
(new 'static 'game-option :option-type (game-option-type button) :name (text-id back) :scale #t)))

(define *misc-options* (new 'static 'boxed-array :type game-option
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id money-starburst) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id discord-rpc) :scale #t)
Expand Down

0 comments on commit abc6a82

Please sign in to comment.