From f586cb9af2ef5e5b9c29a38bc855d9c72b4a395e Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sat, 1 Jun 2024 01:50:14 +0200 Subject: [PATCH] fix nav mesh debugging crash (#3542) --- goal_src/jak2/engine/debug/default-menu.gc | 5 +---- goal_src/jak3/pc/debug/entity-debug.gc | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/goal_src/jak2/engine/debug/default-menu.gc b/goal_src/jak2/engine/debug/default-menu.gc index 64c2836d7..b130ecfd9 100644 --- a/goal_src/jak2/engine/debug/default-menu.gc +++ b/goal_src/jak2/engine/debug/default-menu.gc @@ -3214,11 +3214,8 @@ (function "Kiosk Reset" #f ,(lambda () (auto-save-command 'restore 0 0 *default-pool* #f) (none))) ;; og:preserve-this new menu option (function "Give Ammo and Collectables" #f ,(lambda () (send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0) (send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0) (send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0) (send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0) (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 1000.0) (send-event *target* 'get-pickup (pickup-type skill) 1000.0) (send-event *target* 'get-pickup (pickup-type gem) 5000.0))) - ;; og:preserve-this new menu option (function "Unlock Everything" #f ,(lambda () (logior! (-> *game-info* features) (game-feature gun gun-yellow gun-red gun-blue gun-dark gun-upgrade-speed gun-upgrade-ammo gun-upgrade-damage pass-red pass-green pass-yellow pass-blue board darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant)))) - ;; og:preserve-this new menu option - (function "Finish Story" #f ,(lambda () (task-node-close! (game-task-node city-win-resolution)))) - ;; og:preserve-this new menu option + (function "Finish Story" #f ,(lambda () (task-node-close! (game-task-node city-win-introduction)))) (function "Finish Optional Missions" #f ,(lambda () diff --git a/goal_src/jak3/pc/debug/entity-debug.gc b/goal_src/jak3/pc/debug/entity-debug.gc index 0e4c87379..c9de95702 100644 --- a/goal_src/jak3/pc/debug/entity-debug.gc +++ b/goal_src/jak3/pc/debug/entity-debug.gc @@ -48,7 +48,7 @@ (bucket-id debug-no-zbuf1)) ;; basic info, actor id, etc (draw-string-xy - (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x level: ~S~%R1/L1 to scroll UP toggle display-long-info~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid) (aif (-> e extra) (-> it level name))) + (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x level: ~S~%R1/L1 to scroll UP toggle display-long-info~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid) (if (and (nonzero? (-> e extra)) (-> e extra)) (-> e extra level name))) debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) (+! cur-y (* LINE_HEIGHT 4)) (cond