diff --git a/goal_src/jak1/pc/debug/entity-debug.gc b/goal_src/jak1/pc/debug/entity-debug.gc index dc279170c8..b7103ed5dd 100644 --- a/goal_src/jak1/pc/debug/entity-debug.gc +++ b/goal_src/jak1/pc/debug/entity-debug.gc @@ -40,9 +40,9 @@ (bucket-id debug-no-zbuf)) ;; basic info, actor id, etc (draw-string-xy - (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x~%R1/L1 scroll L3 toggle display-actor-info~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid)) + (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x~%R1/L1 scroll L3 toggle display-actor-info~%UP toggle display-long-info~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid)) debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) - (+! cur-y (* 8 4)) + (+! cur-y (* 8 5)) (cond ((type-type? (-> e type) entity-actor) (let ((actor (the entity-actor e))) @@ -111,13 +111,13 @@ (format *debug-temp-string* ")") ) ;; these can be displayed visually with other tools. - ((and (= (-> e tag i name) 'visvol) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) vector)) + ((and (= (-> e tag i name) 'visvol) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) vector) (not (-> inspect-info show-long-info))) (format *debug-temp-string* " display actor-vis!") ) - ((and (= (-> e tag i name) 'path) (= (-> e tag i elt-type) vector)) + ((and (= (-> e tag i name) 'path) (= (-> e tag i elt-type) vector) (not (-> inspect-info show-long-info))) (format *debug-temp-string* " display path marks!") ) - ((and (= (-> e tag i name) 'vol) (= (-> e tag i elt-type) vector)) + ((and (= (-> e tag i name) 'vol) (= (-> e tag i elt-type) vector) (not (-> inspect-info show-long-info))) (format *debug-temp-string* " display vol marks!") ) (else diff --git a/goal_src/jak1/pc/pckernel-common.gc b/goal_src/jak1/pc/pckernel-common.gc index dd002f8215..68fc83e07b 100644 --- a/goal_src/jak1/pc/pckernel-common.gc +++ b/goal_src/jak1/pc/pckernel-common.gc @@ -856,6 +856,7 @@ (scroll-y-max int16) (entity entity) (show-actor-info symbol) + (show-long-info symbol) ) (:methods (new (symbol type) _type_) @@ -873,6 +874,7 @@ (set! (-> obj scroll-y-max) 0) (set! (-> obj entity) (the entity #f)) (set! (-> obj show-actor-info) #f) + (set! (-> obj show-long-info) #f) obj ) ) @@ -889,6 +891,9 @@ ;; toggle actor info (if (cpad-pressed? pad-idx l3) (not! (-> obj show-actor-info))) + ;; toggle long info + (if (cpad-pressed? pad-idx up) + (not! (-> obj show-long-info))) (minmax! (-> obj scroll-y) 0 (-> obj scroll-y-max)) diff --git a/goal_src/jak2/pc/debug/entity-debug.gc b/goal_src/jak2/pc/debug/entity-debug.gc index 40ac2d1980..ab5973df97 100644 --- a/goal_src/jak2/pc/debug/entity-debug.gc +++ b/goal_src/jak2/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~%--------------------" (-> 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) (aif (-> e extra) (-> it level name))) debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle)) (+! cur-y (* LINE_HEIGHT 4)) (cond @@ -134,13 +134,13 @@ ;; (format *debug-temp-string* ")") ;; ) ;; these can be displayed visually with other tools. - ((and (= (-> e tag i name) 'visvol) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) vector)) + ((and (= (-> e tag i name) 'visvol) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) vector) (not (-> inspect-info show-long-info))) (format *debug-temp-string* "display actor-vis!") ) - ((and (= (-> e tag i name) 'path) (= (-> e tag i elt-type) vector)) + ((and (= (-> e tag i name) 'path) (= (-> e tag i elt-type) vector) (not (-> inspect-info show-long-info))) (format *debug-temp-string* "display path marks!") ) - ((and (= (-> e tag i name) 'vol) (= (-> e tag i elt-type) vector)) + ((and (= (-> e tag i name) 'vol) (= (-> e tag i elt-type) vector) (not (-> inspect-info show-long-info))) (format *debug-temp-string* "display vol marks!") ) ((and (= (-> e tag i name) 'art-name) (= (-> e tag i elt-count) 1) (type-type? (-> e type) entity-actor) (type-type? (-> (the-as entity-actor e) etype) part-spawner))