diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc index 3e7450af8e..744da9450d 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc @@ -820,7 +820,7 @@ ;; ) ;; (set-vector! (-> this root scale) f0-11 f30-0 f0-11 1.0) ;; ) - (let ((f0-13 (get-rand-float-range this 0.9 1.0))) + (let ((f0-13 (rnd-float-range this 0.9 1.0))) (set-vector! (-> this draw color-mult) f0-13 f0-13 f0-13 1.0) ) (set! (-> this water-anim) 29) diff --git a/goal_src/jak2/pc/features/speedruns.gc b/goal_src/jak2/pc/features/speedruns.gc index 1c9249bffc..68aaf801cd 100644 --- a/goal_src/jak2/pc/features/speedruns.gc +++ b/goal_src/jak2/pc/features/speedruns.gc @@ -3,6 +3,8 @@ ;; TODO later - customize menu open keybind +(define-extern *mod-version-text* string) + (define-extern task-close! (function string symbol)) (define *speedrun-info* (new 'static 'speedrun-info)) @@ -428,21 +430,21 @@ ((= (-> this category) (speedrun-category custom)) (pc-sr-mode-get-custom-category-name (-> this active-custom-category index) *pc-cpp-temp-string*) (format *temp-string* - "Category: ~S~%Secrets: ~D~%Features: ~D~%Forbidden Features: ~D~%Cheats: ~D~%Version: ~S~%" + "Category: ~S~%Secrets: ~D~%Features: ~D~%Forbidden Features: ~D~%Cheats: ~D~%Mod Version: ~S~%" *pc-cpp-temp-string* (-> this active-custom-category secrets) (-> this active-custom-category features) (-> this active-custom-category forbidden-features) (-> this active-custom-category pc-cheats) - *pc-settings-built-sha*)) + *mod-version-text*)) (else (format *temp-string* - "Category: ~S~%PC Cheats: ~D~%Frame Rate: ~D~%PS2 Actor Vis?: ~S~%Version: ~S~%" + "Category: ~S~%PC Cheats: ~D~%Frame Rate: ~D~%PS2 Actor Vis?: ~S~%Mod Version: ~S~%" (enum->string speedrun-category (-> this category)) (the-as int (-> *pc-settings* cheats)) (-> *pc-settings* target-fps) (if (-> *pc-settings* ps2-actor-vis?) "true" "false") - *pc-settings-built-sha*))) + *mod-version-text*))) (pc-encode-utf8-string *temp-string* *pc-encoded-temp-string*) (with-dma-buffer-add-bucket ((buf (-> (current-frame) global-buf)) (bucket-id debug-no-zbuf2)) ;; reset bucket settings prior to drawing - font won't do this for us, and @@ -470,11 +472,6 @@ (case (-> event param 0) (((speedrun-menu-command reset)) (start-run! *speedrun-info*)) - (((speedrun-menu-command die)) - - (send-event *target* 'attack-invinc #f (static-attack-info ((id (the-as uint 2)) (mode 'endlessfall)))) - (set! (-> self draw-menu?) #f) - ) (((speedrun-menu-command exit)) (set-master-mode 'game) (send-event (ppointer->process (-> self popup-menu)) 'close-menu))