Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion decompiler/config/jak1/all-types.gc
Original file line number Diff line number Diff line change
Expand Up @@ -20928,7 +20928,7 @@
(define-extern target-start-attack (function none :behavior target))
(define-extern target-danger-set! (function symbol symbol float :behavior target))
(define-extern average-turn-angle (function target float)) ;; NOTE - arg not confirmed, also unused
(define-extern can-play-stance-amibent? (function symbol :behavior target))
(define-extern can-play-stance-ambient? (function symbol :behavior target))
(define-extern can-jump? (function symbol symbol :behavior target))
(define-extern move-legs? (function symbol :behavior target))
(define-extern fall-test (function none :behavior target)) ;; NOTE - first arg unused
Expand Down
4 changes: 2 additions & 2 deletions decompiler/config/jak2/all-types.gc
Original file line number Diff line number Diff line change
Expand Up @@ -25308,7 +25308,7 @@ Based on the implementation of point-poly-intersection?, these should likely be
"Is the given point ([[vector]]) outside of the [[nav-mesh]]'s `bounds` [[sphere]] radius"
(_type_ vector) symbol) ;; 10
(find-poly-containing-point-1 "Find nav-poly containing this point." (_type_ vector) nav-poly) ;; 11
(cloest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) ;; 12
(closest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) ;; 12
(find-nearest-poly-to-point "Find the nav-poly closest to this point in the nav-mesh." (_type_ vector) nav-poly) ;; 13
(project-point-onto-plane-of-poly "Move a point to the be on the plane containing the given nav-poly. Return the normal too" (_type_ nav-poly vector vector vector) none) ;; 14
(find-poly-containing-point-2 "Find nav-poly containing this point - same as 1" (_type_ vector) nav-poly) ;; 15
Expand Down Expand Up @@ -31148,7 +31148,7 @@ Consists of a header and a list of [[merc-effect]]s."
(define-extern debounce-speed (function float float vector vector float :behavior target))
(define-extern target-align-vel-z-adjust (function float float :behavior target))
(define-extern average-turn-angle (function target float))
(define-extern can-play-stance-amibent? (function symbol :behavior target))
(define-extern can-play-stance-ambient? (function symbol :behavior target))
(define-extern target-height-above-ground (function float :behavior target))
(define-extern can-jump? (function symbol symbol :behavior target))
(define-extern target-jump-go (function none :behavior target))
Expand Down
2 changes: 1 addition & 1 deletion decompiler/config/jak3/all-types.gc
Original file line number Diff line number Diff line change
Expand Up @@ -36354,7 +36354,7 @@
(define-extern debounce-speed (function float float vector vector float :behavior target))
(define-extern target-align-vel-z-adjust (function float float :behavior target))
(define-extern average-turn-angle (function target float))
(define-extern can-play-stance-amibent? (function symbol :behavior target))
(define-extern can-play-stance-ambient? (function symbol :behavior target))
(define-extern target-height-above-ground (function float :behavior target))
(define-extern find-collision-below (function vector vector float symbol))
(define-extern can-jump? (function symbol symbol :behavior target))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak1/engine/target/target-util.gc
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@
(fabs (deg-diff (atan (-> arg0 control unknown-vector-array00 s5-0 x) (-> arg0 control unknown-vector-array00 s5-0 z)) 0.0))))
(/ f30-0 8)))

(defbehavior can-play-stance-amibent? target ()
(defbehavior can-play-stance-ambient? target ()
(and (time-elapsed? (-> self state-time) (seconds 30))
(not (-> *setting-control* current talking))
(not (-> *setting-control* current spooling))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak1/engine/target/target.gc
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
(ja :num! (loop!))
(ja :chan 1 :num! (chan 0))
(ja :chan 2 :num! (chan 0))
(if (can-play-stance-amibent?) (go target-stance-ambient)))))
(if (can-play-stance-ambient?) (go target-stance-ambient)))))
:post target-post)

(defstate target-walk (target)
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/nav/nav-control-h.gc
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
(debug-draw (_type_) none)
(point-in-bsphere? (_type_ vector) symbol)
(find-poly-containing-point-1 (_type_ vector) nav-poly)
(cloest-point-on-mesh (_type_ vector vector nav-poly) nav-poly)
(closest-point-on-mesh (_type_ vector vector nav-poly) nav-poly)
(find-nearest-poly-to-point (_type_ vector) nav-poly)
(project-point-onto-plane-of-poly (_type_ nav-poly vector vector vector) none)
(find-poly-containing-point-2 (_type_ vector) nav-poly)
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/nav/nav-control.gc
Original file line number Diff line number Diff line change
Expand Up @@ -2089,7 +2089,7 @@ Note that this doesn't actually return the nav-control, but instead adds this pr
(none)
)

(defmethod cloest-point-on-mesh ((this nav-control) (arg0 vector) (arg1 vector) (arg2 nav-poly))
(defmethod closest-point-on-mesh ((this nav-control) (arg0 vector) (arg1 vector) (arg2 nav-poly))
(local-vars (sv-16 vector))
(set! sv-16 arg0)
(let ((gp-0 (new 'stack-no-clear 'nav-find-poly-parms)))
Expand Down
6 changes: 3 additions & 3 deletions goal_src/jak2/engine/nav/nav-enemy.gc
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
(set! (-> s4-0 quad) (-> gp-0 trans quad))
)
(else
(if (or (not (cloest-point-on-mesh (-> s3-0 nav) s4-0 (-> gp-0 trans) (the-as nav-poly #f)))
(if (or (not (closest-point-on-mesh (-> s3-0 nav) s4-0 (-> gp-0 trans) (the-as nav-poly #f)))
(let ((f0-0 32768.0))
(< (* f0-0 f0-0) (vector-vector-xz-distance-squared s4-0 (-> gp-0 trans)))
)
Expand Down Expand Up @@ -2176,7 +2176,7 @@ This commonly includes things such as:
(vector-normalize! s4-0 (rnd-float-range self 16384.0 49152.0))
(vector-rotate-around-y! s4-0 s4-0 f30-1)
(vector+! s5-0 s5-0 s4-0)
(if (and (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))
(if (and (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))
(< 4096.0 (vector-vector-xz-distance s5-0 (-> self root trans)))
)
(return #f)
Expand Down Expand Up @@ -2333,7 +2333,7 @@ This commonly includes things such as:
)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(set! (-> gp-1 quad) (-> self root trans quad))
(cloest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f))
(if (< (vector-vector-xz-distance gp-1 (-> self root trans)) 409.6)
(set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags))))
(set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41))))
Expand Down
4 changes: 2 additions & 2 deletions goal_src/jak2/engine/target/board/board-states.gc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
(define-extern target-board-handler (function process int symbol event-message-block object :behavior target))
(define-extern ground-tween-initialize (function ground-tween-info uint uint uint uint uint uint float ground-tween-info :behavior target))
(define-extern ground-tween-update (function ground-tween-info float float float none :behavior target))
(define-extern can-play-stance-amibent? (function symbol :behavior target))
(define-extern can-play-stance-ambient? (function symbol :behavior target))
(define-extern ja-blend-eval (function int :behavior process-drawable))
(define-extern spawn-projectile (function type projectile-init-by-other-params process-tree dead-pool (pointer process)))
(define-extern target-attacked (function symbol attack-info process touching-shapes-entry (state symbol attack-info target) object :behavior target))
Expand Down Expand Up @@ -699,7 +699,7 @@
)
)
(suspend)
(can-play-stance-amibent?)
(can-play-stance-ambient?)
)
)
#f
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/target/gun/gun-states.gc
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
)
(suspend)
(ja :num! (loop!))
(when (can-play-stance-amibent?)
(when (can-play-stance-ambient?)
(set-time! (-> self ambient-time))
(target-gun-end-mode #t)
)
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/target/mech/mech-states.gc
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
(set! (-> a0-44 param 0) 1.0)
(joint-control-channel-group-eval! a0-44 (the-as art-joint-anim #f) num-func-loop!)
)
(can-play-stance-amibent?)
(can-play-stance-ambient?)
)
)
#f
Expand Down
6 changes: 3 additions & 3 deletions goal_src/jak2/engine/target/target-anim.gc
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
(until #f
(suspend)
(ja :num! (loop!))
(if (can-play-stance-amibent?)
(if (can-play-stance-ambient?)
(go target-stance-ambient)
)
)
Expand Down Expand Up @@ -1617,14 +1617,14 @@
(until #f
(ja-no-eval :group! jakb-edge-grab-stance0-ja :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(can-play-stance-amibent?)
(can-play-stance-ambient?)
(suspend)
(ja :num! (seek!))
)
(+! (-> self anim-seed) 1)
(ja-no-eval :group! jakb-edge-grab-stance1-ja :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(can-play-stance-amibent?)
(can-play-stance-ambient?)
(suspend)
(ja :num! (seek!))
)
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/target/target-swim.gc
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
(until #f
(ja :group! jakb-swim-stance-ja :num! min)
(until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel)))
(can-play-stance-amibent?)
(can-play-stance-ambient?)
(suspend)
(if (= (-> self skel root-channel 0) (-> self skel channel))
(ja :num! (seek!))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/target/target-turret.gc
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,7 @@
(ja :group! jakb-turret-stance-ja)
(until v1-19
(suspend)
(can-play-stance-amibent?)
(can-play-stance-ambient?)
(ja :num! (loop! 0.5))
(set! v1-19
(and (or (not (-> self control unknown-handle02)) (cpad-pressed? (-> self control cpad number) triangle))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/target/target-util.gc
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@
)
)

(defbehavior can-play-stance-amibent? target ()
(defbehavior can-play-stance-ambient? target ()
(and (or (and (= *kernel-boot-message* 'kiosk)
(>= (+ -300000 (-> *display* real-clock frame-counter)) (seconds 60))
(>= (- (-> *display* base-clock frame-counter) (-> self control cpad change-time)) (seconds 60))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/engine/target/target2.gc
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
)
(ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(can-play-stance-amibent?)
(can-play-stance-ambient?)
(suspend)
(ja :num! (seek!))
)
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/atoll/juicer.gc
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@
(set-vector! s4-0 (* 8192.0 (cos f28-0)) 0.0 (* 8192.0 (sin f28-0)) 1.0)
)
(vector+! s4-0 s4-0 gp-0)
(cloest-point-on-mesh (-> self nav) s4-0 s4-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) s4-0 s4-0 (the-as nav-poly #f))
(vector-! s5-0 s4-0 gp-0)
(set! (-> s5-0 y) 0.0)
(vector-normalize! s5-0 30720.0)
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/castle/boss/castle-baron.gc
Original file line number Diff line number Diff line change
Expand Up @@ -2811,7 +2811,7 @@
)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(set! (-> gp-1 quad) (-> self root trans quad))
(cloest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f))
(if (< (vector-vector-xz-distance gp-1 (-> self root trans)) 409.6)
(set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags))))
(set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41))))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/city/common/pilot-states.gc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
(set! (-> s5-2 frame-num) (ja-aframe f0-6 2))
)
)
(can-play-stance-amibent?)
(can-play-stance-ambient?)
(suspend)
)
#f
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/city/kiddogescort/crocesc.gc
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
(set! (-> s4-0 y) (-> s3-1 best-other-tri intersect y))
(let ((s3-2 (new 'stack-no-clear 'vector)))
(do-navigation-to-destination (-> this nav state) (-> this root trans))
(when (cloest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f))
(when (closest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f))
(let ((f0-4 2048.0))
(when (>= (* f0-4 f0-4) (vector-vector-xz-distance-squared s3-2 s4-0))
(set! (-> arg0 quad) (-> s3-2 quad))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/city/kiddogescort/kidesc.gc
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ This commonly includes things such as:
(set! (-> s4-0 y) (-> s3-1 best-other-tri intersect y))
(let ((s3-2 (new 'stack-no-clear 'vector)))
(do-navigation-to-destination (-> this nav state) (-> this root trans))
(when (cloest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f))
(when (closest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f))
(let ((f0-4 2048.0))
(when (>= (* f0-4 f0-4) (vector-vector-xz-distance-squared s3-2 s4-0))
(set! (-> arg0 quad) (-> s3-2 quad))
Expand Down
4 changes: 2 additions & 2 deletions goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@
(cond
((-> self coming-from-pw)
(let ((s5-1 (-> self nav))
(s4-0 (method-of-type nav-control cloest-point-on-mesh))
(s4-0 (method-of-type nav-control closest-point-on-mesh))
(s3-0 gp-0)
(s2-0 (new 'stack-no-clear 'vector))
)
Expand All @@ -821,7 +821,7 @@
(set! (-> self coming-from-pw) #f)
)
(else
(cloest-point-on-mesh (-> self nav) gp-0 (-> self root trans) (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) gp-0 (-> self root trans) (the-as nav-poly #f))
(when (< 4096.0 (vector-vector-xz-distance gp-0 (-> self root trans)))
(set! (-> self root transv x) (- (-> gp-0 x) (-> self root trans x)))
(set! (-> self root transv y) 40960.0)
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/city/traffic/citizen/guard.gc
Original file line number Diff line number Diff line change
Expand Up @@ -2174,7 +2174,7 @@
(s3-0 (new 'stack-no-clear 'vector))
)
(vector+! s3-0 (-> arg1 trans) arg2)
(cloest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f))
(cond
((< 409.6 (vector-vector-distance s3-0 s4-0))
#f
Expand Down
6 changes: 3 additions & 3 deletions goal_src/jak2/levels/common/enemy/grenadier.gc
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@

;; WARN: Return type mismatch vector vs none.
(defmethod grenadier-method-182 ((this grenadier) (arg0 vector))
(cloest-point-on-mesh (-> this nav) arg0 arg0 (the-as nav-poly #f))
(closest-point-on-mesh (-> this nav) arg0 arg0 (the-as nav-poly #f))
(set! (-> this bank final-pos quad) (-> arg0 quad))
(set! (-> this bank tangent-pos quad) (-> arg0 quad))
(set! (-> this move-pos quad) (-> this bank tangent-pos quad))
Expand Down Expand Up @@ -517,7 +517,7 @@
(set! (-> s4-0 quad) (-> self root trans quad))
(new 'stack-no-clear 'vector)
(vector-normalize! s3-1 49152.0)
(cloest-point-on-mesh (-> self nav) s4-0 (vector+! s4-0 s5-0 s3-1) (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) s4-0 (vector+! s4-0 s5-0 s3-1) (the-as nav-poly #f))
(when (< 32768.0 (vector-vector-distance gp-0 s4-0))
(set! (-> self move-pos quad) (-> s4-0 quad))
(let ((a0-11 (-> self nav state))
Expand Down Expand Up @@ -853,7 +853,7 @@
(a2-2 (vector+! (new 'stack-no-clear 'vector) (-> self root trans) v1-8))
)
(set! (-> self move-pos quad) (-> self root trans quad))
(cloest-point-on-mesh (-> self nav) (-> self move-pos) a2-2 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) (-> self move-pos) a2-2 (the-as nav-poly #f))
)
(let ((a0-10 (-> self nav state))
(v1-13 (-> self move-pos))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,7 @@
(when s5-0
(set! (-> this target-pos quad) (-> (get-trans (the-as process-focusable s5-0) 3) quad))
(if (= (-> this focus aware) (enemy-aware enemy-aware-3))
(cloest-point-on-mesh (-> this nav) (-> this reachable-target-pos) (-> this target-pos) (the-as nav-poly #f))
(closest-point-on-mesh (-> this nav) (-> this reachable-target-pos) (-> this target-pos) (the-as nav-poly #f))
)
(set! (-> this target-vel-vec quad) (-> (the-as process-focusable s5-0) root transv quad))
(set! (-> this target-vel) (vector-length (-> this target-vel-vec)))
Expand Down Expand Up @@ -2951,7 +2951,7 @@
(s3-0 (new 'stack-no-clear 'vector))
)
(vector+! s3-0 (-> arg1 trans) arg2)
(cloest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f))
(cond
((< 409.6 (vector-vector-distance s3-0 s4-0))
#f
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/common/enemy/hover/flamer.gc
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
)
)
)
(cloest-point-on-mesh (-> self nav) (-> self dest-pos) (-> self dest-pos) (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) (-> self dest-pos) (-> self dest-pos) (the-as nav-poly #f))
(if #f
(add-debug-line
#t
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/common/enemy/spyder.gc
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@
)
)
(set! (-> this move-dest quad) (-> s5-0 quad))
(cloest-point-on-mesh (-> this nav) (-> this move-dest) s4-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> this nav) (-> this move-dest) s4-0 (the-as nav-poly #f))
)
)
)
Expand Down
4 changes: 2 additions & 2 deletions goal_src/jak2/levels/common/entities/gun-buoy.gc
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
(vector+! s5-0 s4-0 v1-8)
(cond
((logtest? (-> self flags) (gun-buoy-flags gubflags-0))
(cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))
(let ((v1-14 (-> self root trans)))
(vector-length (vector-! (new 'stack-no-clear 'vector) v1-14 s5-0))
)
Expand Down Expand Up @@ -464,7 +464,7 @@
)
(set! (-> s5-0 y) -819.2)
(let ((s3-2 (vector+! (new 'stack-no-clear 'vector) s4-0 s5-0)))
(cloest-point-on-mesh (-> self nav) s3-2 s3-2 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) s3-2 s3-2 (the-as nav-poly #f))
(set! (-> self root trans quad) (-> s3-2 quad))
)
(set! (-> self y-final) (-> self root trans y))
Expand Down
4 changes: 2 additions & 2 deletions goal_src/jak2/levels/drill/ginsu.gc
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@
(vector+float*! gp-0 (-> self root trans) gp-0 20480.0)
(vector+float*! gp-0 gp-0 s5-0 f30-0)
)
(cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f))
(if (< (vector-vector-xz-distance gp-0 (-> self root trans)) 409.6)
(set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags))))
(set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41))))
Expand Down Expand Up @@ -692,7 +692,7 @@
(set! (-> gp-0 y) 0.0)
(vector-normalize! gp-0 -819.2)
(vector+! gp-0 gp-0 (-> self root trans))
(cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f))
(closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f))
(if (< (vector-vector-xz-distance gp-0 (-> self root trans)) 409.6)
(set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags))))
(set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41))))
Expand Down
2 changes: 1 addition & 1 deletion goal_src/jak2/levels/forest/fish.gc
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
(.add.mul.w.vf.xyz vf6 vf4 vf0 acc)
(.svf (&-> a1-54 quad) vf6)
)
(cloest-point-on-mesh (-> self nav) s2-0 s2-0 sv-720)
(closest-point-on-mesh (-> self nav) s2-0 s2-0 sv-720)
(set! (-> s2-0 y) -1638.4)
(let ((v1-124 (handle->process (-> s1-0 handle))))
(when v1-124
Expand Down
Loading
Loading