mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-06-11 21:19:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some enter-states and sound-id fields (#2727)

Browse Source 
Supersedes #2525
This commit is contained in:
ManDude
2023-06-14 22:04:00 +01:00
committed by GitHub
parent 45bbefafde
commit f0fb6f422d
122 changed files with 11767 additions and 11881 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+106 -109
View File
@@ -5644,7 +5644,7 @@
(lightning-count0 uint32 :offset-assert 144)
(lightning-count1 uint32 :offset-assert 148)
(lightning-count2 uint32 :offset-assert 152)
(rain-id uint32 :offset-assert 156)
(rain-id sound-id :offset-assert 156)
(sound-pitch float :offset-assert 160)
(fogs mood-fog-table 9 :offset-assert 164)
(colors mood-color-table 3 :offset-assert 200)
@@ -16949,7 +16949,7 @@
(target1 handle :offset-assert 200)
(target-joint0 int32 :offset-assert 208)
(target-joint1 int32 :offset-assert 212)
(sound uint32 :offset-assert 216)
(sound sound-id :offset-assert 216)
(userdata uint64 :offset-assert 224)
(user-time time-frame 2 :offset-assert 232)
(user-vector vector :inline :offset-assert 256)
@@ -18381,7 +18381,7 @@
(_type_) symbol 38)
(play-impact-sound!
"Plays impact sound"
(_type_) sound-id :behavior projectile 39)
(_type_) none :behavior projectile 39)
)
)
@@ -18546,7 +18546,7 @@
target-carry-drop
target-carry-falling
(target-carry-hit-ground symbol)
(target-carry-jump float float)
(target-carry-jump float float symbol)
target-carry-pickup
target-carry-stance
target-carry-throw
@@ -18594,7 +18594,7 @@
(target-indax-jump float float surface)
target-indax-running-attack
target-indax-stance
target-indax-start
(target-indax-start handle)
target-indax-trip
target-indax-walk
(target-jump float float surface)
@@ -18606,7 +18606,7 @@
target-mech-carry-drop
target-mech-carry-falling
(target-mech-carry-hit-ground symbol)
(target-mech-carry-jump float float)
(target-mech-carry-jump float float symbol)
target-mech-carry-pickup
target-mech-carry-stance
target-mech-carry-throw
@@ -28214,7 +28214,7 @@
(define-extern talker-displayed? (function symbol))
(define-extern kill-current-talker (function symbol pair symbol none)) ;; see (exit play-anim scene-player)
(define-extern string->talker-speech (function string talker-speech-class))
(define-extern talker-spawn-func (function talker-speech-class process-tree vector region int))
(define-extern talker-spawn-func (function talker-speech-class process-tree vector region sound-id))
(define-extern talker-init (function talker-speech-class vector region none :behavior talker))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -28600,7 +28600,7 @@
(track-trans vector :inline :offset-assert 480)
(track-dir vector :inline :offset-assert 496)
(turn-fast-hold-time time-frame :offset-assert 512)
(blue-whine-sound-id uint32 :offset-assert 520)
(blue-whine-sound-id sound-id :offset-assert 520)
(blue-whine-volume float :offset-assert 524)
(top-anim-twist vector :inline :offset-assert 528)
(top-anim-twist-targ vector :inline :offset-assert 544)
@@ -28688,17 +28688,17 @@
(upper-body joint-mod :offset-assert 68)
(sound-bank-knob float :offset-assert 72)
(sound-air-knob float :offset-assert 76)
(wind-sound-id uint32 :offset-assert 80)
(wind-sound-id sound-id :offset-assert 80)
(wind-sound-pitch float :offset-assert 84)
(wind-sound-volume float :offset-assert 88)
(engine-sound-id uint32 :offset-assert 92)
(engine-sound-id sound-id :offset-assert 92)
(engine-sound-pitch float :offset-assert 96)
(engine-sound-volume float :offset-assert 100)
(bank-sound-id uint32 :offset-assert 104)
(bank-sound-id sound-id :offset-assert 104)
(bank-sound-pitch float :offset-assert 108)
(bank-sound-volume float :offset-assert 112)
(ride-sound-id uint32 :offset-assert 116)
(spin-sound-id uint32 :offset-assert 120)
(ride-sound-id sound-id :offset-assert 116)
(spin-sound-id sound-id :offset-assert 120)
(spin-sound-volume float :offset-assert 124)
(spin-sound-pitch float :offset-assert 128)
(unknown-sound-id00 sound-id :offset-assert 132) ;; target-board-anim-trans
@@ -28873,7 +28873,7 @@
(clock-vel float :offset-assert 52)
(clock-on symbol :offset-assert 56)
(hud handle 1 :offset 64)
(tone uint32 :offset 72)
(tone sound-id :offset 72)
(bomb uint32 :offset 76)
)
:method-count-assert 10
@@ -29652,10 +29652,10 @@
(track-target handle :offset-assert 528)
(size-t float :offset-assert 536)
(result-array handle 16 :offset-assert 544)
(charge-sound uint32 :offset-assert 672)
(fire-sound uint32 :offset-assert 676)
(trail-sound uint32 :offset-assert 680)
(explode-sound uint32 :offset-assert 684)
(charge-sound sound-id :offset-assert 672)
(fire-sound sound-id :offset-assert 676)
(trail-sound sound-id :offset-assert 680)
(explode-sound sound-id :offset-assert 684)
(start-pilot? basic :offset-assert 688)
)
:method-count-assert 42
@@ -29754,12 +29754,12 @@
(mech-trans vector :inline :offset-assert 16)
(mech-quat vector :inline :offset-assert 32)
(mech-scale vector :inline :offset-assert 48)
(engine-sound-id uint32 :offset-assert 64)
(engine-sound-id sound-id :offset-assert 64)
(engine-sound-volume float :offset-assert 68)
(engine-sound-pitch float :offset-assert 72)
(thrust-sound-id uint32 :offset-assert 76)
(drag-sound-id uint32 :offset-assert 80)
(whine-sound-id uint32 :offset-assert 84)
(thrust-sound-id sound-id :offset-assert 76)
(drag-sound-id sound-id :offset-assert 80)
(whine-sound-id sound-id :offset-assert 84)
(mech-start-time time-frame :offset-assert 88)
(mech-time time-frame :offset-assert 96)
(no-get-off-time time-frame :offset-assert 104)
@@ -35458,7 +35458,7 @@
(count-guard uint32 :offset-assert 244)
(max-time float :offset-assert 248)
(spawn-time time-frame :offset-assert 256)
(ambient-sound-id uint32 :offset-assert 264)
(ambient-sound-id sound-id :offset-assert 264)
(num-wanted-guards uint32 :offset-assert 268)
(guards handle 8 :offset-assert 272) ;; NOTE - probably 'guard'
)
@@ -36253,7 +36253,7 @@
(falling? basic :offset-assert 264)
(focus-disable-timer uint64 :offset-assert 272)
(hud handle :offset-assert 280)
(sound-id uint32 :offset-assert 288)
(sound-id sound-id :offset-assert 288)
)
:method-count-assert 31
:size-assert #x124
@@ -36788,8 +36788,8 @@
(twist oscillating-float :inline :offset-assert 1164)
(twist-kicker delayed-rand-float :inline :offset-assert 1192)
(smoke-part sparticle-launch-control :offset-assert 1220)
(motor-sound uint32 :offset-assert 1224)
(bit-sound uint32 :offset-assert 1228)
(motor-sound sound-id :offset-assert 1224)
(bit-sound sound-id :offset-assert 1228)
(movie-handle handle :offset-assert 1232)
(hud-counter handle :offset-assert 1240)
(speech-time time-frame :offset-assert 1248)
@@ -36821,12 +36821,12 @@
(deftype dig-sinking-plat (rigid-body-platform)
((anchor-point vector :inline :offset-assert 384)
(sync sync-linear :inline :offset-assert 400)
(last-ridden-time time-frame :offset-assert 416)
(last-ridden-time time-frame :offset-assert 416)
(prev-pos float :offset-assert 424)
(path-pos float :offset-assert 428)
(surface-height float :offset-assert 432)
(once basic :offset-assert 436)
(bubbling-sound-id uint32 :offset-assert 440)
(bubbling-sound-id sound-id :offset-assert 440)
)
:method-count-assert 57
:size-assert #x1bc
@@ -37024,7 +37024,7 @@
(trapeze-grabbed basic :offset-assert 360)
(pedal-anim-frame float :offset-assert 364)
(pedal-anim-speed float :offset-assert 368)
(pedal-sound-id uint32 :offset-assert 372)
(pedal-sound-id sound-id :offset-assert 372)
)
:method-count-assert 21
:size-assert #x178
@@ -37050,8 +37050,8 @@
)
(deftype dig-wheel-step (process-drawable)
((anim-speed float :offset-assert 200)
(wheel-sound-id uint32 :offset-assert 204)
((anim-speed float :offset-assert 200)
(wheel-sound-id sound-id :offset-assert 204)
)
:method-count-assert 21
:size-assert #xd0
@@ -37063,9 +37063,9 @@
(deftype dig-tipping-rock (rigid-body-platform)
((anchor-point vector :inline :offset-assert 384)
(last-ridden-time time-frame :offset-assert 400)
(last-ridden-time time-frame :offset-assert 400)
(surface-height float :offset-assert 408)
(bubbling-sound-id uint32 :offset-assert 412)
(bubbling-sound-id sound-id :offset-assert 412)
)
:method-count-assert 57
:size-assert #x1a0
@@ -38216,9 +38216,9 @@
(ambush-path path-control :offset-assert 652)
(path-pos float :offset-assert 656)
(ambush-started symbol :offset-assert 660)
(blade-sound uint32 :offset-assert 664)
(blade-sound sound-id :offset-assert 664)
(blade-sound-playing symbol :offset-assert 668)
(grind-sound uint32 :offset-assert 672)
(grind-sound sound-id :offset-assert 672)
(grind-sound-playing symbol :offset-assert 676)
(grind-timer time-frame :offset-assert 680)
)
@@ -38544,7 +38544,7 @@
(art-name symbol :offset-assert 200)
(anim spool-anim :offset-assert 204)
(rock-data vector-array :offset-assert 208)
(loop-id uint32 :offset-assert 212)
(loop-id sound-id :offset-assert 212)
(volume float :offset-assert 216)
)
:method-count-assert 22
@@ -40235,7 +40235,7 @@
(wiggle-angle degrees :offset-assert 640)
(delta-wiggle-angle degrees :offset-assert 644)
(wiggle-factor float :offset-assert 648)
(id uint32 :offset-assert 652)
(id sound-id :offset-assert 652)
)
:method-count-assert 181
:size-assert #x290
@@ -40569,7 +40569,7 @@
:flag-assert #x16008000fc
(:methods
(idle () _type_ :state 20)
(die () _type_ :state 21)
(die (symbol) _type_ :state 21)
)
)
@@ -40733,7 +40733,7 @@
(sound-time time-frame 2 :offset-assert 240)
(sync sync-eased :inline :offset-assert 256)
(piston-id int32 :offset-assert 300)
(looping-id uint32 :offset-assert 304)
(looping-id sound-id :offset-assert 304)
)
:method-count-assert 31
:size-assert #x134
@@ -41947,12 +41947,12 @@
(gun-elev-jmod joint-mod-set-local :offset-assert 552)
(gun-elev float :offset-assert 556)
(gun-elev-cam float :offset-assert 560)
(gun-joint-l int32 2 :offset-assert 564) ;; elt size: 4
(gun-joint-r int32 2 :offset-assert 572) ;; elt size: 4
(gun-joint-l int32 2 :offset-assert 564) ;; elt size: 4
(gun-joint-r int32 2 :offset-assert 572) ;; elt size: 4
(gun-spread float :offset-assert 580)
(gun-index int32 :offset-assert 584)
(flags uint16 :offset-assert 588)
(turn-sound-id uint32 :offset-assert 592)
(turn-sound-id sound-id :offset-assert 592)
)
:method-count-assert 35
:size-assert #x254 ;; 596
@@ -42192,8 +42192,8 @@
(bomb handle 4 :offset-assert 232)
(bomb-count uint32 :offset-assert 264)
(attack-id uint32 :offset-assert 268)
(explosion-sound-id uint32 :offset-assert 272)
(alarm-sound-id uint32 :offset-assert 276)
(explosion-sound-id sound-id :offset-assert 272)
(alarm-sound-id sound-id :offset-assert 276)
)
:method-count-assert 25
:size-assert #x118
@@ -43395,9 +43395,9 @@
(info rigid-body-object-constants :offset-assert 1396)
(explosing symbol :offset-assert 1400)
(minimap connection-minimap :offset-assert 1404)
(lazer-sound uint32 :offset-assert 1408)
(head-sound uint32 :offset-assert 1412)
(cannon-sound uint32 :offset-assert 1416)
(lazer-sound sound-id :offset-assert 1408)
(head-sound sound-id :offset-assert 1412)
(cannon-sound sound-id :offset-assert 1416)
(last-head-roty-speed float :offset-assert 1420)
(head-roty-speed float :offset-assert 1424)
(last-cannon-roty-speed float :offset-assert 1428)
@@ -43700,7 +43700,7 @@
((cabinet handle :offset-assert 200)
(index int32 :offset-assert 208)
(mode uint8 :offset-assert 212)
(sound-id uint32 :offset-assert 216)
(sound-id sound-id :offset-assert 216)
(abort? symbol :offset-assert 220)
)
:method-count-assert 22
@@ -43769,7 +43769,7 @@
(turning-acc float :offset-assert 660)
(speed float :offset-assert 664)
(roll-attack-count uint32 :offset-assert 668)
(roll-sound uint32 :offset-assert 672)
(roll-sound sound-id :offset-assert 672)
)
:method-count-assert 189
:size-assert #x2a4 ;; 676
@@ -43814,7 +43814,7 @@
(actor-group-count int32 :offset-assert 260)
(texture-anim-index uint32 :offset-assert 264)
(my-id int32 :offset-assert 268)
(sound-id uint32 :offset-assert 272)
(sound-id sound-id :offset-assert 272)
(target-speed float :offset-assert 276)
)
:method-count-assert 28
@@ -43844,10 +43844,9 @@
)
(deftype cas-electric-fence (process-focusable)
(
(next-spawn-time time-frame :offset-assert 208)
(stop symbol :offset-assert 216)
)
((next-spawn-time time-frame :offset-assert 208)
(stop symbol :offset-assert 216)
)
:method-count-assert 29
:size-assert #xdc ;; 220
:flag-assert #x1d006000dc
@@ -43866,9 +43865,8 @@
)
(deftype cas-elevator (elevator)
(
(sound-id uint32 :offset-assert 368)
)
((sound-id sound-id :offset-assert 368)
)
:method-count-assert 50
:size-assert #x174 ;; 372
:flag-assert #x3201000174
@@ -43883,7 +43881,7 @@
(test-index uint32 :offset-assert 208)
(pos float :offset-assert 212)
(pos-old float :offset-assert 216)
(sound-id uint32 :offset-assert 220)
(sound-id sound-id :offset-assert 220)
(sound-flag symbol :offset-assert 224)
)
:method-count-assert 21
@@ -43903,7 +43901,7 @@
(pos-old float :offset-assert 220)
(y-start float :offset-assert 224)
(y-delta float :offset-assert 228)
(sound-id uint32 :offset-assert 232)
(sound-id sound-id :offset-assert 232)
(sound-flag symbol :offset-assert 236)
)
:method-count-assert 21
@@ -43941,7 +43939,7 @@
(sync sync-eased :inline :offset-assert 200)
(rot float :offset-assert 244)
(attack-id uint32 :offset-assert 248)
(sound-id uint32 :offset-assert 252)
(sound-id sound-id :offset-assert 252)
)
:method-count-assert 21
:size-assert #x100 ;; 256
@@ -44186,7 +44184,7 @@
((root-override collide-shape-moving :offset 128 :score 1)
(art-name string :offset-assert 200)
(anim spool-anim :offset-assert 204)
(loop-id uint32 :offset-assert 208)
(loop-id sound-id :offset-assert 208)
(spider (pointer tomb-spider) :offset-assert 212)
(explode (pointer process) :offset-assert 216) ;; guess
(stick basic :offset-assert 220)
@@ -44591,7 +44589,7 @@
(path-u float :offset-assert 480)
(path-du float :offset-assert 484)
(attack-id uint32 :offset-assert 488)
(sound-id uint32 :offset-assert 492)
(sound-id sound-id :offset-assert 492)
)
:method-count-assert 23
:size-assert #x1f0
@@ -45273,7 +45271,7 @@
(hide () _type_ :state 20)
(wait-for-start () _type_ :state 21)
(active (symbol) _type_ :state 22)
(lose () _type_ :state 23)
(lose (symbol) _type_ :state 23)
(win () _type_ :state 24)
(onin-game-method-25 (_type_) none 25)
(onin-game-method-26 (_type_) none 26)
@@ -45925,8 +45923,8 @@
(initial-y float :offset-assert 200)
(spike-info tomb-stair-block-spike-info 4 :inline :offset 208)
(camera-state int32 :offset 336)
(sink-sound uint32 :offset 340)
(rise-sound uint32 :offset 344)
(sink-sound sound-id :offset 340)
(rise-sound sound-id :offset 344)
)
:method-count-assert 25
:size-assert #x15c
@@ -46015,7 +46013,7 @@
(path-pos float :offset-assert 292)
(dest-pos float :offset-assert 296)
(path-speed float :offset-assert 300)
(sound-id uint32 :offset-assert 304)
(sound-id sound-id :offset-assert 304)
)
:method-count-assert 39
:size-assert #x134
@@ -46032,7 +46030,7 @@
(deftype tomb-sphinx (process-drawable)
((root-override collide-shape-moving :offset 128 :score 1)
(target-actor entity-actor :offset-assert 200)
(sound-id uint32 :offset-assert 204)
(sound-id sound-id :offset-assert 204)
(move-dir float :offset 216)
)
:method-count-assert 23
@@ -46439,17 +46437,17 @@
(green-fire-part sparticle-launch-control :offset-assert 868)
(lightning lightning-control 5 :offset-assert 872)
(stop-catwalk-sound symbol :offset-assert 892)
(catwalk-sound uint32 :offset-assert 896)
(drill-sound uint32 :offset-assert 900)
(catwalk-sound sound-id :offset-assert 896)
(drill-sound sound-id :offset-assert 900)
(drill-sound-playing symbol :offset-assert 904)
(drill-sweeten-sound uint32 :offset-assert 908)
(drill-sweeten-sound sound-id :offset-assert 908)
(drill-sweeten-sound-playing symbol :offset-assert 912)
(movie-handle handle :offset-assert 920)
(tilt cam-float-seeker :inline :offset-assert 928)
(targetted-catwalk int32 :offset-assert 952)
(hover-sound uint32 :offset-assert 956)
(hover-sound sound-id :offset-assert 956)
(hover-sound-playing symbol :offset-assert 960)
(shake-sound uint32 :offset-assert 964)
(shake-sound sound-id :offset-assert 964)
(shake-sound-playing symbol :offset-assert 968)
(hud handle :offset-assert 976)
(last-want-stone-talker int8 :offset-assert 984)
@@ -46529,15 +46527,15 @@
)
(define-extern baron-pod-init-by-other (function vector none :behavior baron-pod))
(define-extern widow-want-stone-talker (function int :behavior widow))
(define-extern widow-general-flying-talker (function int :behavior widow))
(define-extern widow-launch-droids-talker (function int :behavior widow))
(define-extern widow-launch-bombs-talker (function int :behavior widow))
(define-extern widow-shoot-gun-talker (function int :behavior widow))
(define-extern widow-stone-charge-up-talker (function int :behavior widow))
(define-extern widow-after-stone-shot-talker (function int :behavior widow))
(define-extern widow-leave-perch-talker (function int :behavior widow))
(define-extern widow-damaged-talker (function int :behavior widow))
(define-extern widow-want-stone-talker (function sound-id :behavior widow))
(define-extern widow-general-flying-talker (function sound-id :behavior widow))
(define-extern widow-launch-droids-talker (function sound-id :behavior widow))
(define-extern widow-launch-bombs-talker (function sound-id :behavior widow))
(define-extern widow-shoot-gun-talker (function sound-id :behavior widow))
(define-extern widow-stone-charge-up-talker (function sound-id :behavior widow))
(define-extern widow-after-stone-shot-talker (function sound-id :behavior widow))
(define-extern widow-leave-perch-talker (function sound-id :behavior widow))
(define-extern widow-damaged-talker (function sound-id :behavior widow))
(define-extern widow-handler (function process int symbol event-message-block object :behavior widow))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -46581,7 +46579,7 @@
(y-rotate float :offset-assert 376)
(spin-jm joint-mod :offset-assert 380)
(firework-sound-played symbol :offset-assert 384)
(steam-sound uint32 :offset-assert 388)
(steam-sound sound-id :offset-assert 388)
(launch vector :inline :offset-assert 400)
(launch-pos vector :inline :offset-assert 416)
(fizzle-timer time-frame :offset-assert 432)
@@ -47023,8 +47021,8 @@
(declare-type training-manager process)
;; +++gun-dummy:tpath-control-frame-command
(defenum tpath-control-frame-command
;; +++gun-dummy:tpath-command
(defenum tpath-command
:type uint8
(begin) ;; kinda a guess
(arise)
@@ -47034,12 +47032,12 @@
(lower)
(end) ;; kinda a guess
)
;; ---gun-dummy:tpath-control-frame-command
;; ---gun-dummy:tpath-command
(deftype tpath-control-frame (structure)
((time float :offset-assert 0)
(path-pos uint8 :offset-assert 4)
(command tpath-control-frame-command :offset-assert 5)
(command tpath-command :offset-assert 5)
(move-type uint8 :offset-assert 6)
(path-num uint8 :offset-assert 7)
)
@@ -47048,27 +47046,26 @@
:flag-assert #x900000008
)
;; +++gun-dummy:tpath-info-flags
(defenum tpath-info-flags
;; +++gun-dummy:tpath-flags
(defenum tpath-flags
:type uint8
:bitfield #t
(tpath-info-flags-0)
(need-to-spawn)
(broken)
(score-not-influenced-by-speed)
(tpath-info-flags-3)
(start-on-rand-anim)
(double-hitpoints)
(tpath-info-flags-6) ;; unknown - TODO i think this is related to the peacemaker course
(tpath-info-flags-7)
(citizen)
(bonus)
(tpath-rand)
(big)
(peace)
)
;; ---gun-dummy:tpath-info-flags
;; ---gun-dummy:tpath-flags
(deftype tpath-info (structure)
((s-time float :offset-assert 0)
(num uint16 :offset-assert 4)
(ref-time-num int16 :offset-assert 6)
(score int16 :offset-assert 8)
(flags tpath-info-flags :offset-assert 10)
(flags tpath-flags :offset-assert 10)
(num-anims uint8 :offset-assert 11)
(bonus-time float :offset-assert 12)
(list (array int32) :offset-assert 16)
@@ -47807,7 +47804,7 @@
(deftype bubbler (process-drawable)
((rod-of-god-scale float :offset-assert 200)
(ambient-id uint32 :offset-assert 204)
(ambient-id sound-id :offset-assert 204)
(last-recharge-time time-frame :offset-assert 208)
)
:method-count-assert 22
@@ -48217,7 +48214,7 @@
(deftype jellyfish (hover-enemy)
((los los-control :inline :offset-assert 784)
(sync sync-eased :inline :offset-assert 936)
(sound-id uint32 :offset-assert 980)
(sound-id sound-id :offset-assert 980)
(path-player-u float :offset-assert 984)
(path-my-u float :offset-assert 988)
(path-y-offset float :offset-assert 992)
@@ -50307,7 +50304,7 @@
(max-guard uint32 :offset-assert 240)
(count-guard uint32 :offset-assert 244)
(max-time float :offset-assert 248)
(ambient-sound-id uint32 :offset-assert 252)
(ambient-sound-id sound-id :offset-assert 252)
(turret handle :offset-assert 256)
)
:method-count-assert 36
@@ -51470,7 +51467,7 @@
(target-self-xz-dist float :offset-assert 1220)
(target-y-angle degrees :offset-assert 1224)
(last-visible-target-pos vector :inline :offset-assert 1232)
(lazer-sound uint32 :offset-assert 1248)
(lazer-sound sound-id :offset-assert 1248)
(move-position vector :inline :offset-assert 1264)
(move-index int32 :offset-assert 1280)
(traffic-target-status traffic-target-status :inline :offset-assert 1296)
@@ -52108,12 +52105,12 @@
(deftype propa (process-focusable)
(
(sound-id uint32 :offset-assert 204)
(sound-index uint32 :offset-assert 208)
(handle handle :offset-assert 216)
(y-rot float :offset-assert 224)
(hit-points int32 :offset-assert 228)
(incoming-attack-id uint32 :offset-assert 232)
(sound-id sound-id :offset-assert 204)
(sound-index uint32 :offset-assert 208)
(handle handle :offset-assert 216)
(y-rot float :offset-assert 224)
(hit-points int32 :offset-assert 228)
(incoming-attack-id uint32 :offset-assert 232)
)
:method-count-assert 32
:size-assert #xec ;; 236
@@ -52277,8 +52274,8 @@
)
(deftype barge (boat-base)
((engine uint32 :offset-assert 896)
(bow-wash uint32 :offset-assert 900)
((engine sound-id :offset-assert 896)
(bow-wash sound-id :offset-assert 900)
)
:method-count-assert 149
:size-assert #x388
decompiler/config/jak2/ntsc_v1/anonymous_function_types.jsonc
+1 -1
View File
@@ -577,7 +577,7 @@
[25, "(function none :behavior scene-player)"],
[26, "(function (pointer process) :behavior scene-player)"],
[27, "(function symbol :behavior scene-player)"],
[28, "(function int)"],
[28, "(function sound-id)"],
[29, "(function (pointer process) :behavior scene-player)"],
[30, "(function symbol :behavior scene-player)"],
[31, "(function process-drawable vector)"]
goal_src/jak2/engine/ambient/ambient-h.gc
+1 -1
View File
@@ -6,7 +6,7 @@
;; dgos: ENGINE, GAME
(declare-type talker-speech-class structure)
(define-extern talker-spawn-func (function talker-speech-class process-tree vector region int))
(define-extern talker-spawn-func (function talker-speech-class process-tree vector region sound-id))
(define-extern talker-surpress! (function none))
(declare-type talker process)
(define-extern talker-init (function talker-speech-class vector region none :behavior talker))
goal_src/jak2/engine/ambient/ambient.gc
+2 -1
View File
@@ -162,6 +162,7 @@
(none)
)
;; WARN: Return type mismatch int vs sound-id.
(defun talker-spawn-func ((arg0 talker-speech-class) (arg1 process-tree) (arg2 vector) (arg3 region))
(local-vars (s2-0 int))
(when (or (not arg0) (zero? (-> arg0 speech)) (not (talker-speech-class-method-9 arg0)))
@@ -202,7 +203,7 @@
)
)
(label cfg-27)
s2-0
(the-as sound-id s2-0)
)
(defbehavior talker-init talker ((arg0 talker-speech-class) (arg1 vector) (arg2 region))
goal_src/jak2/engine/common_objs/generic-obs-h.gc
+1 -1
View File
@@ -117,7 +117,7 @@
(target1 handle :offset-assert 200)
(target-joint0 int32 :offset-assert 208)
(target-joint1 int32 :offset-assert 212)
(sound uint32 :offset-assert 216)
(sound sound-id :offset-assert 216)
(userdata uint64 :offset-assert 224)
(user-time time-frame 2 :offset-assert 232)
(user-vector vector :inline :offset-assert 256)
goal_src/jak2/engine/common_objs/generic-obs.gc
+3 -3
View File
@@ -1406,7 +1406,7 @@ This commonly includes things such as:
(when (nonzero? (-> self sound))
(let ((v1-1 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-1 command) (sound-command set-param))
(set! (-> v1-1 id) (the-as sound-id (-> self sound)))
(set! (-> v1-1 id) (-> self sound))
(set! (-> v1-1 params volume) -4)
(set! (-> v1-1 auto-time) 240)
(set! (-> v1-1 auto-from) 2)
@@ -1417,7 +1417,7 @@ This commonly includes things such as:
(none)
)
:code (behavior ()
(set! (-> self sound) (the-as uint 0))
(set! (-> self sound) (new 'static 'sound-id))
(when (!= (+ (-> self lightning spec delay) (-> self lightning spec delay-rand)) 0.0)
(let ((gp-0 (current-time))
(s5-0 (the int (rand-vu-float-range
@@ -1454,7 +1454,7 @@ This commonly includes things such as:
)
)
)
(set! (-> self sound) (the-as uint (sound-play-by-spec (the-as sound-spec gp-1) (new-sound-id) s5-1)))
(set! (-> self sound) (sound-play-by-spec (the-as sound-spec gp-1) (new-sound-id) s5-1))
)
)
)
goal_src/jak2/engine/common_objs/projectile-h.gc
+1 -1
View File
@@ -82,7 +82,7 @@
(handle-proj-hit! (_type_ process event-message-block) object 36)
(deal-damage! (_type_ process event-message-block) symbol 37)
(made-impact? (_type_) symbol 38)
(play-impact-sound! (_type_) sound-id :behavior projectile 39)
(play-impact-sound! (_type_) none :behavior projectile 39)
)
)
goal_src/jak2/engine/common_objs/projectile.gc
+4 -2
View File
@@ -19,10 +19,10 @@
)
)
;; WARN: Return type mismatch int vs sound-id.
(defmethod play-impact-sound! projectile ((obj projectile))
"Plays impact sound"
(the-as sound-id 0)
0
(none)
)
(defmethod event-handler! projectile ((obj projectile) (arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
@@ -605,6 +605,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p
(-> arg0 status)
)
;; WARN: Return type mismatch sound-id vs none.
(defmethod play-impact-sound! projectile-bounce ((obj projectile-bounce))
"Plays impact sound"
(let* ((a2-0 (-> obj root-override))
@@ -620,6 +621,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p
(sound-play "dark-shot-bounc")
)
)
(none)
)
(defmethod init-proj-collision! projectile-bounce ((obj projectile-bounce))
goal_src/jak2/engine/gfx/mood/mood-h.gc
+1 -1
View File
@@ -248,7 +248,7 @@ when updating the mood. This means that an individual state structure must be l
(lightning-count0 uint32 :offset-assert 144)
(lightning-count1 uint32 :offset-assert 148)
(lightning-count2 uint32 :offset-assert 152)
(rain-id uint32 :offset-assert 156)
(rain-id sound-id :offset-assert 156)
(sound-pitch float :offset-assert 160)
(fogs mood-fog-table 9 :offset-assert 164)
(colors mood-color-table 3 :offset-assert 200)
goal_src/jak2/engine/gfx/mood/mood.gc
+12 -13
View File
@@ -1276,23 +1276,22 @@ Returns the current value of `lightning-id`"
(gen-lightning-and-thunder! obj)
(cond
((zero? (-> obj rain-id))
(set! (-> obj rain-id) (the-as uint (sound-play-by-name
(static-sound-name "rain-hiss")
(new-sound-id)
(the int (* 1024.0 f30-3))
(the int (* 1524.0 (-> obj sound-pitch)))
0
(sound-group sfx)
#t
)
)
(set! (-> obj rain-id) (sound-play-by-name
(static-sound-name "rain-hiss")
(new-sound-id)
(the int (* 1024.0 f30-3))
(the int (* 1524.0 (-> obj sound-pitch)))
0
(sound-group sfx)
#t
)
)
)
(else
(when *sound-player-enable*
(let ((v1-136 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-136 command) (sound-command set-param))
(set! (-> v1-136 id) (the-as sound-id (-> obj rain-id)))
(set! (-> v1-136 id) (-> obj rain-id))
(set! (-> v1-136 params volume) (the int (* 1024.0 f30-3)))
(set! (-> v1-136 params pitch-mod) (the int (* 1524.0 (-> obj sound-pitch))))
(set! (-> v1-136 params mask) (the-as uint 3))
@@ -1305,8 +1304,8 @@ Returns the current value of `lightning-id`"
(else
(set! (-> obj lightning-flash) 0.0)
(when (nonzero? (-> obj rain-id))
(sound-stop (the-as sound-id (-> obj rain-id)))
(set! (-> obj rain-id) (the-as uint 0))
(sound-stop (-> obj rain-id))
(set! (-> obj rain-id) (new 'static 'sound-id))
0
)
)
goal_src/jak2/engine/load/loader.gc
+3 -3
View File
@@ -1199,7 +1199,7 @@
(or (= arg2 (gui-action none)) (= arg2 (-> s2-0 action)))
(or (not arg0) (string= arg0 (-> s2-0 name)))
)
(return (the-as sound-id (-> s2-0 id)))
(return (-> s2-0 id))
)
(set! s2-0 (the-as gui-connection s1-0))
(-> obj engine)
@@ -1214,7 +1214,7 @@
(or (= arg2 (gui-action none)) (= arg2 (-> s1-1 action)))
(or (not arg0) (string= arg0 (-> s1-1 name)))
)
(return (the-as sound-id (-> s1-1 id)))
(return (-> s1-1 id))
)
)
)
@@ -1714,7 +1714,7 @@
)
(when (< (-> sv-24 priority) arg5)
(set! (-> sv-24 time-stamp) (-> obj update-time))
(return (the-as sound-id (-> sv-24 id)))
(return (-> sv-24 id))
)
(set! sv-16 sv-24)
(goto cfg-44)
goal_src/jak2/engine/target/board/board-h.gc
+5 -5
View File
@@ -76,17 +76,17 @@
(upper-body joint-mod :offset-assert 68)
(sound-bank-knob float :offset-assert 72)
(sound-air-knob float :offset-assert 76)
(wind-sound-id uint32 :offset-assert 80)
(wind-sound-id sound-id :offset-assert 80)
(wind-sound-pitch float :offset-assert 84)
(wind-sound-volume float :offset-assert 88)
(engine-sound-id uint32 :offset-assert 92)
(engine-sound-id sound-id :offset-assert 92)
(engine-sound-pitch float :offset-assert 96)
(engine-sound-volume float :offset-assert 100)
(bank-sound-id uint32 :offset-assert 104)
(bank-sound-id sound-id :offset-assert 104)
(bank-sound-pitch float :offset-assert 108)
(bank-sound-volume float :offset-assert 112)
(ride-sound-id uint32 :offset-assert 116)
(spin-sound-id uint32 :offset-assert 120)
(ride-sound-id sound-id :offset-assert 116)
(spin-sound-id sound-id :offset-assert 120)
(spin-sound-volume float :offset-assert 124)
(spin-sound-pitch float :offset-assert 128)
(unknown-sound-id00 sound-id :offset-assert 132)
goal_src/jak2/engine/target/board/board-states.gc
+5 -5
View File
@@ -155,7 +155,7 @@
(set! (-> self board troty) 0.0)
(set! (-> self board troty-cum) 0.0)
(set! (-> self board unknown-deg00) 0.0)
(set! (-> self board spin-sound-id) (the-as uint 0))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(set! (-> self control mod-surface) *board-spin-mods*)
)
(cond
@@ -178,7 +178,7 @@
(f30-0 (analog-input (the int (* 128.0 (-> gp-0 z))) 0.0 96.0 110.0 1.0))
)
(if (and (zero? (-> self board spin-sound-id)) (< 5461.3335 (fabs (-> self board trotyv))))
(set! (-> self board spin-sound-id) (the-as uint (sound-play "board-spin-loop")))
(set! (-> self board spin-sound-id) (sound-play "board-spin-loop"))
)
(if (and (< (* 0.9 (fabs (-> self board spin-control))) (fabs f28-0))
(>= (* (-> self board spin-control) f28-0) 0.0)
@@ -2265,7 +2265,7 @@
(logclear! (-> self control status) (collide-status probe-hit))
(let ((v1-2 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-2 command) (sound-command set-param))
(set! (-> v1-2 id) (the-as sound-id (-> self board ride-sound-id)))
(set! (-> v1-2 id) (-> self board ride-sound-id))
(set! (-> v1-2 params volume) -4)
(set! (-> v1-2 auto-time) 24)
(set! (-> v1-2 auto-from) 2)
@@ -2335,7 +2335,7 @@
((= (-> self board ride-speed) 0.0)
(let ((v1-43 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-43 command) (sound-command set-param))
(set! (-> v1-43 id) (the-as sound-id (-> self board ride-sound-id)))
(set! (-> v1-43 id) (-> self board ride-sound-id))
(set! (-> v1-43 params volume) -4)
(set! (-> v1-43 auto-time) 24)
(set! (-> v1-43 auto-from) 2)
@@ -2357,7 +2357,7 @@
)
(sound-play-by-name
(static-sound-name "board-rail")
(the-as sound-id (-> self board ride-sound-id))
(-> self board ride-sound-id)
(the int (* 1024.0 f30-1))
(the int (* 1524.0 f0-23))
0
goal_src/jak2/engine/target/board/target-board.gc
+18 -18
View File
@@ -796,11 +796,11 @@
(set! (-> self board) (new 'process 'board-info))
(set! (-> self board process) (the-as (pointer target) (process->ppointer self)))
(set! (-> self board latch?) #f)
(set! (-> self board engine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board ride-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board spin-sound-id) (the-as uint 0))
(set! (-> self board wind-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board bank-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board engine-sound-id) (new-sound-id))
(set! (-> self board ride-sound-id) (new-sound-id))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(set! (-> self board wind-sound-id) (new-sound-id))
(set! (-> self board bank-sound-id) (new-sound-id))
(let* ((v1-10 (-> self game))
(a0-5 (+ (-> v1-10 attack-id) 1))
)
@@ -971,12 +971,12 @@
(target-collide-set! 'normal 0.0)
(set! (-> self control reaction) target-collision-reaction)
(set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1))
(sound-stop (the-as sound-id (-> self board wind-sound-id)))
(sound-stop (the-as sound-id (-> self board engine-sound-id)))
(sound-stop (the-as sound-id (-> self board bank-sound-id)))
(sound-stop (the-as sound-id (-> self board ride-sound-id)))
(sound-stop (the-as sound-id (-> self board spin-sound-id)))
(set! (-> self board spin-sound-id) (the-as uint 0))
(sound-stop (-> self board wind-sound-id))
(sound-stop (-> self board engine-sound-id))
(sound-stop (-> self board bank-sound-id))
(sound-stop (-> self board ride-sound-id))
(sound-stop (-> self board spin-sound-id))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
(set! (-> self control cspace-offset quad) (the-as uint128 0))
(remove-setting! 'sound-flava)
@@ -1270,13 +1270,13 @@
(set! (-> a0-18 volume) (the int (* 1024.0 (-> self board engine-sound-volume))))
(set! (-> a0-18 pitch-mod) (the int (* 1524.0 (-> self board engine-sound-pitch))))
(set! (-> a0-18 reg 0) (the-as uint gp-0))
(t9-12 a0-18 (the-as sound-id (-> self board engine-sound-id)) (the-as vector #t))
(t9-12 a0-18 (-> self board engine-sound-id) (the-as vector #t))
)
(if (< (-> self board bank-sound-volume) 0.1)
(sound-stop (the-as sound-id (-> self board bank-sound-id)))
(sound-stop (-> self board bank-sound-id))
(sound-play-by-name
(static-sound-name "board-bank")
(the-as sound-id (-> self board bank-sound-id))
(-> self board bank-sound-id)
(the int (* 1024.0 (-> self board bank-sound-volume)))
(the int (* 1524.0 (-> self board bank-sound-pitch)))
0
@@ -1290,7 +1290,7 @@
(set! (-> a0-23 volume) (the int (-> self board wind-sound-volume)))
(set! (-> a0-23 pitch-mod) (the int (-> self board wind-sound-pitch)))
(set! (-> a0-23 reg 0) (the-as uint gp-0))
(t9-15 a0-23 (the-as sound-id (-> self board wind-sound-id)) (the-as vector #t))
(t9-15 a0-23 (-> self board wind-sound-id) (the-as vector #t))
)
)
(cond
@@ -1308,7 +1308,7 @@
(when *sound-player-enable*
(let ((v1-89 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-89 command) (sound-command set-param))
(set! (-> v1-89 id) (the-as sound-id (-> self board spin-sound-id)))
(set! (-> v1-89 id) (-> self board spin-sound-id))
(set! (-> v1-89 params volume) (the int (* 1024.0 (-> self board spin-sound-volume))))
(set! (-> v1-89 params mask) (the-as uint 1))
(-> v1-89 id)
@@ -2012,14 +2012,14 @@
)
(let ((v1-131 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-131 command) (sound-command set-param))
(set! (-> v1-131 id) (the-as sound-id (-> self board spin-sound-id)))
(set! (-> v1-131 id) (-> self board spin-sound-id))
(set! (-> v1-131 params volume) -4)
(set! (-> v1-131 auto-time) 120)
(set! (-> v1-131 auto-from) 2)
(set! (-> v1-131 params mask) (the-as uint 17))
(-> v1-131 id)
)
(set! (-> self board spin-sound-id) (the-as uint 0))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(mode-set! (-> self board main) (joint-mod-mode flex-blend))
(mode-set! (-> self board board 0 main) (joint-mod-mode flex-blend))
(let ((s5-3 (new 'stack-no-clear 'vector)))
goal_src/jak2/engine/target/darkjak-h.gc
+1 -1
View File
@@ -19,7 +19,7 @@
(clock-vel float :offset-assert 52)
(clock-on symbol :offset-assert 56)
(hud handle 1 :offset 64)
(tone uint32 :offset 72)
(tone sound-id :offset 72)
(bomb uint32 :offset 76)
)
:method-count-assert 10
goal_src/jak2/engine/target/gun/gun-dark-shot.gc
+27 -32
View File
@@ -89,18 +89,18 @@
)
(deftype gun-dark-shot (projectile)
((blast-radius float :offset-assert 472)
(core-position vector :inline :offset-assert 480)
(core-velocity vector :inline :offset-assert 496)
(spin-vector vector :inline :offset-assert 512)
(track-target handle :offset-assert 528)
(size-t float :offset-assert 536)
(result-array handle 16 :offset-assert 544)
(charge-sound uint32 :offset-assert 672)
(fire-sound uint32 :offset-assert 676)
(trail-sound uint32 :offset-assert 680)
(explode-sound uint32 :offset-assert 684)
(start-pilot? basic :offset-assert 688)
((blast-radius float :offset-assert 472)
(core-position vector :inline :offset-assert 480)
(core-velocity vector :inline :offset-assert 496)
(spin-vector vector :inline :offset-assert 512)
(track-target handle :offset-assert 528)
(size-t float :offset-assert 536)
(result-array handle 16 :offset-assert 544)
(charge-sound sound-id :offset-assert 672)
(fire-sound sound-id :offset-assert 676)
(trail-sound sound-id :offset-assert 680)
(explode-sound sound-id :offset-assert 684)
(start-pilot? basic :offset-assert 688)
)
:heap-base #x240
:method-count-assert 42
@@ -149,13 +149,13 @@
(set! (-> obj part) (create-launch-control (-> *part-group-id-table* 72) obj))
(set! (-> obj blast-radius) 40960.0)
(set! (-> obj size-t) 0.0)
(set! (-> obj charge-sound) (the-as uint (new-sound-id)))
(set! (-> obj fire-sound) (the-as uint (new-sound-id)))
(set! (-> obj trail-sound) (the-as uint (new-sound-id)))
(set! (-> obj charge-sound) (new-sound-id))
(set! (-> obj fire-sound) (new-sound-id))
(set! (-> obj trail-sound) (new-sound-id))
(set! (-> obj explode-sound)
(the-as uint (add-process *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0))
(add-process *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0)
)
(set-falloff! *gui-control* (the-as sound-id (-> obj explode-sound)) #t 50 150 11)
(set-falloff! *gui-control* (-> obj explode-sound) #t 50 150 11)
(set! (-> obj start-pilot?) (the-as basic (and *target* (focus-test? *target* pilot))))
((method-of-type projectile init-proj-settings!) obj)
0
@@ -198,7 +198,7 @@
(set! (-> self size-t) 1.0)
(let ((v1-6 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-6 command) (sound-command set-param))
(set! (-> v1-6 id) (the-as sound-id (-> self charge-sound)))
(set! (-> v1-6 id) (-> self charge-sound))
(set! (-> v1-6 params volume) -4)
(set! (-> v1-6 auto-time) 24)
(set! (-> v1-6 auto-from) 2)
@@ -249,11 +249,7 @@
(none)
)
:post (behavior ()
(sound-play
"pmkr-charge"
:id (the-as sound-id (-> self charge-sound))
:position (-> self root-override trans)
)
(sound-play "pmkr-charge" :id (-> self charge-sound) :position (-> self root-override trans))
(spawn-impact-particles self)
(none)
)
@@ -411,8 +407,8 @@
(if (logtest? (-> self root-override status) (collide-status touch-surface))
(go-virtual impact)
)
(sound-play "pmkr-fire" :id (the-as sound-id (-> self fire-sound)) :position (-> self root-override trans))
(sound-play "pmkr-trail" :id (the-as sound-id (-> self trail-sound)) :position (-> self root-override trans))
(sound-play "pmkr-fire" :id (-> self fire-sound) :position (-> self root-override trans))
(sound-play "pmkr-trail" :id (-> self trail-sound) :position (-> self root-override trans))
(none)
)
)
@@ -625,14 +621,14 @@
(if (< (- (current-time) (-> self spawn-time)) (seconds 0.1))
(send-event (ppointer->process (-> self parent)) 'release)
)
(sound-stop (the-as sound-id (-> self trail-sound)))
(let ((v1-10 (get-status *gui-control* (the-as sound-id (-> self explode-sound)))))
(sound-stop (-> self trail-sound))
(let ((v1-10 (get-status *gui-control* (-> self explode-sound))))
(cond
((= v1-10 (gui-status ready))
(set-action!
*gui-control*
(gui-action play)
(the-as sound-id (-> self explode-sound))
(-> self explode-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
@@ -644,7 +640,7 @@
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id (-> self explode-sound))
(-> self explode-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
@@ -871,9 +867,8 @@
)
)
(let ((gp-3 (current-time)))
(while (or (-> self child) (and (nonzero? (get-status *gui-control* (the-as sound-id (-> self explode-sound))))
(< (- (current-time) gp-3) (seconds 10))
)
(while (or (-> self child)
(and (nonzero? (get-status *gui-control* (-> self explode-sound))) (< (- (current-time) gp-3) (seconds 10)))
)
(suspend)
)
goal_src/jak2/engine/target/gun/gun-h.gc
+1 -1
View File
@@ -101,7 +101,7 @@
(track-trans vector :inline :offset-assert 480)
(track-dir vector :inline :offset-assert 496)
(turn-fast-hold-time time-frame :offset-assert 512)
(blue-whine-sound-id uint32 :offset-assert 520)
(blue-whine-sound-id sound-id :offset-assert 520)
(blue-whine-volume float :offset-assert 524)
(top-anim-twist vector :inline :offset-assert 528)
(top-anim-twist-targ vector :inline :offset-assert 544)
goal_src/jak2/engine/target/logic-target.gc
+1 -1
View File
@@ -3323,7 +3323,7 @@
(defmethod deactivate target ((obj target))
(kill-persister *setting-control* (the-as engine-pers 'bg-a-speed) 'bg-a-speed)
(if (nonzero? (-> obj darkjak))
(sound-stop (the-as sound-id (-> obj darkjak tone)))
(sound-stop (-> obj darkjak tone))
)
(set! (-> *setting-control* cam-default mode-name) #f)
(set-zero! *camera-smush-control*)
goal_src/jak2/engine/target/mech_suit/mech-h.gc
+4 -4
View File
@@ -13,12 +13,12 @@
(mech-trans vector :inline :offset-assert 16)
(mech-quat vector :inline :offset-assert 32)
(mech-scale vector :inline :offset-assert 48)
(engine-sound-id uint32 :offset-assert 64)
(engine-sound-id sound-id :offset-assert 64)
(engine-sound-volume float :offset-assert 68)
(engine-sound-pitch float :offset-assert 72)
(thrust-sound-id uint32 :offset-assert 76)
(drag-sound-id uint32 :offset-assert 80)
(whine-sound-id uint32 :offset-assert 84)
(thrust-sound-id sound-id :offset-assert 76)
(drag-sound-id sound-id :offset-assert 80)
(whine-sound-id sound-id :offset-assert 84)
(mech-start-time time-frame :offset-assert 88)
(mech-time time-frame :offset-assert 96)
(no-get-off-time time-frame :offset-assert 104)
goal_src/jak2/engine/target/mech_suit/mech-states.gc
+56 -56
View File
@@ -947,7 +947,7 @@
:enter (behavior ((arg0 symbol))
(let ((v1-0 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-0 command) (sound-command set-param))
(set! (-> v1-0 id) (the-as sound-id (-> self mech thrust-sound-id)))
(set! (-> v1-0 id) (-> self mech thrust-sound-id))
(set! (-> v1-0 params volume) -4)
(set! (-> v1-0 auto-time) 48)
(set! (-> v1-0 auto-from) 2)
@@ -1920,22 +1920,22 @@
)
(go target-mech-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-24 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-3 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-24 a1-3)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
)
)
(if (and (cpad-pressed? (-> self control cpad number) circle square) (can-hands? #t))
(go target-mech-carry-throw)
)
@@ -2018,22 +2018,22 @@
)
(go target-mech-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-24 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-2 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-24 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
)
)
(if (and (cpad-pressed? (-> self control cpad number) circle square) (can-hands? #t))
(go target-mech-carry-throw)
)
@@ -2135,7 +2135,7 @@
(set! (-> self mech thruster-flame-length) 0.0)
(let ((v1-3 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-3 command) (sound-command set-param))
(set! (-> v1-3 id) (the-as sound-id (-> self mech thrust-sound-id)))
(set! (-> v1-3 id) (-> self mech thrust-sound-id))
(set! (-> v1-3 params volume) -4)
(set! (-> v1-3 auto-time) 48)
(set! (-> v1-3 auto-from) 2)
@@ -2144,7 +2144,7 @@
)
(let ((v1-5 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-5 command) (sound-command set-param))
(set! (-> v1-5 id) (the-as sound-id (-> self mech drag-sound-id)))
(set! (-> v1-5 id) (-> self mech drag-sound-id))
(set! (-> v1-5 params volume) -4)
(set! (-> v1-5 auto-time) 48)
(set! (-> v1-5 auto-from) 2)
@@ -2286,7 +2286,7 @@
)
(sound-play-by-name
(static-sound-name "mech-drag-grind")
(the-as sound-id (-> self mech drag-sound-id))
(-> self mech drag-sound-id)
(the int (* 1024.0 f30-0))
0
0
@@ -2385,7 +2385,7 @@
:enter (behavior ((arg0 symbol))
(let ((v1-0 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-0 command) (sound-command set-param))
(set! (-> v1-0 id) (the-as sound-id (-> self mech thrust-sound-id)))
(set! (-> v1-0 id) (-> self mech thrust-sound-id))
(set! (-> v1-0 params volume) -4)
(set! (-> v1-0 auto-time) 48)
(set! (-> v1-0 auto-from) 2)
@@ -2422,22 +2422,22 @@
(none)
)
:trans (behavior ()
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-16 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-2 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-16 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
)
)
(if (and (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0)
(let ((v1-26 (ja-group)))
(and (and v1-26 (= v1-26 (-> self draw art-group data 342))) (>= (ja-aframe-num 0) 30.0))
@@ -2458,7 +2458,7 @@
(defstate target-mech-carry-jump (target)
:event (-> target-mech-carry-falling event)
:enter (behavior ((arg0 float) (arg1 float))
:enter (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(set! (-> self state-time) (current-time))
(init-var-jump arg0 arg1 #t #f (-> self control transv) 2.0)
(logclear! (-> self control status) (collide-status on-surface on-ground touch-surface))
@@ -2500,7 +2500,7 @@
)
(none)
)
:code (behavior ((arg0 float) (arg1 float))
:code (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(ja-channel-push! 1 (seconds 0.05))
(ja :group! (-> self draw art-group data 340) :num! min)
(suspend)
@@ -2784,10 +2784,10 @@
(logior! (-> self state-flags) (state-flags sf2))
(logior! (-> self focus-status) (focus-status grabbed))
(set! (-> self mech stick-off) (the-as basic #t))
(sound-stop (the-as sound-id (-> self mech engine-sound-id)))
(sound-stop (the-as sound-id (-> self mech thrust-sound-id)))
(sound-stop (the-as sound-id (-> self mech drag-sound-id)))
(sound-stop (the-as sound-id (-> self mech whine-sound-id)))
(sound-stop (-> self mech engine-sound-id))
(sound-stop (-> self mech thrust-sound-id))
(sound-stop (-> self mech drag-sound-id))
(sound-stop (-> self mech whine-sound-id))
(none)
)
:exit (behavior ()
goal_src/jak2/engine/target/mech_suit/target-mech.gc
+17 -46
View File
@@ -5,31 +5,6 @@
;; name in dgo: target-mech
;; dgos: DRILLMTN, UNB, RUI
(define-extern target-mech-stance (state target))
(define-extern target-mech-walk (state target))
(define-extern target-mech-punch-pick (function symbol int :behavior target))
(define-extern target-mech-punch (state target))
(define-extern target-mech-falling (state symbol target))
(define-extern target-mech-jump (state float float surface target))
(define-extern target-mech-hit-ground (state symbol target))
(define-extern target-mech-hit (state symbol attack-info target))
(define-extern target-mech-death (state symbol target))
(define-extern target-mech-carry-update (function none :behavior target))
(define-extern target-mech-carry-post (function none :behavior target))
(define-extern target-mech-carry-pickup (state target))
(define-extern target-mech-carry-drop (state target))
(define-extern target-mech-carry-stance (state target))
(define-extern target-mech-carry-walk (state target))
(define-extern target-mech-carry-drag (state target))
(define-extern target-mech-carry-falling (state target))
(define-extern target-mech-carry-hit-ground (state symbol target))
(define-extern target-mech-carry-jump (state float float target))
(define-extern target-mech-carry-throw (state target))
(define-extern target-mech-get-on (state handle target))
(define-extern target-mech-get-off (state target))
(define-extern target-mech-grab (state target))
(define-extern target-mech-clone-anim (state handle target))
;; DECOMP BEGINS
(defmethod draw hud-heatmeter ((obj hud-heatmeter))
@@ -386,7 +361,7 @@
)
(sound-play-by-name
(static-sound-name "mech-thrust")
(the-as sound-id (-> arg0 mech thrust-sound-id))
(-> arg0 mech thrust-sound-id)
(the int (* 1024.0 (lerp-scale 0.3 1.0 (-> arg0 mech thruster-flame-length) 0.0 4096.0)))
(the int (* 1524.0 f30-0))
0
@@ -832,16 +807,13 @@
)
(set! (-> self control last-trans-any-surf quad) (-> self control trans quad))
(target-timed-invulnerable (seconds 0.1) self 1)
(cond
((focus-test? self carry)
enter-state
(let ((a0-19 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-8 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-19 a1-8)
)
)
(else
(if (focus-test? self carry)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
(go
target-mech-jump
(-> *TARGET-bank* mech-jump-height-min)
@@ -849,7 +821,6 @@
(the-as surface #f)
)
)
)
)
#f
)
@@ -1113,10 +1084,10 @@
(when (zero? (-> self mech))
(set! (-> self mech) (new 'process 'mech-info))
(set! (-> self mech hud 0) (the-as handle #f))
(set! (-> self mech engine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech thrust-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech drag-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech whine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech engine-sound-id) (new-sound-id))
(set! (-> self mech thrust-sound-id) (new-sound-id))
(set! (-> self mech drag-sound-id) (new-sound-id))
(set! (-> self mech whine-sound-id) (new-sound-id))
)
(set! (-> self board latch?) #f)
(set! (-> self mech stick-lock) #f)
@@ -1363,10 +1334,10 @@
(target-collide-set! 'normal 0.0)
(set! (-> self control reaction) target-collision-reaction)
(set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1))
(sound-stop (the-as sound-id (-> self mech engine-sound-id)))
(sound-stop (the-as sound-id (-> self mech thrust-sound-id)))
(sound-stop (the-as sound-id (-> self mech drag-sound-id)))
(sound-stop (the-as sound-id (-> self mech whine-sound-id)))
(sound-stop (-> self mech engine-sound-id))
(sound-stop (-> self mech thrust-sound-id))
(sound-stop (-> self mech drag-sound-id))
(sound-stop (-> self mech whine-sound-id))
(send-event (handle->process (-> self mech hud 0)) 'hide-and-die)
(set! (-> self draw shadow) (-> self shadow-backup))
(set! (-> self control cspace-offset quad) (the-as uint128 0))
@@ -1377,7 +1348,7 @@
)
(defbehavior target-mech-effect target ()
(sound-play "mech-pulse" :id (the-as sound-id (-> self mech engine-sound-id)))
(sound-play "mech-pulse" :id (-> self mech engine-sound-id))
(set! (-> self game distance) (/ (-> self mech shield-value) (-> self mech shield-max)))
0
(none)
goal_src/jak2/engine/target/target-carry.gc
+32 -47
View File
@@ -440,22 +440,17 @@
(if (cpad-pressed? (-> self control cpad number) r1)
(go target-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-17 (-> *TARGET-bank* carry-jump-height-min))
(a1-2 (-> *TARGET-bank* carry-jump-height-max))
)
(go target-carry-jump a0-17 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go target-carry-jump (-> *TARGET-bank* carry-jump-height-min) (-> *TARGET-bank* carry-jump-height-max) #f)
)
)
(if (and (cpad-pressed? (-> self control cpad number) square) (can-hands? #t))
(go target-carry-throw)
)
@@ -502,22 +497,17 @@
(if (cpad-pressed? (-> self control cpad number) r1)
(go target-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-17 (-> *TARGET-bank* carry-jump-height-min))
(a1-2 (-> *TARGET-bank* carry-jump-height-max))
)
(go target-carry-jump a0-17 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go target-carry-jump (-> *TARGET-bank* carry-jump-height-min) (-> *TARGET-bank* carry-jump-height-max) #f)
)
)
(if (and (cpad-pressed? (-> self control cpad number) square) (can-hands? #t))
(go target-carry-throw)
)
@@ -635,22 +625,17 @@
(none)
)
:trans (behavior ()
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-16 (-> *TARGET-bank* carry-jump-height-min))
(a1-2 (-> *TARGET-bank* carry-jump-height-max))
)
(go target-carry-jump a0-16 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go target-carry-jump (-> *TARGET-bank* carry-jump-height-min) (-> *TARGET-bank* carry-jump-height-max) #f)
)
)
(if (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0)
(go target-carry-walk)
)
@@ -667,7 +652,7 @@
(defstate target-carry-jump (target)
:event target-jump-event-handler
:enter (behavior ((arg0 float) (arg1 float))
:enter (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(set! (-> self state-time) (current-time))
(sound-play "jump" :vol 70)
(init-var-jump arg0 arg1 #t #f (-> self control transv) 2.0)
@@ -702,7 +687,7 @@
)
(none)
)
:code (behavior ((arg0 float) (arg1 float))
:code (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(ja-channel-push! 1 (seconds 0.05))
(ja :group! (-> self draw art-group data 321) :num! min)
(suspend)
goal_src/jak2/engine/target/target-darkjak.gc
+2 -2
View File
@@ -22,7 +22,7 @@
(set! (-> self darkjak attack-id) a0-5)
)
(set! (-> self darkjak hud 0) (the-as handle #f))
(set! (-> self darkjak tone) (the-as uint (new-sound-id)))
(set! (-> self darkjak tone) (new-sound-id))
(set! (-> self darkjak-giant-interp) 1.0)
)
0
@@ -90,7 +90,7 @@
(remove-setting! 'string-spline-accel)
(remove-setting! 'string-spline-max-move-player)
(remove-setting! 'string-spline-accel-player)
(sound-stop (the-as sound-id (-> self darkjak tone)))
(sound-stop (-> self darkjak tone))
)
0
(none)
goal_src/jak2/engine/target/target-death.gc
+1 -2
View File
@@ -344,8 +344,7 @@
)
)
((logtest? (continue-flags indax) (-> arg0 flags))
enter-state
(go target-indax-start)
(go target-indax-start (the-as handle #f))
)
((logtest? (continue-flags record-path) (-> arg0 flags))
)
goal_src/jak2/engine/target/target-gun.gc
+4 -4
View File
@@ -226,7 +226,7 @@
(set! (-> self control unknown-float003) 0.0)
(set! (-> self gun blue-whine-volume) 0.0)
(if (zero? (-> self gun blue-whine-sound-id))
(set! (-> self gun blue-whine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self gun blue-whine-sound-id) (new-sound-id))
)
(set-setting! 'mode-sound-bank 'gun 0.0 0)
(sound-play "gun-takeout")
@@ -369,7 +369,7 @@
(send-event *camera* 'yes-follow)
(let ((v1-16 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-16 command) (sound-command set-param))
(set! (-> v1-16 id) (the-as sound-id (-> self gun blue-whine-sound-id)))
(set! (-> v1-16 id) (-> self gun blue-whine-sound-id))
(set! (-> v1-16 params volume) -4)
(set! (-> v1-16 auto-time) 120)
(set! (-> v1-16 auto-from) 2)
@@ -2752,7 +2752,7 @@
(set! (-> gp-0 blue-whine-volume) (* 0.000004577637 (-> gp-0 fire-spinv)))
(sound-play-by-name
(static-sound-name "blue-gun-whine")
(the-as sound-id (-> gp-0 blue-whine-sound-id))
(-> gp-0 blue-whine-sound-id)
(the int (* 1024.0 (fmin 1.0 (* 2.0 (-> gp-0 blue-whine-volume)))))
(the int (* 1524.0 (lerp-scale -0.9 0.5 (-> gp-0 blue-whine-volume) 0.0 1.0)))
0
@@ -2764,7 +2764,7 @@
(when (!= (-> gp-0 blue-whine-volume) 0.0)
(let ((v1-245 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-245 command) (sound-command set-param))
(set! (-> v1-245 id) (the-as sound-id (-> gp-0 blue-whine-sound-id)))
(set! (-> v1-245 id) (-> gp-0 blue-whine-sound-id))
(set! (-> v1-245 params volume) -4)
(set! (-> v1-245 auto-time) 120)
(set! (-> v1-245 auto-from) 2)
goal_src/jak2/engine/target/target-h.gc
+3 -3
View File
@@ -284,7 +284,7 @@
target-carry-drop
target-carry-falling
(target-carry-hit-ground symbol)
(target-carry-jump float float)
(target-carry-jump float float symbol)
target-carry-pickup
target-carry-stance
target-carry-throw
@@ -332,7 +332,7 @@
(target-indax-jump float float surface)
target-indax-running-attack
target-indax-stance
target-indax-start
(target-indax-start handle)
target-indax-trip
target-indax-walk
(target-jump float float surface)
@@ -344,7 +344,7 @@
target-mech-carry-drop
target-mech-carry-falling
(target-mech-carry-hit-ground symbol)
(target-mech-carry-jump float float)
(target-mech-carry-jump float float symbol)
target-mech-carry-pickup
target-mech-carry-stance
target-mech-carry-throw
goal_src/jak2/engine/target/target-handler.gc
+3 -10
View File
@@ -274,13 +274,8 @@
(set! (-> self control send-attack-dest) (process->handle arg0))
(set! (-> self control send-attack-time) (current-time))
(send-event self 'hit arg1 arg0 arg2)
;; TODO - manual fix?
(set! arg0 (the process (and (and (logtest? (focus-status dark) (-> self focus-status))
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) 2)
)
arg0
) )
(set! arg0
(the process (and (and (focus-test? self dark) (nonzero? (-> self darkjak)) (logtest? (-> self darkjak stage) 2)) arg0))
)
(when (the-as object arg0)
(when (and s4-0 (not s3-1) (-> self control danger-mode) (not (logtest? (-> s4-0 mask) (process-mask dark-effect))))
@@ -1233,9 +1228,7 @@
)
)
((= v1-45 'indax)
enter-state
(process->handle (the-as process (-> arg3 param 1)))
(go target-indax-start)
(go target-indax-start (process->handle (the-as process (-> arg3 param 1))))
)
((= v1-45 'gun)
(if (logtest? (-> self game features) (game-feature gun))
goal_src/jak2/levels/atoll/atoll-obs.gc
+6 -6
View File
@@ -15,7 +15,7 @@
(sound-time time-frame 2 :offset-assert 240)
(sync sync-eased :inline :offset-assert 256)
(piston-id int32 :offset-assert 300)
(looping-id uint32 :offset-assert 304)
(looping-id sound-id :offset-assert 304)
)
:heap-base #xc0
:method-count-assert 31
@@ -111,8 +111,8 @@
)
)
(when (and (logtest? (actor-option user18) (-> self fact options)) (< (-> self sound-time 0) (current-time)))
(sound-stop (the-as sound-id (-> self looping-id)))
(sound-play "piston-loop" :id (the-as sound-id (-> self looping-id)) :position (-> self sound-trans))
(sound-stop (-> self looping-id))
(sound-play "piston-loop" :id (-> self looping-id) :position (-> self sound-trans))
(+! (-> self sound-time 0) (the int (* 0.5 (the float (-> self sync period)))))
)
(rider-post)
@@ -121,7 +121,7 @@
)
(defmethod deactivate piston ((obj piston))
(sound-stop (the-as sound-id (-> obj looping-id)))
(sound-stop (-> obj looping-id))
((method-of-type process-focusable deactivate) obj)
(none)
)
@@ -203,10 +203,10 @@ This commonly includes things such as:
(set! (-> obj root-override trans y) (+ -40960.0 (-> obj root-override trans y)))
(cond
((logtest? (actor-option user18) (-> obj fact options))
(set! (-> obj looping-id) (the-as uint (new-sound-id)))
(set! (-> obj looping-id) (new-sound-id))
)
(else
(set! (-> obj looping-id) (the-as uint 0))
(set! (-> obj looping-id) (new 'static 'sound-id))
0
)
)
goal_src/jak2/levels/castle/boss/castle-baron.gc
+4 -4
View File
@@ -212,7 +212,7 @@ For example for an elevator pre-compute the distance between the first and last
(wiggle-angle degrees :offset-assert 640)
(delta-wiggle-angle degrees :offset-assert 644)
(wiggle-factor float :offset-assert 648)
(id uint32 :offset-assert 652)
(id sound-id :offset-assert 652)
)
:heap-base #x210
:method-count-assert 181
@@ -889,7 +889,7 @@ For example for an elevator pre-compute the distance between the first and last
(none)
)
:exit (behavior ()
(set! (-> self id) (the-as uint (sound-play "krew-travel")))
(set! (-> self id) (sound-play "krew-travel"))
(none)
)
:trans (behavior ()
@@ -1180,7 +1180,7 @@ For example for an elevator pre-compute the distance between the first and last
)
:enter (behavior ()
(if (nonzero? (-> self id))
(sound-stop (the-as sound-id (-> self id)))
(sound-stop (-> self id))
)
(when (< 25 (rand-vu-int-range 0 50))
(let ((gp-1 (-> self root-override2))
@@ -1385,7 +1385,7 @@ For example for an elevator pre-compute the distance between the first and last
(set! (-> obj wiggle-angle) 0.0)
(set! (-> obj delta-wiggle-angle) 182.04445)
(set! (-> obj wiggle-factor) 2.0)
(set! (-> obj id) (the-as uint 0))
(set! (-> obj id) (new 'static 'sound-id))
(logclear! (-> obj mask) (process-mask actor-pause))
(go (method-of-object obj spawning))
(none)
goal_src/jak2/levels/city/common/ctyport-obs.gc
+8 -8
View File
@@ -634,8 +634,8 @@
)
(deftype barge (boat-base)
((engine uint32 :offset-assert 896)
(bow-wash uint32 :offset-assert 900)
((engine sound-id :offset-assert 896)
(bow-wash sound-id :offset-assert 900)
)
:heap-base #x310
:method-count-assert 149
@@ -673,11 +673,11 @@
(cond
((< (vector-vector-distance s5-0 (camera-pos)) 614400.0)
(let ((a0-6 (static-sound-spec "barge-engine")))
(sound-play-by-spec a0-6 (the-as sound-id (-> obj engine)) s5-0)
(sound-play-by-spec a0-6 (-> obj engine) s5-0)
)
)
(else
(sound-stop (the-as sound-id (-> obj engine)))
(sound-stop (-> obj engine))
)
)
)
@@ -698,11 +698,11 @@
(cond
((< (vector-vector-distance s5-1 (camera-pos)) 614400.0)
(let ((a0-12 (static-sound-spec "bow-wash")))
(sound-play-by-spec a0-12 (the-as sound-id (-> obj bow-wash)) s5-1)
(sound-play-by-spec a0-12 (-> obj bow-wash) s5-1)
)
)
(else
(sound-stop (the-as sound-id (-> obj bow-wash)))
(sound-stop (-> obj bow-wash))
)
)
)
@@ -838,8 +838,8 @@
)
(alloc-and-init-rigid-body-control obj *barge-constants*)
(set! (-> obj draw lod-set lod 0 dist) 1228800.0)
(set! (-> obj engine) (the-as uint (new-sound-id)))
(set! (-> obj bow-wash) (the-as uint (new-sound-id)))
(set! (-> obj engine) (new-sound-id))
(set! (-> obj bow-wash) (new-sound-id))
(iterate-prims
(-> obj root-override-2)
(lambda ((arg0 collide-shape-prim))
goal_src/jak2/levels/city/common/ctywide-obs.gc
+22 -23
View File
@@ -2469,12 +2469,12 @@ This commonly includes things such as:
)
(deftype propa (process-focusable)
((sound-id uint32 :offset-assert 204)
(sound-index uint32 :offset-assert 208)
(handle handle :offset-assert 216)
(y-rot float :offset-assert 224)
(hit-points int32 :offset-assert 228)
(incoming-attack-id uint32 :offset-assert 232)
((sound-id sound-id :offset-assert 204)
(sound-index uint32 :offset-assert 208)
(handle handle :offset-assert 216)
(y-rot float :offset-assert 224)
(hit-points int32 :offset-assert 228)
(incoming-attack-id uint32 :offset-assert 232)
)
:heap-base #x70
:method-count-assert 32
@@ -2717,8 +2717,8 @@ This commonly includes things such as:
)
:exit (behavior ()
(when (nonzero? (-> self sound-id))
(sound-stop (the-as sound-id (-> self sound-id)))
(set! (-> self sound-id) (the-as uint 0))
(sound-stop (-> self sound-id))
(set! (-> self sound-id) (new 'static 'sound-id))
0
)
(none)
@@ -2733,14 +2733,14 @@ This commonly includes things such as:
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id (-> self sound-id))
(-> self sound-id)
(gui-channel none)
(gui-action none)
(the-as string #f)
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(set! (-> self sound-id) (the-as uint 0))
(set! (-> self sound-id) (new 'static 'sound-id))
(+! (-> self sound-index) 1)
(when (>= (-> self sound-index) (the-as uint (-> *propa-sounds* length)))
(set! (-> self sound-index) (the-as uint 0))
@@ -2751,16 +2751,15 @@ This commonly includes things such as:
((< (vector-vector-distance (camera-pos) (-> self root-override trans)) 225280.0)
(cond
((zero? (-> self sound-id))
(set! (-> self sound-id) (the-as uint (add-process
*gui-control*
self
(gui-channel alert)
(gui-action play)
(-> *propa-sounds* (-> self sound-index))
-99.0
0
)
)
(set! (-> self sound-id) (add-process
*gui-control*
self
(gui-channel alert)
(gui-action play)
(-> *propa-sounds* (-> self sound-index))
-99.0
0
)
)
(let ((a1-4 (new 'stack-no-clear 'vector)))
(set! (-> a1-4 quad) (-> self root-override trans quad))
@@ -2772,7 +2771,7 @@ This commonly includes things such as:
(when *sound-player-enable*
(let ((gp-2 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> gp-2 command) (sound-command set-param))
(set! (-> gp-2 id) (the-as sound-id (-> self sound-id)))
(set! (-> gp-2 id) (-> self sound-id))
(set! (-> gp-2 params fo-min) 40)
(set! (-> gp-2 params fo-max) 55)
(set! (-> gp-2 params fo-curve) 2)
@@ -2791,8 +2790,8 @@ This commonly includes things such as:
(-> gp-2 id)
)
)
(when (= (get-status *gui-control* (the-as sound-id (-> self sound-id))) (gui-status unknown))
(set! (-> self sound-id) (the-as uint 0))
(when (= (get-status *gui-control* (-> self sound-id)) (gui-status unknown))
(set! (-> self sound-id) (new 'static 'sound-id))
(+! (-> self sound-index) 1)
(when (>= (-> self sound-index) (the-as uint (-> *propa-sounds* length)))
(set! (-> self sound-index) (the-as uint 0))
goal_src/jak2/levels/city/common/ctywide-tasks.gc
+10 -10
View File
@@ -178,7 +178,7 @@
(lambda :behavior task-manager
()
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 38) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 38) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-1 (current-time)))
@@ -190,7 +190,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 39) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 39) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(go-virtual complete)
@@ -206,7 +206,7 @@
()
(when (and (= (-> self sub-state) 1) (not (and *target* (focus-test? *target* pilot))))
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 46) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 46) *entity-pool* (target-pos 0) (the-as region #f))
)
(go-virtual fail)
)
@@ -231,7 +231,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 31) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 31) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-1 (current-time)))
@@ -243,7 +243,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-3 (current-time)))
@@ -255,7 +255,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f))
)
(while (let ((v1-34 (handle->process (-> self slave 0))))
(not (logtest? (rigid-body-object-flag flight-level-transition) (-> (the-as vehicle v1-34) flags)))
@@ -267,7 +267,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(set! (-> self sub-state) (the-as uint 2))
@@ -345,7 +345,7 @@
)
(set! (-> self sub-state) (the-as uint 1))
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-1 (current-time)))
@@ -354,7 +354,7 @@
)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f))
)
(while (let ((v1-15 (handle->process (-> *target* pilot vehicle))))
(not (logtest? (rigid-body-object-flag flight-level-transition) (-> (the-as vehicle v1-15) flags)))
@@ -363,7 +363,7 @@
)
(wait-for-speech-end (-> self sound-id 0))
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-4 (current-time)))
goal_src/jak2/levels/city/common/guard.gc
+4 -4
View File
@@ -282,7 +282,7 @@
(target-self-xz-dist float :offset-assert 1220)
(target-y-angle degrees :offset-assert 1224)
(last-visible-target-pos vector :inline :offset-assert 1232)
(lazer-sound uint32 :offset-assert 1248)
(lazer-sound sound-id :offset-assert 1248)
(move-position vector :inline :offset-assert 1264)
(move-index int32 :offset-assert 1280)
(traffic-target-status traffic-target-status :inline :offset-assert 1296)
@@ -3175,13 +3175,13 @@
0
(set! (-> self miss-amount) 0.0)
(set! (-> self state-time) (current-time))
(set! (-> self lazer-sound) (the-as uint 0))
(set! (-> self lazer-sound) (new 'static 'sound-id))
0
(none)
)
:exit (behavior ()
(if (nonzero? (-> self lazer-sound))
(sound-stop (the-as sound-id (-> self lazer-sound)))
(sound-stop (-> self lazer-sound))
)
(iterate-prims
(-> self root-override2)
@@ -3353,7 +3353,7 @@
(set! (-> v1-156 attack-id) a0-52)
(set! (-> self attack-id) a0-52)
)
(set! (-> self lazer-sound) (the-as uint (sound-play "guard-zap")))
(set! (-> self lazer-sound) (sound-play "guard-zap"))
(let ((v1-158 (-> self l-control))
(a0-56 1)
)
goal_src/jak2/levels/city/common/transport.gc
+5 -5
View File
@@ -208,7 +208,7 @@
(max-guard uint32 :offset-assert 240)
(count-guard uint32 :offset-assert 244)
(max-time float :offset-assert 248)
(ambient-sound-id uint32 :offset-assert 252)
(ambient-sound-id sound-id :offset-assert 252)
(turret handle :offset-assert 256)
)
:heap-base #x90
@@ -269,14 +269,14 @@
)
(set! (-> a0-3 volume) (the int (* 1024.0 f0-4)))
(set! (-> a0-3 pitch-mod) (the int (* 1524.0 f30-0)))
(sound-play-by-spec a0-3 (the-as sound-id (-> obj ambient-sound-id)) (-> obj root-override trans))
(sound-play-by-spec a0-3 (-> obj ambient-sound-id) (-> obj root-override trans))
)
0
(none)
)
(defmethod deactivate transport ((obj transport))
(sound-stop (the-as sound-id (-> obj ambient-sound-id)))
(sound-stop (-> obj ambient-sound-id))
((the-as (function process-drawable none) (find-parent-method transport 10)) obj)
(none)
)
@@ -386,7 +386,7 @@
(defstate die-fast (transport)
:virtual #t
:code (behavior ()
(sound-stop (the-as sound-id (-> self ambient-sound-id)))
(sound-stop (-> self ambient-sound-id))
(cleanup-for-death self)
(none)
)
@@ -550,7 +550,7 @@
)
(set! (-> self turret) (the-as handle #f))
)
(set! (-> self ambient-sound-id) (the-as uint (new-sound-id)))
(set! (-> self ambient-sound-id) (new-sound-id))
(go-virtual come-down)
(none)
)
goal_src/jak2/levels/city/onin_tent/onin-game.gc
+6 -9
View File
@@ -2067,7 +2067,7 @@
(hide () _type_ :state 20)
(wait-for-start () _type_ :state 21)
(active (symbol) _type_ :state 22)
(lose () _type_ :state 23)
(lose (symbol) _type_ :state 23)
(win () _type_ :state 24)
(onin-game-method-25 (_type_) none 25)
(onin-game-method-26 (_type_) none 26)
@@ -2360,8 +2360,7 @@
)
)
(('retry)
enter-state
(go-virtual lose)
(go-virtual lose #f)
)
)
)
@@ -2517,9 +2516,7 @@
(go-virtual win)
)
((or (and *cheat-mode* (cpad-pressed? 0 l1)) (>= (-> self miss-count) (-> self miss-max)))
enter-state
#t
(go-virtual lose)
(go-virtual lose #t)
)
((and *cheat-mode* (cpad-pressed? 0 up))
(sound-play-by-spec (static-sound-spec "beep" :fo-curve 1) (new-sound-id) (the-as vector #t))
@@ -2576,7 +2573,7 @@
(defstate lose (onin-game)
:virtual #t
:exit (-> (method-of-type onin-game active) exit)
:code (behavior ()
:code (behavior ((arg0 symbol))
(let ((gp-0 (-> self child)))
(while gp-0
(if (type? (ppointer->process gp-0) onin-game-bubble)
@@ -2621,7 +2618,7 @@
)
)
)
(while (nonzero? (get-status *gui-control* (the-as sound-id s5-1)))
(while (nonzero? (get-status *gui-control* s5-1))
(suspend)
)
)
@@ -2680,7 +2677,7 @@
(if (not (handle->process gp-4))
(auto-save-user)
)
(while (nonzero? (get-status *gui-control* (the-as sound-id s5-1)))
(while (nonzero? (get-status *gui-control* s5-1))
(suspend)
)
(let ((s5-3 (current-time)))
goal_src/jak2/levels/common/enemy/bombots/bombbot.gc
+20 -20
View File
@@ -542,9 +542,9 @@
(info rigid-body-object-constants :offset-assert 1396)
(explosing symbol :offset-assert 1400)
(minimap connection-minimap :offset-assert 1404)
(lazer-sound uint32 :offset-assert 1408)
(head-sound uint32 :offset-assert 1412)
(cannon-sound uint32 :offset-assert 1416)
(lazer-sound sound-id :offset-assert 1408)
(head-sound sound-id :offset-assert 1412)
(cannon-sound sound-id :offset-assert 1416)
(last-head-roty-speed float :offset-assert 1420)
(head-roty-speed float :offset-assert 1424)
(last-cannon-roty-speed float :offset-assert 1428)
@@ -1804,7 +1804,7 @@
)
(set! (-> s2-2 volume) 1024)
(set! (-> s2-2 pitch-mod) 0)
(set! (-> obj lazer-sound) (the-as uint (s3-1 s2-2 (new-sound-id) s4-0)))
(set! (-> obj lazer-sound) (s3-1 s2-2 (new-sound-id) s4-0))
)
)
(set! (-> *part-id-table* 4630 init-specs 4 initial-valuef) (vector-length s5-0))
@@ -1852,9 +1852,9 @@
(t9-0)
)
)
(sound-stop (the-as sound-id (-> self lazer-sound)))
(sound-stop (the-as sound-id (-> self head-sound)))
(sound-stop (the-as sound-id (-> self cannon-sound)))
(sound-stop (-> self lazer-sound))
(sound-stop (-> self head-sound))
(sound-stop (-> self cannon-sound))
(none)
)
:trans (behavior ()
@@ -1908,15 +1908,15 @@
(bombbot-method-182 self)
)
(else
(sound-stop (the-as sound-id (-> self lazer-sound)))
(set! (-> self lazer-sound) (the-as uint 0))
(sound-stop (-> self lazer-sound))
(set! (-> self lazer-sound) (new 'static 'sound-id))
0
)
)
)
(else
(sound-stop (the-as sound-id (-> self lazer-sound)))
(set! (-> self lazer-sound) (the-as uint 0))
(sound-stop (-> self lazer-sound))
(set! (-> self lazer-sound) (new 'static 'sound-id))
0
)
)
@@ -1971,15 +1971,15 @@
)
(set! (-> s5-1 volume) 1024)
(set! (-> s5-1 pitch-mod) 0)
(set! (-> self head-sound) (the-as uint (gp-2 s5-1 (new-sound-id) (-> self root-override2 trans))))
(set! (-> self head-sound) (gp-2 s5-1 (new-sound-id) (-> self root-override2 trans)))
)
)
)
(else
(when (nonzero? (-> self head-sound))
(sound-play "bb-turret-end")
(sound-stop (the-as sound-id (-> self head-sound)))
(set! (-> self head-sound) (the-as uint 0))
(sound-stop (-> self head-sound))
(set! (-> self head-sound) (new 'static 'sound-id))
0
)
)
@@ -1994,15 +1994,15 @@
)
(set! (-> s5-3 volume) 1024)
(set! (-> s5-3 pitch-mod) 0)
(set! (-> self cannon-sound) (the-as uint (gp-4 s5-3 (new-sound-id) (-> self root-override2 trans))))
(set! (-> self cannon-sound) (gp-4 s5-3 (new-sound-id) (-> self root-override2 trans)))
)
)
)
(else
(when (nonzero? (-> self cannon-sound))
(sound-stop (the-as sound-id (-> self cannon-sound)))
(sound-stop (-> self cannon-sound))
(sound-play "bb-laser-end")
(set! (-> self cannon-sound) (the-as uint 0))
(set! (-> self cannon-sound) (new 'static 'sound-id))
0
)
)
@@ -2971,9 +2971,9 @@
(method-of-object obj bombbot-method-183)
)
(set! (-> obj shield-hit-points) 3.0)
(set! (-> obj lazer-sound) (the-as uint (new-sound-id)))
(set! (-> obj head-sound) (the-as uint 0))
(set! (-> obj cannon-sound) (the-as uint 0))
(set! (-> obj lazer-sound) (new-sound-id))
(set! (-> obj head-sound) (new 'static 'sound-id))
(set! (-> obj cannon-sound) (new 'static 'sound-id))
(transform-post)
(dotimes (s5-2 4)
(let ((s4-1 (-> obj feet s5-2)))
goal_src/jak2/levels/common/enemy/guards/transport-level.gc
+3 -3
View File
@@ -18,7 +18,7 @@
(count-guard uint32 :offset-assert 244)
(max-time float :offset-assert 248)
(spawn-time time-frame :offset-assert 256)
(ambient-sound-id uint32 :offset-assert 264)
(ambient-sound-id sound-id :offset-assert 264)
(num-wanted-guards uint32 :offset-assert 268)
(guards handle 8 :offset-assert 272)
)
@@ -97,7 +97,7 @@
)
(set! (-> a0-3 volume) (the int (* 1024.0 f0-4)))
(set! (-> a0-3 pitch-mod) (the int (* 1524.0 f30-0)))
(sound-play-by-spec a0-3 (the-as sound-id (-> obj ambient-sound-id)) (-> obj root-override trans))
(sound-play-by-spec a0-3 (-> obj ambient-sound-id) (-> obj root-override trans))
)
0
(none)
@@ -207,7 +207,7 @@
(defstate die-fast (transport-level)
:virtual #t
:code (behavior ()
(sound-stop (the-as sound-id (-> self ambient-sound-id)))
(sound-stop (-> self ambient-sound-id))
(cleanup-for-death self)
(none)
)
goal_src/jak2/levels/common/guard-projectile.gc
+2
View File
@@ -768,6 +768,7 @@
(none)
)
;; WARN: Return type mismatch sound-id vs none.
(defmethod play-impact-sound! vehicle-grenade ((obj vehicle-grenade))
"Plays impact sound"
(let* ((a2-0 (-> obj root-override))
@@ -783,6 +784,7 @@
(sound-play "grenade-bounce")
)
)
(none)
)
(defstate impact (vehicle-grenade)
goal_src/jak2/levels/dig/dig-digger.gc
+10 -10
View File
@@ -1139,8 +1139,8 @@ This commonly includes things such as:
(twist oscillating-float :inline :offset-assert 1164)
(twist-kicker delayed-rand-float :inline :offset-assert 1192)
(smoke-part sparticle-launch-control :offset-assert 1220)
(motor-sound uint32 :offset-assert 1224)
(bit-sound uint32 :offset-assert 1228)
(motor-sound sound-id :offset-assert 1224)
(bit-sound sound-id :offset-assert 1228)
(movie-handle handle :offset-assert 1232)
(hud-counter handle :offset-assert 1240)
(speech-time time-frame :offset-assert 1248)
@@ -1317,13 +1317,13 @@ This commonly includes things such as:
(set-params! (-> self twist-kicker) 24 75 1.0)
(ja-post)
(dig-digger-method-23 self)
(set! (-> self motor-sound) (the-as uint (new-sound-id)))
(set! (-> self bit-sound) (the-as uint (new-sound-id)))
(set! (-> self motor-sound) (new-sound-id))
(set! (-> self bit-sound) (new-sound-id))
(none)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self motor-sound)))
(sound-stop (the-as sound-id (-> self bit-sound)))
(sound-stop (-> self motor-sound))
(sound-stop (-> self bit-sound))
(send-event (handle->process (-> self hud-counter)) 'hide-and-die)
(set! (-> self hud-counter) (the-as handle #f))
(none)
@@ -1335,9 +1335,9 @@ This commonly includes things such as:
(when (< f0-0 (* f1-0 f1-0))
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (-> self node-list data 29))
(sound-play "digger-motor" :id (the-as sound-id (-> self motor-sound)) :position gp-1)
(sound-play "digger-motor" :id (-> self motor-sound) :position gp-1)
)
(sound-play "digger-bit" :id (the-as sound-id (-> self bit-sound)) :position (-> self root trans))
(sound-play "digger-bit" :id (-> self bit-sound) :position (-> self root trans))
)
)
(ja :num! (loop!))
@@ -1688,8 +1688,8 @@ This commonly includes things such as:
(set! (-> obj start-y) (-> obj root trans y))
(set! (-> obj smoke-part) (create-launch-control (-> *part-group-id-table* 1143) obj))
(set! (-> obj part) (create-launch-control (-> *part-group-id-table* 1144) obj))
(set! (-> obj motor-sound) (the-as uint 0))
(set! (-> obj bit-sound) (the-as uint 0))
(set! (-> obj motor-sound) (new 'static 'sound-id))
(set! (-> obj bit-sound) (new 'static 'sound-id))
(set! (-> obj movie-handle) (the-as handle #f))
(set! (-> obj hud-counter) (ppointer->handle (process-spawn hud-dig-clasp :init hud-init-by-other :to obj)))
(go (method-of-object obj idle))
goal_src/jak2/levels/dig/dig-obs.gc
+5 -5
View File
@@ -15,7 +15,7 @@
(path-pos float :offset-assert 428)
(surface-height float :offset-assert 432)
(once basic :offset-assert 436)
(bubbling-sound-id uint32 :offset-assert 440)
(bubbling-sound-id sound-id :offset-assert 440)
)
:heap-base #x140
:method-count-assert 57
@@ -174,20 +174,20 @@
(when (nonzero? (-> obj bubbling-sound-id))
(let ((v1-84 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-84 command) (sound-command set-param))
(set! (-> v1-84 id) (the-as sound-id (-> obj bubbling-sound-id)))
(set! (-> v1-84 id) (-> obj bubbling-sound-id))
(set! (-> v1-84 params volume) -4)
(set! (-> v1-84 auto-time) 120)
(set! (-> v1-84 auto-from) 2)
(set! (-> v1-84 params mask) (the-as uint 17))
(-> v1-84 id)
)
(set! (-> obj bubbling-sound-id) (the-as uint 0))
(set! (-> obj bubbling-sound-id) (new 'static 'sound-id))
0
)
)
(else
(if (zero? (-> obj bubbling-sound-id))
(set! (-> obj bubbling-sound-id) (the-as uint (sound-play "lava-plat-sink")))
(set! (-> obj bubbling-sound-id) (sound-play "lava-plat-sink"))
)
)
)
@@ -288,7 +288,7 @@
(initialize! (-> obj sync) a1-5)
)
)
(set! (-> obj bubbling-sound-id) (the-as uint 0))
(set! (-> obj bubbling-sound-id) (new 'static 'sound-id))
(set! (-> obj once) (the-as basic #t))
0
(none)
goal_src/jak2/levels/dig/dig3-obs.gc
+21 -24
View File
@@ -522,7 +522,7 @@ This commonly includes things such as:
(none)
)
;; WARN: Return type mismatch time-frame vs sound-id.
;; WARN: Return type mismatch time-frame vs none.
(defmethod play-impact-sound! dig-spikey-sphere ((obj dig-spikey-sphere))
"Plays impact sound"
(let* ((a0-1 (-> obj root-override))
@@ -608,16 +608,13 @@ This commonly includes things such as:
)
)
)
(the-as sound-id (when (and (logtest? s5-0 (collide-status impact-surface))
(>= (- (current-time) (-> obj played-bounce-time)) (seconds 0.3))
)
(let ((v0-7 (current-time)))
(set! (-> obj played-bounce-time) v0-7)
v0-7
)
)
)
(if (and (logtest? s5-0 (collide-status impact-surface))
(>= (- (current-time) (-> obj played-bounce-time)) (seconds 0.3))
)
(set! (-> obj played-bounce-time) (current-time))
)
)
(none)
)
(defmethod init-proj-settings! dig-spikey-sphere ((obj dig-spikey-sphere))
@@ -809,7 +806,7 @@ This commonly includes things such as:
(trapeze-grabbed basic :offset-assert 360)
(pedal-anim-frame float :offset-assert 364)
(pedal-anim-speed float :offset-assert 368)
(pedal-sound-id uint32 :offset-assert 372)
(pedal-sound-id sound-id :offset-assert 372)
)
:heap-base #x100
:method-count-assert 21
@@ -1046,7 +1043,7 @@ This commonly includes things such as:
(set! (-> obj pedal-anim-frame) 0.0)
(set! (-> obj pedal-anim-speed) 0.5)
(set-vector! (-> obj pov-cam-offset) 0.0 -20480.0 0.0 1.0)
(set! (-> obj pedal-sound-id) (the-as uint (new-sound-id)))
(set! (-> obj pedal-sound-id) (new-sound-id))
(logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text))
(let ((a1-23 (new 'stack-no-clear 'sync-info-params)))
(let ((v1-39 0))
@@ -1083,7 +1080,7 @@ This commonly includes things such as:
)
(defmethod deactivate dig-balloon-lurker ((obj dig-balloon-lurker))
(sound-stop (the-as sound-id (-> obj pedal-sound-id)))
(sound-stop (-> obj pedal-sound-id))
((method-of-type process-drawable deactivate) obj)
(none)
)
@@ -1118,7 +1115,7 @@ This commonly includes things such as:
)
(sound-play-by-name
(static-sound-name "balon-lurk-loop")
(the-as sound-id (-> self pedal-sound-id))
(-> self pedal-sound-id)
(the int (* 1024.0 f1-5))
(the int (* 1524.0 f0-7))
0
@@ -1202,8 +1199,8 @@ This commonly includes things such as:
)
(deftype dig-wheel-step (process-drawable)
((anim-speed float :offset-assert 200)
(wheel-sound-id uint32 :offset-assert 204)
((anim-speed float :offset-assert 200)
(wheel-sound-id sound-id :offset-assert 204)
)
:heap-base #x50
:method-count-assert 21
@@ -1223,7 +1220,7 @@ This commonly includes things such as:
(defstate idle (dig-wheel-step)
:virtual #t
:trans (behavior ()
(sound-play "wheel-plat-loop" :id (the-as sound-id (-> self wheel-sound-id)))
(sound-play "wheel-plat-loop" :id (-> self wheel-sound-id))
(rider-trans)
(none)
)
@@ -1245,7 +1242,7 @@ This commonly includes things such as:
)
(defmethod deactivate dig-wheel-step ((obj dig-wheel-step))
(sound-stop (the-as sound-id (-> obj wheel-sound-id)))
(sound-stop (-> obj wheel-sound-id))
((method-of-type process-drawable deactivate) obj)
(none)
)
@@ -1303,7 +1300,7 @@ This commonly includes things such as:
(the-as skeleton-group (art-group-get-by-name *level* "skel-dig-wheel-step" (the-as (pointer uint32) #f)))
(the-as pair 0)
)
(set! (-> obj wheel-sound-id) (the-as uint (new-sound-id)))
(set! (-> obj wheel-sound-id) (new-sound-id))
(set! (-> obj draw light-index) (the-as uint 5))
(logclear! (-> obj mask) (process-mask actor-pause))
(let* ((a0-30 (-> obj entity))
@@ -1328,7 +1325,7 @@ This commonly includes things such as:
((anchor-point vector :inline :offset-assert 384)
(last-ridden-time time-frame :offset-assert 400)
(surface-height float :offset-assert 408)
(bubbling-sound-id uint32 :offset-assert 412)
(bubbling-sound-id sound-id :offset-assert 412)
)
:heap-base #x120
:method-count-assert 57
@@ -1385,20 +1382,20 @@ This commonly includes things such as:
(when (nonzero? (-> obj bubbling-sound-id))
(let ((v1-5 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-5 command) (sound-command set-param))
(set! (-> v1-5 id) (the-as sound-id (-> obj bubbling-sound-id)))
(set! (-> v1-5 id) (-> obj bubbling-sound-id))
(set! (-> v1-5 params volume) -4)
(set! (-> v1-5 auto-time) 120)
(set! (-> v1-5 auto-from) 2)
(set! (-> v1-5 params mask) (the-as uint 17))
(-> v1-5 id)
)
(set! (-> obj bubbling-sound-id) (the-as uint 0))
(set! (-> obj bubbling-sound-id) (new 'static 'sound-id))
0
)
)
(else
(if (zero? (-> obj bubbling-sound-id))
(set! (-> obj bubbling-sound-id) (the-as uint (sound-play "lava-plat-tip")))
(set! (-> obj bubbling-sound-id) (sound-play "lava-plat-tip"))
)
)
)
@@ -1503,7 +1500,7 @@ This commonly includes things such as:
)
)
(set! (-> obj surface-height) (+ 6144.0 (-> obj root-override-2 trans y)))
(set! (-> obj bubbling-sound-id) (the-as uint 0))
(set! (-> obj bubbling-sound-id) (new 'static 'sound-id))
0
(none)
)
goal_src/jak2/levels/drill_platform/ginsu.gc
+12 -12
View File
@@ -143,9 +143,9 @@
(ambush-path path-control :offset-assert 652)
(path-pos float :offset-assert 656)
(ambush-started symbol :offset-assert 660)
(blade-sound uint32 :offset-assert 664)
(blade-sound sound-id :offset-assert 664)
(blade-sound-playing symbol :offset-assert 668)
(grind-sound uint32 :offset-assert 672)
(grind-sound sound-id :offset-assert 672)
(grind-sound-playing symbol :offset-assert 676)
(grind-timer time-frame :offset-assert 680)
)
@@ -378,11 +378,11 @@
)
)
)
(sound-play "ginsu-loop" :id (the-as sound-id (-> obj blade-sound)) :position (-> obj root-override2 trans))
(sound-play "ginsu-loop" :id (-> obj blade-sound) :position (-> obj root-override2 trans))
(set! (-> obj blade-sound-playing) #t)
)
((-> obj blade-sound-playing)
(sound-stop (the-as sound-id (-> obj blade-sound)))
(sound-stop (-> obj blade-sound))
(set! (-> obj blade-sound-playing) #f)
)
)
@@ -403,11 +403,11 @@
)
(< (- (current-time) (-> obj grind-timer)) 0)
)
(sound-play "ginsu-grind" :id (the-as sound-id (-> obj grind-sound)) :position (-> obj root-override2 trans))
(sound-play "ginsu-grind" :id (-> obj grind-sound) :position (-> obj root-override2 trans))
(set! (-> obj grind-sound-playing) #t)
)
((-> obj grind-sound-playing)
(sound-stop (the-as sound-id (-> obj grind-sound)))
(sound-stop (-> obj grind-sound))
(set! (-> obj grind-sound-playing) #f)
)
)
@@ -855,10 +855,10 @@
(defbehavior ginsu-sounds-off ginsu ()
(if (-> self blade-sound-playing)
(sound-stop (the-as sound-id (-> self blade-sound)))
(sound-stop (-> self blade-sound))
)
(when (-> self grind-sound-playing)
(sound-stop (the-as sound-id (-> self grind-sound)))
(sound-stop (-> self grind-sound))
(set! (-> self grind-sound-playing) #f)
(set! (-> self grind-timer) 0)
0
@@ -955,10 +955,10 @@
)
)
(if (-> obj blade-sound-playing)
(sound-stop (the-as sound-id (-> obj blade-sound)))
(sound-stop (-> obj blade-sound))
)
(if (-> obj grind-sound-playing)
(sound-stop (the-as sound-id (-> obj grind-sound)))
(sound-stop (-> obj grind-sound))
)
((method-of-type nav-enemy deactivate) obj)
(none)
@@ -1113,9 +1113,9 @@
(if (not (logtest? (-> obj ambush-path flags) (path-control-flag not-found)))
(logior! (-> obj ambush-path flags) (path-control-flag display draw-line draw-point draw-text))
)
(set! (-> obj blade-sound) (the-as uint (new-sound-id)))
(set! (-> obj blade-sound) (new-sound-id))
(set! (-> obj blade-sound-playing) #f)
(set! (-> obj grind-sound) (the-as uint (new-sound-id)))
(set! (-> obj grind-sound) (new-sound-id))
(set! (-> obj grind-sound-playing) #f)
(set! (-> obj grind-timer) 0)
0
goal_src/jak2/levels/forest/forest-obs.gc
+4 -4
View File
@@ -73,7 +73,7 @@ This commonly includes things such as:
(falling? basic :offset-assert 264)
(focus-disable-timer uint64 :offset-assert 272)
(hud handle :offset-assert 280)
(sound-id uint32 :offset-assert 288)
(sound-id sound-id :offset-assert 288)
)
:heap-base #xb0
:method-count-assert 31
@@ -251,7 +251,7 @@ This commonly includes things such as:
(none)
)
:post (behavior ()
(sound-play "samos-hover" :id (the-as sound-id (-> self sound-id)))
(sound-play "samos-hover" :id (-> self sound-id))
(forest-youngsamos-post)
(none)
)
@@ -431,7 +431,7 @@ This commonly includes things such as:
(if (valid? (-> obj hud) (the-as type #f) "" #t 0)
(send-event (handle->process (-> obj hud)) 'hide-and-die)
)
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function process-focusable none) (find-parent-method forest-youngsamos 10)) obj)
(none)
)
@@ -503,7 +503,7 @@ This commonly includes things such as:
(vector-reset! (-> obj root-override2 transv))
(set! (-> obj focus-disable-timer) (the-as uint 0))
(set! (-> obj hud) (ppointer->handle (process-spawn hud-samos-young :init hud-init-by-other :to obj)))
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(set! (-> obj part) (create-launch-control (-> *part-group-id-table* 494) obj))
(go (method-of-object obj idle))
(none)
goal_src/jak2/levels/fortress/ammo_dump/fordumpc-obs.gc
+8 -8
View File
@@ -465,8 +465,8 @@ This commonly includes things such as:
(bomb handle 4 :offset-assert 232)
(bomb-count uint32 :offset-assert 264)
(attack-id uint32 :offset-assert 268)
(explosion-sound-id uint32 :offset-assert 272)
(alarm-sound-id uint32 :offset-assert 276)
(explosion-sound-id sound-id :offset-assert 272)
(alarm-sound-id sound-id :offset-assert 276)
)
:heap-base #xa0
:method-count-assert 25
@@ -600,7 +600,7 @@ This commonly includes things such as:
:exit (behavior ()
(set-fordumpc-light-flag! #f)
(send-event (handle->process (-> self hud)) 'hide-and-die)
(sound-stop (the-as sound-id (-> self alarm-sound-id)))
(sound-stop (-> self alarm-sound-id))
(none)
)
:code (behavior ()
@@ -700,7 +700,7 @@ This commonly includes things such as:
)
)
(set! (-> self explosion-sound-id)
(the-as uint (add-process *gui-control* self (gui-channel background) (gui-action queue) "big-xplo" -99.0 0))
(add-process *gui-control* self (gui-channel background) (gui-action queue) "big-xplo" -99.0 0)
)
(dotimes (gp-5 10)
(set! (-> *game-info* timer) (the-as time-frame (- 3000 (the int (* 300.0 (the float gp-5))))))
@@ -714,7 +714,7 @@ This commonly includes things such as:
(none)
)
:post (behavior ()
(sound-play "fort-alarm" :id (the-as sound-id (-> self alarm-sound-id)))
(sound-play "fort-alarm" :id (-> self alarm-sound-id))
(none)
)
)
@@ -846,7 +846,7 @@ This commonly includes things such as:
(set-action!
*gui-control*
(gui-action play)
(the-as sound-id (-> self explosion-sound-id))
(-> self explosion-sound-id)
(gui-channel none)
(gui-action none)
(the-as string #f)
@@ -957,7 +957,7 @@ This commonly includes things such as:
(if (nonzero? (-> obj part-doom))
(kill-and-free-particles (-> obj part-doom))
)
(sound-stop (the-as sound-id (-> obj alarm-sound-id)))
(sound-stop (-> obj alarm-sound-id))
((method-of-type process-drawable deactivate) obj)
(none)
)
@@ -1041,7 +1041,7 @@ This commonly includes things such as:
(set! (-> obj bomb-count) (the-as uint 4))
(set! (-> obj hud) (the-as handle #f))
(set! (-> obj part-doom) (create-launch-control (-> *part-group-id-table* 583) obj))
(set! (-> obj alarm-sound-id) (the-as uint (new-sound-id)))
(set! (-> obj alarm-sound-id) (new-sound-id))
(let ((a0-36 (-> obj skel root-channel 0)))
(set! (-> a0-36 frame-group) (the-as art-joint-anim (-> obj draw art-group data 2)))
(set! (-> a0-36 frame-num) 0.0)
goal_src/jak2/levels/fortress/ammo_dump/fort-robotank-turret.gc
+5 -9
View File
@@ -35,7 +35,7 @@
(gun-spread float :offset-assert 580)
(gun-index int32 :offset-assert 584)
(flags uint16 :offset-assert 588)
(turn-sound-id uint32 :offset-assert 592)
(turn-sound-id sound-id :offset-assert 592)
)
:heap-base #x1e0
:method-count-assert 35
@@ -974,14 +974,10 @@
)
(cond
((logtest? (-> self flags) 64)
(sound-play
"robotank-turret"
:id (the-as sound-id (-> self turn-sound-id))
:position (-> self root-override trans)
)
(sound-play "robotank-turret" :id (-> self turn-sound-id) :position (-> self root-override trans))
(when (< (fabs (-> self rotate-rate)) 728.1778)
(set! (-> self flags) (logand -65 (-> self flags)))
(sound-stop (the-as sound-id (-> self turn-sound-id)))
(sound-stop (-> self turn-sound-id))
(sound-play "robo-turret-end")
)
)
@@ -1291,7 +1287,7 @@
(defmethod deactivate fort-robotank-turret ((obj fort-robotank-turret))
(set! (-> obj flags) (logand -65 (-> obj flags)))
(sound-stop (the-as sound-id (-> obj turn-sound-id)))
(sound-stop (-> obj turn-sound-id))
(let ((a0-4 (handle->process (-> obj screen))))
(if a0-4
(deactivate a0-4)
@@ -1417,7 +1413,7 @@
)
(ja-no-eval :group! (-> self draw art-group data 3) :num! zero)
(transform-post)
(set! (-> self turn-sound-id) (the-as uint (new-sound-id)))
(set! (-> self turn-sound-id) (new-sound-id))
(go-virtual idle)
(none)
)
goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc
+5 -5
View File
@@ -125,7 +125,7 @@ This commonly includes things such as:
(path-u float :offset-assert 480)
(path-du float :offset-assert 484)
(attack-id uint32 :offset-assert 488)
(sound-id uint32 :offset-assert 492)
(sound-id sound-id :offset-assert 492)
)
:heap-base #x170
:method-count-assert 23
@@ -189,7 +189,7 @@ This commonly includes things such as:
(defstate running (fort-elec-belt-inst)
:virtual #t
:exit (behavior ()
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(none)
)
:trans (behavior ()
@@ -224,7 +224,7 @@ This commonly includes things such as:
(vector+! t2-0 s3-0 s2-0)
(vector-float*! t2-0 t2-0 0.5)
(set! (-> t2-0 y) (+ -20480.0 (-> t2-0 y)))
(sound-play "sliding-laser" :id (the-as sound-id (-> self sound-id)) :position t2-0)
(sound-play "sliding-laser" :id (-> self sound-id) :position t2-0)
)
(let* ((v0-4 (vector-normalize! (vector-! (new 'stack-no-clear 'vector) s2-0 s3-0) 1.0))
(gp-1 (vector-cross! (new 'stack-no-clear 'vector) v0-4 *up-vector*))
@@ -405,7 +405,7 @@ This commonly includes things such as:
)
(defmethod deactivate fort-elec-belt-inst ((obj fort-elec-belt-inst))
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method fort-elec-belt-inst 10)) obj)
(none)
)
@@ -446,7 +446,7 @@ This commonly includes things such as:
)
(set! (-> self l-spec) arg3)
(set! (-> self attack-id) arg4)
(set! (-> self sound-id) (the-as uint (new-sound-id)))
(set! (-> self sound-id) (new-sound-id))
(ja-no-eval :group! (-> self draw art-group data 2) :num! zero)
(ja-post)
(go-virtual idle)
goal_src/jak2/levels/gungame/gun-dummy.gc
+41 -46
View File
@@ -5,8 +5,8 @@
;; name in dgo: gun-dummy
;; dgos: GGA
;; +++tpath-control-frame-command
(defenum tpath-control-frame-command
;; +++gun-dummy:tpath-command
(defenum tpath-command
:type uint8
(begin) ;; kinda a guess
(arise)
@@ -16,24 +16,23 @@
(lower)
(end) ;; kinda a guess
)
;; ---tpath-control-frame-command
;; ---gun-dummy:tpath-command
(declare-type training-manager process)
;; +++tpath-info-flags
(defenum tpath-info-flags
;; +++gun-dummy:tpath-flags
(defenum tpath-flags
:type uint8
:bitfield #t
(tpath-info-flags-0)
(need-to-spawn)
(broken)
(score-not-influenced-by-speed)
(tpath-info-flags-3)
(start-on-rand-anim)
(double-hitpoints)
(tpath-info-flags-6) ;; unknown - TODO i think this is related to the peacemaker course
(tpath-info-flags-7)
(citizen)
(bonus)
(tpath-rand)
(big)
(peace)
)
;; ---tpath-info-flags
;; ---gun-dummy:tpath-flags
;; DECOMP BEGINS
@@ -1501,11 +1500,11 @@
)
(deftype tpath-control-frame (structure)
((time float :offset-assert 0)
(path-pos uint8 :offset-assert 4)
(command tpath-control-frame-command :offset-assert 5)
(move-type uint8 :offset-assert 6)
(path-num uint8 :offset-assert 7)
((time float :offset-assert 0)
(path-pos uint8 :offset-assert 4)
(command tpath-command :offset-assert 5)
(move-type uint8 :offset-assert 6)
(path-num uint8 :offset-assert 7)
)
:method-count-assert 9
:size-assert #x8
@@ -1518,7 +1517,7 @@
(num uint16 :offset-assert 4)
(ref-time-num int16 :offset-assert 6)
(score int16 :offset-assert 8)
(flags tpath-info-flags :offset-assert 10)
(flags tpath-flags :offset-assert 10)
(num-anims uint8 :offset-assert 11)
(bonus-time float :offset-assert 12)
(list (array int32) :offset-assert 16)
@@ -1903,30 +1902,30 @@
(let ((curr-frame (the-as tpath-control-frame (-> obj current))))
(loop
(case (-> curr-frame command)
(((tpath-control-frame-command begin))
(((tpath-command begin))
(set! curr-frame (-> (the-as (inline-array tpath-control-frame) curr-frame) 1))
)
(((tpath-control-frame-command arise))
(((tpath-command arise))
(+! total-time (-> curr-frame time))
(set! curr-frame (-> (the-as (inline-array tpath-control-frame) curr-frame) 1))
)
(((tpath-control-frame-command lower))
(((tpath-command lower))
(+! total-time (-> curr-frame time))
(set! curr-frame (-> (the-as (inline-array tpath-control-frame) curr-frame) 1))
)
(((tpath-control-frame-command align-with-track))
(((tpath-command align-with-track))
(+! total-time (-> curr-frame time))
(set! curr-frame (-> (the-as (inline-array tpath-control-frame) curr-frame) 1))
)
(((tpath-control-frame-command translate))
(((tpath-command translate))
(+! total-time (-> curr-frame time))
(set! curr-frame (-> (the-as (inline-array tpath-control-frame) curr-frame) 1))
)
(((tpath-control-frame-command wait))
(((tpath-command wait))
(+! total-time (-> curr-frame time))
(set! curr-frame (-> (the-as (inline-array tpath-control-frame) curr-frame) 1))
)
(((tpath-control-frame-command end))
(((tpath-command end))
(return total-time)
)
)
@@ -1968,7 +1967,7 @@
(return #f)
)
(case (-> curr-path-command 0 command)
(((tpath-control-frame-command arise))
(((tpath-command arise))
(set! (-> obj path-pos) (* 0.007843138 (the float (-> curr-path-command 0 path-pos))))
(get-point-in-path! path (-> obj root-override trans) (-> obj path-pos) 'interp)
(+! (-> obj root-override trans y) (lerp-scale -16384.0 0.0 f30-0 0.0 (-> curr-path-command 0 time)))
@@ -2005,7 +2004,7 @@
(return #t)
ret
)
(((tpath-control-frame-command lower))
(((tpath-command lower))
(get-point-in-path! path (-> obj root-override trans) (-> obj path-pos) 'interp)
(+! (-> obj root-override trans y) (lerp-scale 0.0 -16384.0 f30-0 0.0 (-> curr-path-command 0 time)))
(if (-> obj first-time-command)
@@ -2020,7 +2019,7 @@
(return #t)
ret
)
(((tpath-control-frame-command align-with-track))
(((tpath-command align-with-track))
(let ((s3-3 (get-point-in-path! path (new 'stack-no-clear 'vector) (-> obj path-pos) 'interp)))
(let* ((v1-68 (get-point-in-path!
path
@@ -2055,7 +2054,7 @@
(return #t)
ret
)
(((tpath-control-frame-command translate))
(((tpath-command translate))
(set! (-> obj score) (- (-> obj score) (* (-> obj score-speed) (-> pp clock seconds-per-frame))))
(set! (-> obj inout-percent) (fmax 0.0 (- (-> obj inout-percent) (* 4.0 (-> pp clock seconds-per-frame)))))
(let ((s2-4 (new 'stack-no-clear 'vector))
@@ -2136,7 +2135,7 @@
(return #t)
ret
)
(((tpath-control-frame-command wait))
(((tpath-command wait))
(set! (-> obj score) (- (-> obj score) (* (-> obj score-speed) (-> pp clock seconds-per-frame))))
(set! (-> obj inout-percent) (fmax 0.0 (- (-> obj inout-percent) (* 4.0 (-> pp clock seconds-per-frame)))))
(get-point-in-path! path (-> obj root-override trans) (-> obj path-pos) 'interp)
@@ -2151,7 +2150,7 @@
(return #t)
ret
)
(((tpath-control-frame-command end))
(((tpath-command end))
(return #f)
ret
)
@@ -2193,25 +2192,21 @@
(('track)
(cond
((-> event param 0)
(if (and (not (logtest? (-> self info flags) (tpath-info-flags score-not-influenced-by-speed)))
(> (-> self hit-points) 0)
)
(if (and (not (logtest? (-> self info flags) (tpath-flags citizen))) (> (-> self hit-points) 0))
#t
'abort
)
)
(else
(and (not (logtest? (-> self info flags) (tpath-info-flags score-not-influenced-by-speed)))
(> (-> self hit-points) 0)
)
(and (not (logtest? (-> self info flags) (tpath-flags citizen))) (> (-> self hit-points) 0))
)
)
)
(('attack)
(let ((attack-info (the-as attack-info (-> event param 1))))
(get-penetrate-using-from-attack-event (the-as process-drawable proc) event)
(when (or (not (logtest? (-> self info flags) (tpath-info-flags tpath-info-flags-6)))
(and (logtest? (-> self info flags) (tpath-info-flags tpath-info-flags-6))
(when (or (not (logtest? (-> self info flags) (tpath-flags peace)))
(and (logtest? (-> self info flags) (tpath-flags peace))
(or (= (-> attack-info mode) 'eco-dark) (= (-> attack-info mode) 'explode))
)
)
@@ -2274,7 +2269,7 @@
(none)
)
:exit (behavior ()
(logior! (-> self info flags) (tpath-info-flags broken))
(logior! (-> self info flags) (tpath-flags broken))
(none)
)
:code (behavior ()
@@ -2302,7 +2297,7 @@
:post (behavior ()
(set! (-> self done? value) (not (path-playing? self)))
(when (zero? (-> self hit-points))
(logior! (-> self info flags) (tpath-info-flags broken))
(logior! (-> self info flags) (tpath-flags broken))
(if (>= -100.0 (-> self score))
(sound-play "score-bad")
)
@@ -2398,7 +2393,7 @@ This commonly includes things such as:
(vector-identity! (-> obj root-override scale))
(quaternion-copy! (-> obj quat) (-> obj root-override quat))
(set! (-> obj root-override trans y) (+ -16384.0 (-> obj root-override trans y)))
(if (not (logtest? (-> arg0 flags) (tpath-info-flags start-on-rand-anim)))
(if (not (logtest? (-> arg0 flags) (tpath-flags tpath-rand)))
(set! *tpath-rand* (the-as uint (rand-vu-int-count 16)))
)
(set! (-> obj current)
@@ -2408,17 +2403,17 @@ This commonly includes things such as:
)
)
(let ((path (-> obj current)))
(when (= (-> path 0 command) (tpath-control-frame-command begin))
(when (= (-> path 0 command) (tpath-command begin))
(set! (-> obj path-num) (-> path 0 path-num))
(set! (-> obj current) (the-as (inline-array tpath-control-frame) (-> obj current 1)))
)
)
(set! (-> obj score) (the float (-> arg0 score)))
(if (logtest? (-> arg0 flags) (tpath-info-flags score-not-influenced-by-speed))
(if (logtest? (-> arg0 flags) (tpath-flags citizen))
(set! (-> obj score-speed) 0.0)
(set! (-> obj score-speed) (/ (-> obj score) (path-time-elapsed obj)))
)
(set! (-> obj hit-points) (if (logtest? (-> arg0 flags) (tpath-info-flags double-hitpoints))
(set! (-> obj hit-points) (if (logtest? (-> arg0 flags) (tpath-flags big))
2
1
)
goal_src/jak2/levels/gungame/gungame-data.gc
+5207 -5207
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/levels/gungame/gungame-obs.gc
+24 -28
View File
@@ -925,18 +925,18 @@ This commonly includes things such as:
:ref-time-num -1
:anim1 (new 'static 'inline-array tpath-control-frame 4
(new 'static 'tpath-control-frame :path-num #x23)
(new 'static 'tpath-control-frame :time 0.3 :command (tpath-control-frame-command arise))
(new 'static 'tpath-control-frame :time -1.0 :command (tpath-control-frame-command wait))
(new 'static 'tpath-control-frame :command (tpath-control-frame-command end))
(new 'static 'tpath-control-frame :time 0.3 :command (tpath-command arise))
(new 'static 'tpath-control-frame :time -1.0 :command (tpath-command wait))
(new 'static 'tpath-control-frame :command (tpath-command end))
)
)
(new 'static 'tpath-info
:ref-time-num -1
:anim1 (new 'static 'inline-array tpath-control-frame 4
(new 'static 'tpath-control-frame :path-num #x23)
(new 'static 'tpath-control-frame :time 0.3 :path-pos #x7f :command (tpath-control-frame-command arise))
(new 'static 'tpath-control-frame :time -1.0 :command (tpath-control-frame-command wait))
(new 'static 'tpath-control-frame :command (tpath-control-frame-command end))
(new 'static 'tpath-control-frame :time 0.3 :path-pos #x7f :command (tpath-command arise))
(new 'static 'tpath-control-frame :time -1.0 :command (tpath-command wait))
(new 'static 'tpath-control-frame :command (tpath-command end))
)
)
)
@@ -1143,13 +1143,13 @@ This commonly includes things such as:
(dotimes (gp-2 (length (-> self course)))
(let ((v1-20 (-> self course gp-2)))
0
(logior! (-> v1-20 flags) (tpath-info-flags tpath-info-flags-0))
(logclear! (-> v1-20 flags) (tpath-info-flags broken))
(logior! (-> v1-20 flags) (tpath-flags need-to-spawn))
(logclear! (-> v1-20 flags) (tpath-flags broken))
(cond
((logtest? (-> v1-20 flags) (tpath-info-flags tpath-info-flags-3))
((logtest? (-> v1-20 flags) (tpath-flags bonus))
(+! (-> self total-bonus) 1)
)
((not (logtest? (-> v1-20 flags) (tpath-info-flags score-not-influenced-by-speed)))
((not (logtest? (-> v1-20 flags) (tpath-flags citizen)))
(+! (-> self total-target) 1)
)
)
@@ -1437,13 +1437,13 @@ This commonly includes things such as:
)
(dotimes (gp-0 (length (-> self course)))
(let ((s5-0 (-> self course gp-0)))
(when (and (logtest? (-> s5-0 flags) (tpath-info-flags tpath-info-flags-0)) (>= f30-0 (-> s5-0 s-time)))
(when (and (logtest? (-> s5-0 flags) (tpath-flags need-to-spawn)) (>= f30-0 (-> s5-0 s-time)))
(cond
((logtest? (-> s5-0 flags) (tpath-info-flags tpath-info-flags-3))
((logtest? (-> s5-0 flags) (tpath-flags bonus))
(let ((s4-0 #t))
(dotimes (s3-0 (length (-> self course)))
(let ((s2-0 (-> self course s3-0)))
(when (not (logtest? (-> s2-0 flags) (tpath-info-flags broken)))
(when (not (logtest? (-> s2-0 flags) (tpath-flags broken)))
(dotimes (s1-0 (length (-> s5-0 list)))
(if (= (-> s5-0 list s1-0) (-> s2-0 num))
(set! s4-0 #f)
@@ -1454,17 +1454,15 @@ This commonly includes things such as:
)
(when s4-0
(process-spawn gun-dummy-gold self s5-0 :to self)
(logclear! (-> s5-0 flags) (tpath-info-flags tpath-info-flags-0))
(logclear! (-> s5-0 flags) (tpath-flags need-to-spawn))
)
)
(if (>= f30-0 (+ (-> s5-0 bonus-time) (-> s5-0 s-time)))
(logclear! (-> s5-0 flags) (tpath-info-flags tpath-info-flags-0))
(logclear! (-> s5-0 flags) (tpath-flags need-to-spawn))
)
)
(else
(when (and (not (logtest? (-> s5-0 flags) (tpath-info-flags score-not-influenced-by-speed)))
(not (-> self first-enemy-shown?))
)
(when (and (not (logtest? (-> s5-0 flags) (tpath-flags citizen))) (not (-> self first-enemy-shown?)))
(if (task-node-open? (game-task-node city-red-gun-training-try-once))
(set! (-> self last-sound-id)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc024" -99.0 0)
@@ -1472,9 +1470,7 @@ This commonly includes things such as:
)
(set! (-> self first-enemy-shown?) #t)
)
(when (and (logtest? (-> s5-0 flags) (tpath-info-flags score-not-influenced-by-speed))
(not (-> self first-citizen-shown?))
)
(when (and (logtest? (-> s5-0 flags) (tpath-flags citizen)) (not (-> self first-citizen-shown?)))
(if (task-node-open? (game-task-node city-red-gun-training-try-once))
(set! (-> self last-sound-id)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc025" -99.0 0)
@@ -1483,7 +1479,7 @@ This commonly includes things such as:
(set! (-> self first-citizen-shown?) #t)
)
(cond
((logtest? (-> s5-0 flags) (tpath-info-flags score-not-influenced-by-speed))
((logtest? (-> s5-0 flags) (tpath-flags citizen))
(let ((v1-93 (rand-vu-int-count 4)))
(cond
((zero? v1-93)
@@ -1501,10 +1497,10 @@ This commonly includes things such as:
)
)
)
((logtest? (-> s5-0 flags) (tpath-info-flags double-hitpoints))
((logtest? (-> s5-0 flags) (tpath-flags big))
(process-spawn gun-dummy-big self s5-0 :to self)
)
((logtest? (-> s5-0 flags) (tpath-info-flags tpath-info-flags-6))
((logtest? (-> s5-0 flags) (tpath-flags peace))
(process-spawn gun-dummy-peace self s5-0 :to self)
)
(else
@@ -1523,7 +1519,7 @@ This commonly includes things such as:
)
)
)
(logclear! (-> s5-0 flags) (tpath-info-flags tpath-info-flags-0))
(logclear! (-> s5-0 flags) (tpath-flags need-to-spawn))
)
)
)
@@ -1546,7 +1542,7 @@ This commonly includes things such as:
)
a1-37
)
(logtest? (-> gp-1 flags) (tpath-info-flags broken))
(logtest? (-> gp-1 flags) (tpath-flags broken))
)
)
)
@@ -2114,8 +2110,8 @@ This commonly includes things such as:
(dotimes (s5-0 (length arg0))
(let ((v1-2 (-> arg0 s5-0)))
0
(logior! (-> v1-2 flags) (tpath-info-flags tpath-info-flags-0))
(logclear! (-> v1-2 flags) (tpath-info-flags broken))
(logior! (-> v1-2 flags) (tpath-flags need-to-spawn))
(logclear! (-> v1-2 flags) (tpath-flags broken))
(let ((a0-6 (-> v1-2 ref-time-num)))
(set! (-> v1-2 ref-time-num) -1)
(dotimes (a1-3 s5-0)
goal_src/jak2/levels/hiphog/whack.gc
+32 -32
View File
@@ -1427,11 +1427,11 @@
)
(deftype hip-mole (process-drawable)
((cabinet handle :offset-assert 200)
(index int32 :offset-assert 208)
(mode uint8 :offset-assert 212)
(sound-id uint32 :offset-assert 216)
(abort? symbol :offset-assert 220)
((cabinet handle :offset-assert 200)
(index int32 :offset-assert 208)
(mode uint8 :offset-assert 212)
(sound-id sound-id :offset-assert 216)
(abort? symbol :offset-assert 220)
)
:heap-base #x60
:method-count-assert 22
@@ -1567,12 +1567,12 @@
)
)
(sound-play "whack-up")
(set! (-> self sound-id) (the-as uint (sound-play "whack-bounce")))
(set! (-> self sound-id) (sound-play "whack-bounce"))
(set! (-> self abort?) #f)
(none)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(none)
)
:trans (behavior ()
@@ -1925,13 +1925,13 @@
(let ((v1-50 (whack-a-metal-method-29 obj 0 3)))
(cond
((zero? v1-50)
(talker-spawn-func (-> *talker-speech* 430) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 430) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-50 1)
(talker-spawn-func (-> *talker-speech* 431) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 431) *entity-pool* (target-pos 0) (the-as region #f)))
)
(else
(talker-spawn-func (-> *talker-speech* 432) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 432) *entity-pool* (target-pos 0) (the-as region #f)))
)
)
)
@@ -1940,64 +1940,64 @@
(let ((v1-55 (whack-a-metal-method-29 obj 1 20)))
(cond
((zero? v1-55)
(talker-spawn-func (-> *talker-speech* 395) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 395) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 1)
(talker-spawn-func (-> *talker-speech* 396) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 396) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 2)
(talker-spawn-func (-> *talker-speech* 397) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 397) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 3)
(talker-spawn-func (-> *talker-speech* 398) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 398) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 4)
(talker-spawn-func (-> *talker-speech* 401) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 401) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 5)
(talker-spawn-func (-> *talker-speech* 403) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 403) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 6)
(talker-spawn-func (-> *talker-speech* 404) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 404) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 7)
(talker-spawn-func (-> *talker-speech* 405) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 405) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 8)
(talker-spawn-func (-> *talker-speech* 406) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 406) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 9)
(talker-spawn-func (-> *talker-speech* 407) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 407) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 10)
(talker-spawn-func (-> *talker-speech* 408) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 408) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 11)
(talker-spawn-func (-> *talker-speech* 409) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 409) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 12)
(talker-spawn-func (-> *talker-speech* 410) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 410) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 13)
(talker-spawn-func (-> *talker-speech* 411) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 411) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 14)
(talker-spawn-func (-> *talker-speech* 412) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 412) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 15)
(talker-spawn-func (-> *talker-speech* 413) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 413) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 16)
(talker-spawn-func (-> *talker-speech* 414) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 414) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 17)
(talker-spawn-func (-> *talker-speech* 415) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 415) *entity-pool* (target-pos 0) (the-as region #f)))
)
((= v1-55 18)
(talker-spawn-func (-> *talker-speech* 416) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 416) *entity-pool* (target-pos 0) (the-as region #f)))
)
(else
(talker-spawn-func (-> *talker-speech* 417) *entity-pool* (target-pos 0) (the-as region #f))
(the-as int (talker-spawn-func (-> *talker-speech* 417) *entity-pool* (target-pos 0) (the-as region #f)))
)
)
)
@@ -2657,7 +2657,7 @@
)
(s5-8 (current-time))
)
(while (or (nonzero? (get-status *gui-control* (the-as sound-id gp-1))) (< (- (current-time) s5-8) (seconds 2)))
(while (or (nonzero? (get-status *gui-control* gp-1)) (< (- (current-time) s5-8) (seconds 2)))
(suspend)
(ja :num! (loop!))
)
@@ -2730,7 +2730,7 @@
)
(s5-8 (current-time))
)
(while (or (nonzero? (get-status *gui-control* (the-as sound-id gp-1))) (< (- (current-time) s5-8) (seconds 2)))
(while (or (nonzero? (get-status *gui-control* gp-1)) (< (- (current-time) s5-8) (seconds 2)))
(suspend)
(ja :num! (loop!))
)
goal_src/jak2/levels/landing_pad/castle-obs.gc
+32 -32
View File
@@ -16,7 +16,7 @@
(actor-group-count int32 :offset-assert 260)
(texture-anim-index uint32 :offset-assert 264)
(my-id int32 :offset-assert 268)
(sound-id uint32 :offset-assert 272)
(sound-id sound-id :offset-assert 272)
(target-speed float :offset-assert 276)
)
:heap-base #xa0
@@ -58,7 +58,7 @@ This commonly includes things such as:
(go process-drawable-art-error "bad path")
)
(init! obj)
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(set! (-> obj target-speed) (-> obj speed))
(conveyor-method-21 obj)
(set! sv-16 (new 'static 'res-tag))
@@ -80,7 +80,7 @@ This commonly includes things such as:
)
(defmethod deactivate cas-conveyor ((obj cas-conveyor))
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function conveyor none) (find-parent-method cas-conveyor 10)) obj)
(none)
)
@@ -95,7 +95,7 @@ This commonly includes things such as:
(let ((f0-2 (* 0.000032552085 (+ -30720.0 (fabs (-> self speed))))))
(sound-play-by-name
(static-sound-name "castle-conveyor")
(the-as sound-id (-> self sound-id))
(-> self sound-id)
1024
(the int (* 1524.0 f0-2))
0
@@ -826,7 +826,7 @@ This commonly includes things such as:
)
(deftype cas-elevator (elevator)
((sound-id uint32 :offset-assert 368)
((sound-id sound-id :offset-assert 368)
)
:heap-base #x100
:method-count-assert 50
@@ -919,7 +919,7 @@ This commonly includes things such as:
(t9-0)
)
)
(sound-play "cas-elevate" :id (the-as sound-id (-> self sound-id)) :position (-> self root-override trans))
(sound-play "cas-elevate" :id (-> self sound-id) :position (-> self root-override trans))
(none)
)
:post (behavior ()
@@ -932,7 +932,7 @@ This commonly includes things such as:
(when *sound-player-enable*
(let ((gp-0 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> gp-0 command) (sound-command set-param))
(set! (-> gp-0 id) (the-as sound-id (-> self sound-id)))
(set! (-> gp-0 id) (-> self sound-id))
(let ((a1-0 (-> self root-override trans)))
(let ((s5-0 self))
(when (= a1-0 #t)
@@ -960,7 +960,7 @@ This commonly includes things such as:
(t9-0)
)
)
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(sound-play "cas-elevate-end")
(none)
)
@@ -978,7 +978,7 @@ This commonly includes things such as:
)
(defmethod deactivate cas-elevator ((obj cas-elevator))
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function elevator none) (find-parent-method cas-elevator 10)) obj)
(none)
)
@@ -986,7 +986,7 @@ This commonly includes things such as:
(defmethod init-plat! cas-elevator ((obj cas-elevator))
"Does any necessary initial platform setup.
For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound."
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(cas-elevator-method-49 obj)
(none)
)
@@ -1021,13 +1021,13 @@ For example for an elevator pre-compute the distance between the first and last
)
(deftype cas-rot-bridge (process-drawable)
((index uint32 :offset-assert 200)
(anim-index uint32 :offset-assert 204)
(test-index uint32 :offset-assert 208)
(pos float :offset-assert 212)
(pos-old float :offset-assert 216)
(sound-id uint32 :offset-assert 220)
(sound-flag symbol :offset-assert 224)
((index uint32 :offset-assert 200)
(anim-index uint32 :offset-assert 204)
(test-index uint32 :offset-assert 208)
(pos float :offset-assert 212)
(pos-old float :offset-assert 216)
(sound-id sound-id :offset-assert 220)
(sound-flag symbol :offset-assert 224)
)
:heap-base #x70
:method-count-assert 21
@@ -1278,7 +1278,7 @@ For example for an elevator pre-compute the distance between the first and last
((< f0-9 1.0)
(sound-play
"track-plat-loop"
:id (the-as sound-id (-> self sound-id))
:id (-> self sound-id)
:position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
)
(set! (-> self sound-flag) #t)
@@ -1288,7 +1288,7 @@ For example for an elevator pre-compute the distance between the first and last
"track-plat-stop"
:position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
)
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(set! (-> self sound-flag) #f)
)
)
@@ -1298,7 +1298,7 @@ For example for an elevator pre-compute the distance between the first and last
((< 0.0 f0-9)
(sound-play
"track-plat-loop"
:id (the-as sound-id (-> self sound-id))
:id (-> self sound-id)
:position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
)
(set! (-> self sound-flag) #t)
@@ -1308,7 +1308,7 @@ For example for an elevator pre-compute the distance between the first and last
"track-plat-stop"
:position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
)
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(set! (-> self sound-flag) #f)
)
)
@@ -1408,7 +1408,7 @@ This commonly includes things such as:
)
)
(set! (-> obj draw light-index) (the-as uint 1))
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(set! (-> obj sound-flag) #f)
(transform-post)
(go (method-of-object obj idle))
@@ -1424,7 +1424,7 @@ This commonly includes things such as:
(pos-old float :offset-assert 220)
(y-start float :offset-assert 224)
(y-delta float :offset-assert 228)
(sound-id uint32 :offset-assert 232)
(sound-id sound-id :offset-assert 232)
(sound-flag symbol :offset-assert 236)
)
:heap-base #x70
@@ -1521,12 +1521,12 @@ This commonly includes things such as:
((< 0.0 f28-0)
(cond
((< f30-0 1.0)
(sound-play "cas-valve-loop" :id (the-as sound-id (-> self sound-id)) :position (-> self root trans))
(sound-play "cas-valve-loop" :id (-> self sound-id) :position (-> self root trans))
(set! (-> self sound-flag) #t)
)
((-> self sound-flag)
(sound-play "cas-valve-stop")
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(set! (-> self sound-flag) #f)
)
)
@@ -1534,12 +1534,12 @@ This commonly includes things such as:
(else
(cond
((< 0.0 f30-0)
(sound-play "cas-valve-loop" :id (the-as sound-id (-> self sound-id)) :position (-> self root trans))
(sound-play "cas-valve-loop" :id (-> self sound-id) :position (-> self root trans))
(set! (-> self sound-flag) #t)
)
((-> self sound-flag)
(sound-play "cas-valve-stop")
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(set! (-> self sound-flag) #f)
)
)
@@ -1643,7 +1643,7 @@ This commonly includes things such as:
(set! (-> obj y-delta) -12288.0)
(set! (-> obj y-delta) 12288.0)
)
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(set! (-> obj sound-flag) #f)
(go (method-of-object obj idle))
(none)
@@ -1916,7 +1916,7 @@ This commonly includes things such as:
((sync sync-eased :inline :offset-assert 200)
(rot float :offset-assert 244)
(attack-id uint32 :offset-assert 248)
(sound-id uint32 :offset-assert 252)
(sound-id sound-id :offset-assert 252)
)
:heap-base #x80
:method-count-assert 21
@@ -1995,7 +1995,7 @@ This commonly includes things such as:
(quaternion-vector-angle! (-> self root quat) *y-vector* (-> self rot))
(sound-play
"cas-arm-blade"
:id (the-as sound-id (-> self sound-id))
:id (-> self sound-id)
:position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4))
)
(none)
@@ -2084,14 +2084,14 @@ This commonly includes things such as:
(set! (-> a0-26 param0) cas-rot-blade-callback)
(set! (-> a0-26 param1) obj)
)
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(set! (-> obj draw shadow-ctrl) *cas-rot-blade-shadow-control*)
(go (method-of-object obj idle))
(none)
)
(defmethod deactivate cas-rot-blade ((obj cas-rot-blade))
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method cas-rot-blade 10)) obj)
(none)
)
goal_src/jak2/levels/landing_pad/roboguard-level.gc
+5 -5
View File
@@ -16,7 +16,7 @@
(turning-acc float :offset-assert 660)
(speed float :offset-assert 664)
(roll-attack-count uint32 :offset-assert 668)
(roll-sound uint32 :offset-assert 672)
(roll-sound sound-id :offset-assert 672)
)
:heap-base #x230
:method-count-assert 189
@@ -601,7 +601,7 @@
(none)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self roll-sound)))
(sound-stop (-> self roll-sound))
(if (logtest? (-> self enemy-flags) (enemy-flag check-water))
(logior! (-> self focus-status) (focus-status dangerous))
(logclear! (-> self focus-status) (focus-status dangerous))
@@ -610,7 +610,7 @@
)
:trans (behavior ()
(let ((a0-0 (static-sound-spec "robo-roll")))
(sound-play-by-spec a0-0 (the-as sound-id (-> self roll-sound)) (-> self root-override2 trans))
(sound-play-by-spec a0-0 (-> self roll-sound) (-> self root-override2 trans))
)
(cond
((logtest? (-> self flags) 64)
@@ -1239,7 +1239,7 @@
)
(defmethod deactivate roboguard-level ((obj roboguard-level))
(sound-stop (the-as sound-id (-> obj roll-sound)))
(sound-stop (-> obj roll-sound))
((the-as (function nav-enemy none) (find-parent-method roboguard-level 10)) obj)
(none)
)
@@ -1349,7 +1349,7 @@
(set! (-> v1-18 nav callback-info) (-> v1-18 enemy-info-override callback-info))
)
0
(set! (-> obj roll-sound) (the-as uint (new-sound-id)))
(set! (-> obj roll-sound) (new-sound-id))
(set! (-> obj flags) (the-as uint 0))
0
(none)
goal_src/jak2/levels/mars_tomb/left/chase/target-indax.gc
+1 -1
View File
@@ -448,7 +448,7 @@
(defstate target-indax-start (target)
:event target-standard-event-handler
:code (behavior ()
:code (behavior ((arg0 handle))
(target-indax-init)
(go target-indax-stance)
(none)
goal_src/jak2/levels/mars_tomb/left/chase/tomb-boulder.gc
+5 -5
View File
@@ -350,7 +350,7 @@
((root-override collide-shape-moving :offset 128)
(art-name string :offset-assert 200)
(anim spool-anim :offset-assert 204)
(loop-id uint32 :offset-assert 208)
(loop-id sound-id :offset-assert 208)
(spider (pointer tomb-spider) :offset-assert 212)
(explode (pointer process) :offset-assert 216)
(stick basic :offset-assert 220)
@@ -733,7 +733,7 @@
(remove-process *gui-control* self (gui-channel art-load-next))
(let ((v1-5 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-5 command) (sound-command set-param))
(set! (-> v1-5 id) (the-as sound-id (-> self loop-id)))
(set! (-> v1-5 id) (-> self loop-id))
(set! (-> v1-5 params volume) -4)
(set! (-> v1-5 auto-time) 240)
(set! (-> v1-5 auto-from) 2)
@@ -1059,10 +1059,10 @@
)
(seek! (-> self target-speed) f30-3 (-> self clock seconds-per-frame))
(when (or (!= (-> self target-speed) (-> self current-speed))
(>= (- (-> self clock frame-counter) (-> self speed-time)) (seconds 0.2))
(>= (- (current-time) (-> self speed-time)) (seconds 0.2))
)
(set! (-> self current-speed) (-> self target-speed))
(set! (-> self speed-time) (-> self clock frame-counter))
(set! (-> self speed-time) (current-time))
(when *sound-player-enable*
(let ((v1-151 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-151 command) (sound-command set-param))
@@ -1130,7 +1130,7 @@ This commonly includes things such as:
)
(logior! (-> obj skel status) (joint-control-status sync-math))
(set! (-> obj art-name) "tomb-boulder")
(set! (-> obj loop-id) (the-as uint (new-sound-id)))
(set! (-> obj loop-id) (new-sound-id))
(set! (-> obj target-pause) #f)
(set! (-> obj current-pause) #f)
(set-vector! (-> obj dir) 1.0 0.0 0.0 1.0)
goal_src/jak2/levels/mars_tomb/tomb-obs.gc
+22 -22
View File
@@ -349,8 +349,8 @@ This commonly includes things such as:
(initial-y float :offset-assert 200)
(spike-info tomb-stair-block-spike-info 4 :inline :offset 208)
(camera-state int32 :offset 336)
(sink-sound uint32 :offset 340)
(rise-sound uint32 :offset 344)
(sink-sound sound-id :offset 340)
(rise-sound sound-id :offset 344)
)
:heap-base #xe0
:method-count-assert 25
@@ -583,21 +583,21 @@ This commonly includes things such as:
(set-action!
*gui-control*
(gui-action play)
(the-as sound-id (-> self sink-sound))
(-> self sink-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(set-falloff! *gui-control* (the-as sound-id (-> self sink-sound)) #t -1 200 2)
(set-falloff! *gui-control* (-> self sink-sound) #t -1 200 2)
(go-virtual sink)
)
)
)
:enter (behavior ()
(set! (-> self sink-sound)
(the-as uint (add-process *gui-control* self (gui-channel jak) (gui-action queue) "tombpltb" -99.0 0))
(add-process *gui-control* self (gui-channel jak) (gui-action queue) "tombpltb" -99.0 0)
)
(set! (-> self camera-state) 0)
0
@@ -637,7 +637,7 @@ This commonly includes things such as:
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id (-> self sink-sound))
(-> self sink-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
@@ -687,14 +687,14 @@ This commonly includes things such as:
(set-action!
*gui-control*
(gui-action play)
(the-as sound-id (-> self rise-sound))
(-> self rise-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(set-falloff! *gui-control* (the-as sound-id (-> self rise-sound)) #t -1 200 2)
(set-falloff! *gui-control* (-> self rise-sound) #t -1 200 2)
(go-virtual moving)
)
)
@@ -704,7 +704,7 @@ This commonly includes things such as:
(ja-channel-push! 1 (seconds 2))
(ja :group! (-> self draw art-group data 3) :num! min)
(set! (-> self rise-sound)
(the-as uint (add-process *gui-control* self (gui-channel jak) (gui-action queue) "tombplta" -99.0 0))
(add-process *gui-control* self (gui-channel jak) (gui-action queue) "tombplta" -99.0 0)
)
(set! sv-16 (new 'static 'res-tag))
(let ((gp-1 (res-lump-data (-> self entity) 'actor-groups (pointer actor-group) :tag-ptr (& sv-16))))
@@ -903,8 +903,8 @@ This commonly includes things such as:
)
(set! (-> s5-3 frame-num) 0.0)
)
(set! (-> obj rise-sound) (the-as uint (new-sound-id)))
(set! (-> obj sink-sound) (the-as uint (new-sound-id)))
(set! (-> obj rise-sound) (new-sound-id))
(set! (-> obj sink-sound) (new-sound-id))
(go (method-of-object obj wait-for-pools))
(none)
)
@@ -1421,7 +1421,7 @@ This commonly includes things such as:
(path-pos float :offset-assert 292)
(dest-pos float :offset-assert 296)
(path-speed float :offset-assert 300)
(sound-id uint32 :offset-assert 304)
(sound-id sound-id :offset-assert 304)
)
:heap-base #xc0
:method-count-assert 39
@@ -1471,7 +1471,7 @@ This commonly includes things such as:
(none)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(none)
)
:trans (behavior ()
@@ -1484,7 +1484,7 @@ This commonly includes things such as:
)
:code (the-as (function none :behavior tomb-plat-return) sleep-code)
:post (behavior ()
(sound-play "tomb-plat-ret" :id (the-as sound-id (-> self sound-id)) :position (-> self root-override trans))
(sound-play "tomb-plat-ret" :id (-> self sound-id) :position (-> self root-override trans))
(seek! (-> self path-pos) 1.0 (* 2.0 (-> self clock seconds-per-frame) (-> self path-speed)))
(let ((f30-0 (-> self path-pos)))
(get-point-at-percent-along-path!
@@ -1555,7 +1555,7 @@ This commonly includes things such as:
)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(none)
)
:trans (behavior ()
@@ -1567,7 +1567,7 @@ This commonly includes things such as:
)
:code (the-as (function none :behavior tomb-plat-return) sleep-code)
:post (behavior ()
(sound-play "tomb-plat-ret" :id (the-as sound-id (-> self sound-id)) :position (-> self root-override trans))
(sound-play "tomb-plat-ret" :id (-> self sound-id) :position (-> self root-override trans))
(seek! (-> self path-pos) (-> self dest-pos) (* (-> self path-speed) (-> self clock seconds-per-frame)))
(get-point-at-percent-along-path!
(-> self path)
@@ -1623,7 +1623,7 @@ This commonly includes things such as:
)
(defmethod deactivate tomb-plat-return ((obj tomb-plat-return))
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method tomb-plat-return 10)) obj)
(none)
)
@@ -1688,7 +1688,7 @@ This commonly includes things such as:
(set! (-> obj path-speed) (/ (res-lump-float arg0 'speed :default 40960.0) f30-0))
(set! (-> obj root-override pause-adjust-distance) (+ 204800.0 f30-0))
)
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(init-plat! obj)
(if (or (task-closed? (the-as string ((method-of-type res-lump get-property-struct)
(-> obj entity)
@@ -1789,7 +1789,7 @@ This commonly includes things such as:
(deftype tomb-sphinx (process-drawable)
((root-override collide-shape-moving :offset 128)
(target-actor entity-actor :offset-assert 200)
(sound-id uint32 :offset-assert 204)
(sound-id sound-id :offset-assert 204)
(move-dir float :offset 216)
)
:heap-base #x60
@@ -1878,7 +1878,7 @@ This commonly includes things such as:
)
(let ((s3-1 (new 'stack-no-clear 'vector)))
(vector-segment-distance-point! (ear-trans 0) s5-1 s4-0 s3-1)
(sound-play "tomb-lasr-loop" :id (the-as sound-id (-> self sound-id)) :position s3-1)
(sound-play "tomb-lasr-loop" :id (-> self sound-id) :position s3-1)
)
(suspend)
;; WORKAROUND for GOAL bug - vf0 is clobbered on suspend.
@@ -1982,7 +1982,7 @@ This commonly includes things such as:
)
(defmethod deactivate tomb-sphinx ((obj tomb-sphinx))
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method tomb-sphinx 10)) obj)
(none)
)
@@ -1998,7 +1998,7 @@ This commonly includes things such as:
(set! (-> obj root-override) (the-as collide-shape-moving (new 'process 'trsqv)))
(process-drawable-from-entity! obj arg0)
(set! (-> obj target-actor) (entity-actor-lookup arg0 'alt-actor 0))
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(set! (-> obj move-dir) 0.0)
(if (and (task-complete? *game-info* (-> obj entity task))
(not (task-node-closed? (game-task-node tomb-boss-door)))
goal_src/jak2/levels/mars_tomb/widow-baron.gc
+14 -14
View File
@@ -269,17 +269,17 @@
(green-fire-part sparticle-launch-control :offset-assert 868)
(lightning lightning-control 5 :offset-assert 872)
(stop-catwalk-sound symbol :offset-assert 892)
(catwalk-sound uint32 :offset-assert 896)
(drill-sound uint32 :offset-assert 900)
(catwalk-sound sound-id :offset-assert 896)
(drill-sound sound-id :offset-assert 900)
(drill-sound-playing symbol :offset-assert 904)
(drill-sweeten-sound uint32 :offset-assert 908)
(drill-sweeten-sound sound-id :offset-assert 908)
(drill-sweeten-sound-playing symbol :offset-assert 912)
(movie-handle handle :offset-assert 920)
(tilt cam-float-seeker :inline :offset-assert 928)
(targetted-catwalk int32 :offset-assert 952)
(hover-sound uint32 :offset-assert 956)
(hover-sound sound-id :offset-assert 956)
(hover-sound-playing symbol :offset-assert 960)
(shake-sound uint32 :offset-assert 964)
(shake-sound sound-id :offset-assert 964)
(shake-sound-playing symbol :offset-assert 968)
(hud handle :offset-assert 976)
(last-want-stone-talker int8 :offset-assert 984)
@@ -587,7 +587,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 5)))
(if (>= v1-9 (-> self last-want-stone-talker))
@@ -625,7 +625,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 4)))
(if (>= v1-9 (-> self last-general-flying-talker))
@@ -660,7 +660,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 4)))
(if (>= v1-9 (-> self last-launch-droids-talker))
@@ -695,7 +695,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 5)))
(if (>= v1-9 (-> self last-launch-bombs-talker))
@@ -733,7 +733,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 10)))
(if (>= v1-9 (-> self last-shoot-gun-talker))
@@ -786,7 +786,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 5)))
(if (>= v1-9 (-> self last-stone-charge-up-talker))
@@ -824,7 +824,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 5)))
(if (>= v1-9 (-> self last-after-stone-shot-talker))
@@ -862,7 +862,7 @@ This commonly includes things such as:
(< f30-0 (+ -1.0 (the-as float v1-5)))
)
)
(return (the-as int #f))
(return (the-as sound-id #f))
)
(let ((v1-9 (rand-vu-int-count 4)))
(if (>= v1-9 (-> self last-leave-perch-talker))
@@ -895,7 +895,7 @@ This commonly includes things such as:
(v1-3 (the-as number (logior #x3f800000 v1-2)))
)
(if (< f30-0 (+ -1.0 (the-as float v1-3)))
(return (the-as int #f))
(return (the-as sound-id #f))
)
)
(let ((v1-7 (rand-vu-int-count 11)))
goal_src/jak2/levels/mars_tomb/widow-extras.gc
+5 -5
View File
@@ -562,7 +562,7 @@ This commonly includes things such as:
(y-rotate float :offset-assert 376)
(spin-jm joint-mod :offset-assert 380)
(firework-sound-played symbol :offset-assert 384)
(steam-sound uint32 :offset-assert 388)
(steam-sound sound-id :offset-assert 388)
(launch vector :inline :offset-assert 400)
(launch-pos vector :inline :offset-assert 416)
(fizzle-timer time-frame :offset-assert 432)
@@ -929,7 +929,7 @@ This commonly includes things such as:
(defmethod widow-bomb-method-32 widow-bomb ((obj widow-bomb))
(spawn-with-cspace (-> obj part) (-> obj node-list data 3))
(sound-play "w-bomb-steam" :id (the-as sound-id (-> obj steam-sound)) :position (-> obj root-override trans))
(sound-play "w-bomb-steam" :id (-> obj steam-sound) :position (-> obj root-override trans))
(let ((s5-0 (the-as int (- (current-time) (-> obj state-time)))))
(if (nonzero? (-> obj fizzle-timer))
(set! s5-0
@@ -983,11 +983,11 @@ This commonly includes things such as:
)
(set! (-> self next-countdown-tick) (the-as time-frame (- v1-3 (mod v1-3 (* a0-0 a0-0)))))
)
(set! (-> self steam-sound) (the-as uint (new-sound-id)))
(set! (-> self steam-sound) (new-sound-id))
(none)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self steam-sound)))
(sound-stop (-> self steam-sound))
(none)
)
:trans (behavior ()
@@ -1338,7 +1338,7 @@ This commonly includes things such as:
(logclear! (-> self mask) (process-mask actor-pause))
(set! (-> self spin-jm) (new 'process 'joint-mod (joint-mod-mode joint-set*) self 3))
(set! (-> self firework-sound-played) #f)
(set! (-> self steam-sound) (the-as uint 0))
(set! (-> self steam-sound) (new 'static 'sound-id))
(set! (-> self launch-pos quad) (-> self root-override trans quad))
(set! (-> self launch quad) (-> arg4 quad))
(set! (-> self fizzle-timer) 0)
goal_src/jak2/levels/mars_tomb/widow.gc
+83 -89
View File
@@ -48,7 +48,7 @@
((< 0.001 f30-0)
(sound-play-by-name
(static-sound-name "widow-drill")
(the-as sound-id (-> self drill-sound))
(-> self drill-sound)
(the int (* 1024.0 f30-0))
(the int (* 1524.0 (* 0.5 (+ -1.0 f30-0))))
0
@@ -58,7 +58,7 @@
(set! (-> self drill-sound-playing) #t)
)
((-> self drill-sound-playing)
(sound-stop (the-as sound-id (-> self drill-sound)))
(sound-stop (-> self drill-sound))
(set! (-> self drill-sound-playing) #f)
)
)
@@ -73,13 +73,13 @@
((< 0.001 f30-1)
(sound-play
"widow-dril-swtn"
:id (the-as sound-id (-> self drill-sweeten-sound))
:id (-> self drill-sweeten-sound)
:position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 11))
)
(set! (-> self drill-sweeten-sound-playing) #t)
)
((-> self drill-sweeten-sound-playing)
(sound-stop (the-as sound-id (-> self drill-sweeten-sound)))
(sound-stop (-> self drill-sweeten-sound))
(set! (-> self drill-sweeten-sound-playing) #f)
)
)
@@ -88,7 +88,7 @@
((-> self flying)
(sound-play-by-name
(static-sound-name "widow-hover")
(the-as sound-id (-> self hover-sound))
(-> self hover-sound)
(the int (* 1024.0 (lerp-scale 0.5 1.0 (-> self osc value y) -20480.0 -4096.0)))
0
0
@@ -98,7 +98,7 @@
(set! (-> self hover-sound-playing) #t)
)
((-> self hover-sound-playing)
(sound-stop (the-as sound-id (-> self hover-sound)))
(sound-stop (-> self hover-sound))
(set! (-> self hover-sound-playing) #f)
)
)
@@ -127,7 +127,7 @@
)
)
(when (and (nonzero? (-> self extract-stone-time))
(< (- (-> self clock frame-counter) (-> self extract-stone-time)) (seconds 2))
(< (- (current-time) (-> self extract-stone-time)) (seconds 2))
(nonzero? (-> self extract-stone-part))
)
(let ((gp-6 (new 'stack-no-clear 'vector)))
@@ -136,7 +136,7 @@
)
)
(when (and (nonzero? (-> self insert-stone-time))
(< (- (-> self clock frame-counter) (-> self insert-stone-time)) (seconds 2))
(< (- (current-time) (-> self insert-stone-time)) (seconds 2))
(nonzero? (-> self insert-stone-part))
)
(let ((s5-5 (handle->process (-> self pod))))
@@ -319,14 +319,14 @@
)
(defbehavior spydroid-setup widow ()
(set! (-> self state-time) (+ (-> self clock frame-counter) (seconds -0.247)))
(set! (-> self state-time) (+ (current-time) (seconds -0.247)))
(set! (-> self next-launch) -1)
(set! (-> self next-jumper) -1)
(none)
)
(defbehavior widow-bomb-setup widow ()
(set! (-> self state-time) (+ (-> self clock frame-counter) (seconds -0.247)))
(set! (-> self state-time) (+ (current-time) (seconds -0.247)))
(set! (-> self next-launch) -1)
(none)
)
@@ -342,7 +342,7 @@
0
)
((>= (-> self next-launch) 0)
(when (and (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.25))
(when (and (>= (- (current-time) (-> self state-time)) (seconds 0.25))
(let ((v1-24 (ja-group)))
(not (and v1-24 (= v1-24 (-> self draw art-group data 18))))
)
@@ -424,7 +424,7 @@
:to *entity-pool*
)
)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(let* ((s5-3 (-> self state-time))
(f30-1 75.0)
(v1-89 (/ (the-as int (rand-uint31-gen *random-generator*)) 256))
@@ -497,7 +497,7 @@
0
)
((>= (-> self next-launch) 0)
(when (and (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.25))
(when (and (>= (- (current-time) (-> self state-time)) (seconds 0.25))
(let ((v1-8 (ja-group)))
(not (and v1-8 (= v1-8 (-> self draw art-group data 18))))
)
@@ -569,7 +569,7 @@
:to *entity-pool*
)
)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(let* ((s3-3 (-> self state-time))
(f30-1 75.0)
(v1-68 (/ (the-as int (rand-uint31-gen *random-generator*)) 256))
@@ -684,9 +684,9 @@
(dotimes (gp-0 2)
(cond
((handle->process (-> self ammos gp-0))
(set! (-> self ammo-timers gp-0) (-> self clock frame-counter))
(set! (-> self ammo-timers gp-0) (current-time))
)
((>= (- (-> self clock frame-counter) (-> self ammo-timers gp-0)) (seconds 20))
((>= (- (current-time) (-> self ammo-timers gp-0)) (seconds 20))
(let ((s4-0 (new 'static 'fact-info))
(s5-0 (new 'stack-no-clear 'vector))
)
@@ -717,7 +717,7 @@
(let ((v1-32 (handle->process (-> self ammos gp-0))))
(when v1-32
(logclear! (-> (the-as collectable v1-32) flags) (collectable-flag fadeout))
(set! (-> self ammo-timers gp-0) (-> self clock frame-counter))
(set! (-> self ammo-timers gp-0) (current-time))
)
)
)
@@ -899,15 +899,12 @@
(defbehavior widow-kaboom-check widow ((arg0 symbol))
(if (and arg0
(>= (-> self bomb-hits) 4)
(or (not *target*) (zero? (logand (-> *target* focus-status) (focus-status dead))))
(or (not *target*) (not (logtest? (-> *target* focus-status) (focus-status dead))))
)
(go-virtual kaboom)
)
(if (>= (-> self bomb-hits) 3)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
'(want-anim "tomb-boss-res")
)
(script-eval '(want-anim "tomb-boss-res"))
)
(none)
)
@@ -918,7 +915,7 @@
(ja-channel-set! 0)
(ja-post)
(when (-> self hover-sound-playing)
(sound-stop (the-as sound-id (-> self hover-sound)))
(sound-stop (-> self hover-sound))
(set! (-> self hover-sound-playing) #f)
)
(send-event (handle->process (-> self hud)) 'hide-and-die)
@@ -934,9 +931,9 @@
(defstate kaboom (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set-setting! 'music #f 0 0)
(set-setting! 'music #f 0.0 0)
(dotimes (gp-0 8)
(let ((a0-2 (handle->process (-> self bomb gp-0))))
(if a0-2
@@ -995,7 +992,7 @@
(defstate hover-low-stage-3 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self osc target y) -122880.0)
(set! (-> self attack-from-high-deg) (not (-> self attack-from-high-deg)))
@@ -1019,14 +1016,14 @@
(defstate hover-shooting-stage-3 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-shoot-gun-talker)
(ja-channel-push! 1 (seconds 0.02))
(ja :group! (-> self draw art-group data 15) :num! min)
(set! (-> self which-gun) 0)
(set! (-> self flying) #t)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(none)
)
:exit (behavior ()
@@ -1070,7 +1067,7 @@
)
)
(set! v1-5 (and (< (fabs (- (-> self osc value z) (-> self osc target z))) 1024.0)
(and (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.007)) v1-5)
(and (>= (- (current-time) (-> self state-time)) (seconds 0.007)) v1-5)
)
)
(if v1-5
@@ -1119,7 +1116,7 @@
(defstate hover-launch-bombs-stage-3 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-launch-bombs-talker)
(set! (-> self osc target x) 135168.0)
@@ -1145,7 +1142,7 @@
((or (< (widow-bomb-slots-full) 2) (not (-> self launched-a-bomb)))
(widow-bomb-launch (-> self flying) #f #t)
)
((>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 2.25))
((>= (- (current-time) (-> self state-time)) (seconds 2.25))
(go-virtual hover-shooting-stage-3)
)
(else
@@ -1171,7 +1168,7 @@
(defstate hover-big-blast-stage-3 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self state-time) 0)
(let* ((f0-1 (* 0.08488264 (-> self osc value z)))
@@ -1185,7 +1182,7 @@
(widow-stone-charge-up-talker)
(set! (-> self stop-catwalk-sound) #t)
(set! (-> self catwalk-sound)
(the-as uint (add-process *gui-control* self (gui-channel jak) (gui-action queue) "cwlkfall" -99.0 0))
(add-process *gui-control* self (gui-channel jak) (gui-action queue) "cwlkfall" -99.0 0)
)
)
(else
@@ -1224,14 +1221,14 @@
)
)
(when (-> self shake-sound-playing)
(sound-stop (the-as sound-id (-> self shake-sound)))
(sound-stop (-> self shake-sound))
(set! (-> self shake-sound-playing) #f)
)
(if (-> self stop-catwalk-sound)
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id (-> self catwalk-sound))
(-> self catwalk-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
@@ -1258,23 +1255,23 @@
)
)
((zero? (-> self state-time))
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(sound-play "widow-charge")
)
((>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 3))
((>= (- (current-time) (-> self state-time)) (seconds 3))
(widow-after-stone-shot-talker)
(set! (-> self stop-catwalk-sound) #f)
(set-action!
*gui-control*
(gui-action play)
(the-as sound-id (-> self catwalk-sound))
(-> self catwalk-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(set-falloff! *gui-control* (the-as sound-id (-> self catwalk-sound)) #t -1 200 2)
(set-falloff! *gui-control* (-> self catwalk-sound) #t -1 200 2)
(activate! *camera-smush-control* 1228.8 75 270 1.0 0.5 (-> self clock))
(send-event (handle->process (-> self catwalk (-> self targetted-catwalk))) 'green-hit)
(go-virtual hover-launch-bombs-stage-3)
@@ -1288,15 +1285,15 @@
(when sv-256
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (-> sv-256 node-list data 4))))
(cond
((>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 2))
((>= (- (current-time) (-> self state-time)) (seconds 2))
(when (-> self shake-sound-playing)
(sound-stop (the-as sound-id (-> self shake-sound)))
(sound-stop (-> self shake-sound))
(set! (-> self shake-sound-playing) #f)
)
)
(else
(spawn (-> self green-charge-part) gp-1)
(sound-play "widow-shake" :id (the-as sound-id (-> self shake-sound)) :position gp-1)
(sound-play "widow-shake" :id (-> self shake-sound) :position gp-1)
(set! (-> self shake-sound-playing) #t)
)
)
@@ -1316,7 +1313,7 @@
(vector-reset! (-> s0-0 trans))
(set-vector! s4-0 (-> s1-0 z) 0.0 (- (-> s1-0 x)) 1.0)
(vector-normalize! s4-0 409.6)
(when (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 2))
(when (>= (- (current-time) (-> self state-time)) (seconds 2))
(set! sv-272 (the-as symbol #f))
(set! sv-288 0)
(while (< sv-288 5)
@@ -1391,11 +1388,11 @@
(defstate hover-rise-stage-3 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self osc target x) 135168.0)
(set! (-> self flying) #t)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(set! (-> self osc damping) 0.9)
(set! (-> self old-bomb-hits) (-> self bomb-hits))
(none)
@@ -1406,7 +1403,7 @@
(let ((gp-0 (widow-calc-target-position (new 'stack-no-clear 'vector))))
(set! (-> self osc target y) (-> gp-0 y))
(when (< (+ -10240.0 (-> self osc target y)) (-> self osc value y))
(if (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.007))
(if (>= (- (current-time) (-> self state-time)) (seconds 0.007))
(go-virtual hover-big-blast-stage-3)
)
)
@@ -1426,11 +1423,11 @@
)
(defstate hover-seek-under-stage-3 (widow)
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self osc target x) 135168.0)
(set! (-> self flying) #t)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(none)
)
:trans (behavior ()
@@ -1442,7 +1439,7 @@
)
)
(if (and (< (fabs (- (-> self osc value z) (-> self osc target z))) 8192.0)
(>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.007))
(>= (- (current-time) (-> self state-time)) (seconds 0.007))
)
(go-virtual hover-rise-stage-3)
)
@@ -1458,10 +1455,10 @@
(defstate hover-jump-down-stage-3 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-leave-perch-talker)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(ja-channel-push! 1 (seconds 1.5))
(ja :group! (-> self draw art-group data 5) :num! min)
(let ((gp-1 (widow-calc-target-position (new 'stack-no-clear 'vector))))
@@ -1488,10 +1485,10 @@
(ja :num! (loop!))
(compute-trans-at-time
(-> self traj)
(the float (min 450 (- (-> self clock frame-counter) (-> self state-time))))
(the float (min 450 (- (current-time) (-> self state-time))))
(-> self root trans)
)
(if (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 1.5))
(if (>= (- (current-time) (-> self state-time)) (seconds 1.5))
(go hover-seek-under-stage-3)
)
(quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (+ 32768.0 (-> self theta value)))
@@ -1504,7 +1501,7 @@
(defstate big-reaction-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(talker-spawn-func (-> *talker-speech* 302) *entity-pool* (target-pos 0) (the-as region #f))
(dotimes (gp-1 8)
@@ -1519,7 +1516,7 @@
(set! (-> self flying) #f)
(ja-channel-push! 1 (seconds 0.02))
(ja :group! (-> self draw art-group data 4) :num! min)
(set! (-> self extract-stone-time) (-> self clock frame-counter))
(set! (-> self extract-stone-time) (current-time))
(none)
)
:exit (behavior ()
@@ -1541,7 +1538,7 @@
(send-event (ppointer->process (-> self baron)) 'frame f30-0)
(send-event (handle->process (-> self heart)) 'frame f30-0)
(if (and (zero? (-> self insert-stone-time)) (>= f30-0 827.0))
(set! (-> self insert-stone-time) (-> self clock frame-counter))
(set! (-> self insert-stone-time) (current-time))
)
)
(if (ja-done? 0)
@@ -1556,7 +1553,7 @@
(defstate watch-bombs-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self flying) #f)
(none)
@@ -1591,7 +1588,7 @@
(defstate launch-bombs-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-launch-bombs-talker)
(widow-bomb-setup)
@@ -1621,9 +1618,9 @@
(defstate back-to-perch-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(ja-channel-push! 1 (seconds 1))
(ja :group! (-> self draw art-group data 6) :num! min)
(let ((a2-1 (new 'stack-no-clear 'vector))
@@ -1646,7 +1643,7 @@
:trans (behavior ()
(compute-trans-at-time
(-> self traj)
(the float (min 300 (- (-> self clock frame-counter) (-> self state-time))))
(the float (min 300 (- (current-time) (-> self state-time))))
(-> self root trans)
)
(quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (+ 32768.0 (-> self theta value)))
@@ -1654,7 +1651,7 @@
(cond
((and v1-9 (= v1-9 (-> self draw art-group data 6)))
(ja :num! (seek!))
(when (and (ja-done? 0) (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 1)))
(when (and (ja-done? 0) (>= (- (current-time) (-> self state-time)) (seconds 1)))
(ja-channel-push! 1 (seconds 0.02))
(ja :group! (-> self draw art-group data 7) :num! min)
(set! (-> self flying) #f)
@@ -1694,7 +1691,7 @@
(defstate hover-low-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self osc target y) -122880.0)
(let* ((v1-2 (/ (the-as int (rand-uint31-gen *random-generator*)) 256))
@@ -1705,7 +1702,7 @@
)
)
(set! (-> self flying) #t)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(none)
)
:trans (behavior ()
@@ -1718,7 +1715,7 @@
((zero? (widow-bomb-slots-full))
(go-virtual back-to-perch-stage-2)
)
((>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.007))
((>= (- (current-time) (-> self state-time)) (seconds 0.007))
(go-virtual hover-seek-under-stage-2)
)
)
@@ -1747,14 +1744,14 @@
(defstate hover-shooting-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-shoot-gun-talker)
(ja-channel-push! 1 (seconds 0.02))
(ja :group! (-> self draw art-group data 15) :num! min)
(set! (-> self which-gun) 0)
(set! (-> self flying) #t)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(+! (-> self current-shoot-stage) 1)
(none)
)
@@ -1792,7 +1789,7 @@
)
)
(set! v1-5 (and (< (fabs (- (-> self osc value z) (-> self osc target z))) 1024.0)
(and (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.007)) v1-5)
(and (>= (- (current-time) (-> self state-time)) (seconds 0.007)) v1-5)
)
)
(if v1-5
@@ -1842,11 +1839,11 @@
(defstate hover-rise-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self osc target x) 135168.0)
(set! (-> self flying) #t)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(none)
)
:trans (behavior ()
@@ -1856,7 +1853,7 @@
(let ((gp-0 (widow-calc-target-position (new 'stack-no-clear 'vector))))
(set! (-> self osc target y) (-> gp-0 y))
(when (and (< (+ -10240.0 (-> self osc target y)) (-> self osc value y))
(>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.007))
(>= (- (current-time) (-> self state-time)) (seconds 0.007))
)
(let* ((v1-13 (/ (the-as int (rand-uint31-gen *random-generator*)) 256))
(v1-14 (the-as number (logior #x3f800000 v1-13)))
@@ -1885,11 +1882,11 @@
(defstate hover-seek-under-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self osc target x) 135168.0)
(set! (-> self flying) #t)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(none)
)
:trans (behavior ()
@@ -1904,7 +1901,7 @@
)
)
(if (and (< (fabs (- (-> self osc value z) (-> self osc target z))) 8192.0)
(>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.007))
(>= (- (current-time) (-> self state-time)) (seconds 0.007))
)
(go-virtual hover-rise-stage-2)
)
@@ -1921,10 +1918,10 @@
(defstate hover-jump-down-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-leave-perch-talker)
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self state-time) (current-time))
(set! (-> self drill-speed target) 0.0)
(ja-channel-push! 1 (seconds 1.5))
(ja :group! (-> self draw art-group data 5) :num! min)
@@ -1949,10 +1946,10 @@
(widow-flying-anim)
(compute-trans-at-time
(-> self traj)
(the float (min 450 (- (-> self clock frame-counter) (-> self state-time))))
(the float (min 450 (- (current-time) (-> self state-time))))
(-> self root trans)
)
(if (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 1.5))
(if (>= (- (current-time) (-> self state-time)) (seconds 1.5))
(go-virtual hover-seek-under-stage-2)
)
(quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (+ 32768.0 (-> self theta value)))
@@ -1966,7 +1963,7 @@
(defstate launch-droids-stage-2 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-launch-droids-talker)
(spydroid-setup)
@@ -1996,7 +1993,7 @@
(defstate big-reaction-stage-1 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(dotimes (gp-0 8)
(let ((a0-1 (handle->process (-> self bomb gp-0))))
@@ -2042,7 +2039,7 @@
(defstate watch-bombs-stage-1 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self flying) #f)
(none)
@@ -2074,7 +2071,7 @@
(defstate launch-bombs-stage-1 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(if (and (< (-> self kicked-bombs) 2) (>= (-> self launch-stages-completed) 1))
(talker-spawn-func (-> *talker-speech* 303) *entity-pool* (target-pos 0) (the-as region #f))
@@ -2105,7 +2102,7 @@
(defstate watch-droids-stage-1 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(set! (-> self flying) #f)
(none)
@@ -2135,7 +2132,7 @@
(defstate launch-droids-stage-1 (widow)
:virtual #t
:event (the-as (function process int symbol event-message-block object :behavior widow) widow-handler)
:event widow-handler
:enter (behavior ()
(widow-launch-droids-talker)
(let ((gp-0 (new 'stack-no-clear 'event-message-block)))
@@ -2211,10 +2208,7 @@
)
)
((< f0-0 409600.0)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
'(want-anim "tomb-boss-intro")
)
(script-eval '(want-anim "tomb-boss-intro"))
)
)
)
@@ -2224,7 +2218,7 @@
(task-node-closed? (game-task-node tomb-boss-introduction))
)
(set! (-> self heart) (ppointer->handle (process-spawn heart-mar (-> self root trans) :to self)))
(set-setting! 'music 'danger7 0 0)
(set-setting! 'music 'danger7 0.0 0)
(go-virtual launch-droids-stage-1)
)
)
goal_src/jak2/levels/mars_tomb/widow2.gc
+9 -9
View File
@@ -113,16 +113,16 @@
(kill-and-free-particles (-> obj green-fire-part))
)
(if (-> obj drill-sound-playing)
(sound-stop (the-as sound-id (-> obj drill-sound)))
(sound-stop (-> obj drill-sound))
)
(if (-> obj drill-sweeten-sound-playing)
(sound-stop (the-as sound-id (-> obj drill-sweeten-sound)))
(sound-stop (-> obj drill-sweeten-sound))
)
(if (-> obj hover-sound-playing)
(sound-stop (the-as sound-id (-> obj hover-sound)))
(sound-stop (-> obj hover-sound))
)
(if (-> obj shake-sound-playing)
(sound-stop (the-as sound-id (-> obj shake-sound)))
(sound-stop (-> obj shake-sound))
)
((method-of-type process-drawable deactivate) obj)
(none)
@@ -366,14 +366,14 @@ This commonly includes things such as:
(set! (-> v1-148 state mode) (the-as lightning-mode a0-97))
)
)
(set! (-> obj catwalk-sound) (the-as uint (new-sound-id)))
(set! (-> obj drill-sound) (the-as uint (new-sound-id)))
(set! (-> obj catwalk-sound) (new-sound-id))
(set! (-> obj drill-sound) (new-sound-id))
(set! (-> obj drill-sound-playing) #f)
(set! (-> obj drill-sweeten-sound) (the-as uint (new-sound-id)))
(set! (-> obj drill-sweeten-sound) (new-sound-id))
(set! (-> obj drill-sweeten-sound-playing) #f)
(set! (-> obj hover-sound) (the-as uint (new-sound-id)))
(set! (-> obj hover-sound) (new-sound-id))
(set! (-> obj hover-sound-playing) #f)
(set! (-> obj shake-sound) (the-as uint (new-sound-id)))
(set! (-> obj shake-sound) (new-sound-id))
(set! (-> obj shake-sound-playing) #f)
(set! (-> obj hud) (the-as handle #f))
(set! (-> obj last-want-stone-talker) 0)
goal_src/jak2/levels/palace/boss/squid-extras.gc
+2 -2
View File
@@ -220,11 +220,11 @@
)
)
;; WARN: Return type mismatch int vs sound-id.
(defmethod play-impact-sound! squid-grenade ((obj squid-grenade))
"Plays impact sound"
(ja-post)
(the-as sound-id 0)
0
(none)
)
(defmethod init-proj-collision! squid-grenade ((obj squid-grenade))
goal_src/jak2/levels/strip/strip-obs.gc
+7 -14
View File
@@ -565,7 +565,7 @@ This commonly includes things such as:
:flag-assert #x16008000fc
(:methods
(idle () _type_ :state 20)
(die () _type_ :state 21)
(die (symbol) _type_ :state 21)
)
)
@@ -782,9 +782,7 @@ This commonly includes things such as:
(the-as object (remove-setting! 'entity-name))
)
(('die)
enter-state
#t
(go-virtual die)
(go-virtual die #t)
)
(('kill)
(process-entity-status! self (entity-perm-status subtask-complete) #t)
@@ -864,7 +862,7 @@ This commonly includes things such as:
)
)
)
:code (behavior ()
:code (behavior ((arg0 symbol))
(play-communicator-speech! (-> *talker-speech* 194))
(process-entity-status! self (entity-perm-status subtask-complete) #t)
(kill-and-free-particles (-> self part))
@@ -940,17 +938,12 @@ This commonly includes things such as:
)
(update-transforms (-> obj root-override))
(logclear! (-> obj mask) (process-mask actor-pause))
(cond
((or (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status subtask-complete)))
(task-complete? *game-info* (game-task strip-grenade))
)
enter-state
(go (method-of-object obj die))
)
(else
(if (or (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status subtask-complete)))
(task-complete? *game-info* (game-task strip-grenade))
)
(go (method-of-object obj die) #f)
(go (method-of-object obj idle))
)
)
(none)
)
goal_src/jak2/levels/temple/mountain-obs.gc
+4 -4
View File
@@ -2009,7 +2009,7 @@ This commonly includes things such as:
((art-name symbol :offset-assert 200)
(anim spool-anim :offset-assert 204)
(rock-data vector-array :offset-assert 208)
(loop-id uint32 :offset-assert 212)
(loop-id sound-id :offset-assert 212)
(volume float :offset-assert 216)
)
:heap-base #x60
@@ -2259,7 +2259,7 @@ This commonly includes things such as:
(remove-process *gui-control* self (gui-channel art-load-next))
(let ((v1-10 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-10 command) (sound-command set-param))
(set! (-> v1-10 id) (the-as sound-id (-> self loop-id)))
(set! (-> v1-10 id) (-> self loop-id))
(set! (-> v1-10 params volume) -4)
(set! (-> v1-10 auto-time) 240)
(set! (-> v1-10 auto-from) 2)
@@ -2320,7 +2320,7 @@ This commonly includes things such as:
)
(sound-play-by-name
(static-sound-name "mtn-aval-loop")
(the-as sound-id (-> self loop-id))
(-> self loop-id)
(the int (* 1024.0 (-> self volume)))
0
0
@@ -2527,7 +2527,7 @@ This commonly includes things such as:
(set! (-> obj anim)
(new 'static 'spool-anim :name "mtn-aval-rocks-1" :anim-name "1-fall" :parts 8 :command-list '())
)
(set! (-> obj loop-id) (the-as uint (new-sound-id)))
(set! (-> obj loop-id) (new-sound-id))
(set! (-> obj rock-data) (new 'process 'vector-array (-> obj node-list length)))
(dotimes (v1-42 (-> obj node-list length))
(let* ((a0-21 *game-info*)
goal_src/jak2/levels/underport/jellyfish.gc
+6 -6
View File
@@ -154,7 +154,7 @@
(deftype jellyfish (hover-enemy)
((los los-control :inline :offset-assert 784)
(sync sync-eased :inline :offset-assert 936)
(sound-id uint32 :offset-assert 980)
(sound-id sound-id :offset-assert 980)
(path-player-u float :offset-assert 984)
(path-my-u float :offset-assert 988)
(path-y-offset float :offset-assert 992)
@@ -639,7 +639,7 @@
(none)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(hover-enemy-method-147 self)
(let ((v1-3 (-> self root-override2 root-prim)))
(set! (-> v1-3 prim-core collide-as) (-> self root-override2 backup-collide-as))
@@ -753,13 +753,13 @@
(send-event-function gp-3 a1-13)
)
)
(sound-play "squid-attack" :id (the-as sound-id (-> self sound-id)))
(sound-play "squid-attack" :id (-> self sound-id))
(suspend)
(ja :num! (seek!))
)
)
)
(sound-stop (the-as sound-id (-> self sound-id)))
(sound-stop (-> self sound-id))
(set-vector! (-> self grab-offset) 0.0 20480.0 0.0 0.0)
(set! (-> self grab-start-pos quad) (-> self root-override2 trans quad))
(quaternion-copy! (-> self grab-start-quat) (-> self root-override2 quat))
@@ -1255,7 +1255,7 @@
)
(defmethod deactivate jellyfish ((obj jellyfish))
(sound-stop (the-as sound-id (-> obj sound-id)))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method jellyfish 10)) obj)
(none)
)
@@ -1283,7 +1283,7 @@
(new-source! (-> obj los) obj (seconds 1) (collide-spec backgnd enemy obstacle hit-by-others-list))
(set! (-> obj last-fire-time) (current-time))
(set! (-> obj last-attack-time) 0)
(set! (-> obj sound-id) (the-as uint (new-sound-id)))
(set! (-> obj sound-id) (new-sound-id))
(set! (-> obj path) (new 'process 'path-control obj 'path 0.0 (-> obj entity) #f))
(set! (-> obj path-player-u) 0.0)
(set! (-> obj path-my-u) 0.0)
goal_src/jak2/levels/underport/under-obs.gc
+4 -4
View File
@@ -285,7 +285,7 @@
(deftype bubbler (process-drawable)
((rod-of-god-scale float :offset-assert 200)
(ambient-id uint32 :offset-assert 204)
(ambient-id sound-id :offset-assert 204)
(last-recharge-time time-frame :offset-assert 208)
)
:heap-base #x60
@@ -337,7 +337,7 @@
(set! (-> *part-id-table* 2198 init-specs 7 initial-valuef) 96.0)
(set! (-> *part-id-table* 2198 init-specs 8 initial-valuef) 255.0)
(spawn (-> self part) (-> self root trans))
(sound-play "bubbler" :id (the-as sound-id (-> self ambient-id)) :position (-> self root trans))
(sound-play "bubbler" :id (-> self ambient-id) :position (-> self root trans))
(let ((a0-4 *target*))
(when a0-4
(let ((a0-5 (get-trans a0-4 0)))
@@ -361,7 +361,7 @@
)
(defmethod deactivate bubbler ((obj bubbler))
(sound-stop (the-as sound-id (-> obj ambient-id)))
(sound-stop (-> obj ambient-id))
((method-of-type process-drawable deactivate) obj)
(none)
)
@@ -378,7 +378,7 @@ This commonly includes things such as:
(process-drawable-from-entity! obj arg0)
(set! (-> obj part) (create-launch-control (-> *part-group-id-table* 500) obj))
(set! (-> obj rod-of-god-scale) 1.0)
(set! (-> obj ambient-id) (the-as uint (sound-play "bubbler" :position (-> obj root trans))))
(set! (-> obj ambient-id) (sound-play "bubbler" :position (-> obj root trans)))
(go (method-of-object obj idle))
(none)
)
test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc
Generated Vendored
+2 -1
View File
@@ -171,6 +171,7 @@
)
;; definition for function talker-spawn-func
;; WARN: Return type mismatch int vs sound-id.
(defun talker-spawn-func ((arg0 talker-speech-class) (arg1 process-tree) (arg2 vector) (arg3 region))
(local-vars (s2-0 int))
(when (or (not arg0) (zero? (-> arg0 speech)) (not (talker-speech-class-method-9 arg0)))
@@ -211,7 +212,7 @@
)
)
(label cfg-27)
s2-0
(the-as sound-id s2-0)
)
;; definition for function talker-init
test/decompiler/reference/jak2/engine/common_objs/generic-obs-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -179,7 +179,7 @@
(target1 handle :offset-assert 200)
(target-joint0 int32 :offset-assert 208)
(target-joint1 int32 :offset-assert 212)
(sound uint32 :offset-assert 216)
(sound sound-id :offset-assert 216)
(userdata uint64 :offset-assert 224)
(user-time time-frame 2 :offset-assert 232)
(user-vector vector :inline :offset-assert 256)
test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc
Generated Vendored
+3 -3
View File
@@ -1706,7 +1706,7 @@ This commonly includes things such as:
(when (nonzero? (-> self sound))
(let ((v1-1 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-1 command) (sound-command set-param))
(set! (-> v1-1 id) (the-as sound-id (-> self sound)))
(set! (-> v1-1 id) (-> self sound))
(set! (-> v1-1 params volume) -4)
(set! (-> v1-1 auto-time) 240)
(set! (-> v1-1 auto-from) 2)
@@ -1717,7 +1717,7 @@ This commonly includes things such as:
(none)
)
:code (behavior ()
(set! (-> self sound) (the-as uint 0))
(set! (-> self sound) (new 'static 'sound-id))
(when (!= (+ (-> self lightning spec delay) (-> self lightning spec delay-rand)) 0.0)
(let ((gp-0 (current-time))
(s5-0 (the int (rand-vu-float-range
@@ -1754,7 +1754,7 @@ This commonly includes things such as:
)
)
)
(set! (-> self sound) (the-as uint (sound-play-by-spec (the-as sound-spec gp-1) (new-sound-id) s5-1)))
(set! (-> self sound) (sound-play-by-spec (the-as sound-spec gp-1) (new-sound-id) s5-1))
)
)
)
test/decompiler/reference/jak2/engine/common_objs/projectile-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -57,7 +57,7 @@
(handle-proj-hit! (_type_ process event-message-block) object 36)
(deal-damage! (_type_ process event-message-block) symbol 37)
(made-impact? (_type_) symbol 38)
(play-impact-sound! (_type_) sound-id :behavior projectile 39)
(play-impact-sound! (_type_) none :behavior projectile 39)
)
)
test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc
Generated Vendored
+5 -2
View File
@@ -15,10 +15,11 @@
)
;; definition for method 39 of type projectile
;; WARN: Return type mismatch int vs sound-id.
;; WARN: Return type mismatch int vs none.
(defmethod play-impact-sound! projectile ((obj projectile))
"Plays impact sound"
(the-as sound-id 0)
0
(none)
)
;; definition for method 35 of type projectile
@@ -660,6 +661,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p
)
;; definition for method 39 of type projectile-bounce
;; WARN: Return type mismatch sound-id vs none.
(defmethod play-impact-sound! projectile-bounce ((obj projectile-bounce))
"Plays impact sound"
(let* ((a2-0 (-> obj root-override))
@@ -675,6 +677,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p
(sound-play "dark-shot-bounc")
)
)
(none)
)
;; definition for method 30 of type projectile-bounce
test/decompiler/reference/jak2/engine/gfx/mood/mood-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -523,7 +523,7 @@ when updating the mood. This means that an individual state structure must be l
(lightning-count0 uint32 :offset-assert 144)
(lightning-count1 uint32 :offset-assert 148)
(lightning-count2 uint32 :offset-assert 152)
(rain-id uint32 :offset-assert 156)
(rain-id sound-id :offset-assert 156)
(sound-pitch float :offset-assert 160)
(fogs mood-fog-table 9 :offset-assert 164)
(colors mood-color-table 3 :offset-assert 200)
test/decompiler/reference/jak2/engine/gfx/mood/mood_REF.gc
Generated Vendored
+12 -13
View File
@@ -1648,23 +1648,22 @@ Returns the current value of `lightning-id`"
(gen-lightning-and-thunder! obj)
(cond
((zero? (-> obj rain-id))
(set! (-> obj rain-id) (the-as uint (sound-play-by-name
(static-sound-name "rain-hiss")
(new-sound-id)
(the int (* 1024.0 f30-3))
(the int (* 1524.0 (-> obj sound-pitch)))
0
(sound-group sfx)
#t
)
)
(set! (-> obj rain-id) (sound-play-by-name
(static-sound-name "rain-hiss")
(new-sound-id)
(the int (* 1024.0 f30-3))
(the int (* 1524.0 (-> obj sound-pitch)))
0
(sound-group sfx)
#t
)
)
)
(else
(when *sound-player-enable*
(let ((v1-136 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-136 command) (sound-command set-param))
(set! (-> v1-136 id) (the-as sound-id (-> obj rain-id)))
(set! (-> v1-136 id) (-> obj rain-id))
(set! (-> v1-136 params volume) (the int (* 1024.0 f30-3)))
(set! (-> v1-136 params pitch-mod) (the int (* 1524.0 (-> obj sound-pitch))))
(set! (-> v1-136 params mask) (the-as uint 3))
@@ -1677,8 +1676,8 @@ Returns the current value of `lightning-id`"
(else
(set! (-> obj lightning-flash) 0.0)
(when (nonzero? (-> obj rain-id))
(sound-stop (the-as sound-id (-> obj rain-id)))
(set! (-> obj rain-id) (the-as uint 0))
(sound-stop (-> obj rain-id))
(set! (-> obj rain-id) (new 'static 'sound-id))
0
)
)
test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc
Generated Vendored
+5 -5
View File
@@ -47,17 +47,17 @@
(upper-body joint-mod :offset-assert 68)
(sound-bank-knob float :offset-assert 72)
(sound-air-knob float :offset-assert 76)
(wind-sound-id uint32 :offset-assert 80)
(wind-sound-id sound-id :offset-assert 80)
(wind-sound-pitch float :offset-assert 84)
(wind-sound-volume float :offset-assert 88)
(engine-sound-id uint32 :offset-assert 92)
(engine-sound-id sound-id :offset-assert 92)
(engine-sound-pitch float :offset-assert 96)
(engine-sound-volume float :offset-assert 100)
(bank-sound-id uint32 :offset-assert 104)
(bank-sound-id sound-id :offset-assert 104)
(bank-sound-pitch float :offset-assert 108)
(bank-sound-volume float :offset-assert 112)
(ride-sound-id uint32 :offset-assert 116)
(spin-sound-id uint32 :offset-assert 120)
(ride-sound-id sound-id :offset-assert 116)
(spin-sound-id sound-id :offset-assert 120)
(spin-sound-volume float :offset-assert 124)
(spin-sound-pitch float :offset-assert 128)
(unknown-sound-id00 sound-id :offset-assert 132)
test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc
Generated Vendored
+5 -5
View File
@@ -131,7 +131,7 @@
(set! (-> self board troty) 0.0)
(set! (-> self board troty-cum) 0.0)
(set! (-> self board unknown-deg00) 0.0)
(set! (-> self board spin-sound-id) (the-as uint 0))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(set! (-> self control mod-surface) *board-spin-mods*)
)
(cond
@@ -154,7 +154,7 @@
(f30-0 (analog-input (the int (* 128.0 (-> gp-0 z))) 0.0 96.0 110.0 1.0))
)
(if (and (zero? (-> self board spin-sound-id)) (< 5461.3335 (fabs (-> self board trotyv))))
(set! (-> self board spin-sound-id) (the-as uint (sound-play "board-spin-loop")))
(set! (-> self board spin-sound-id) (sound-play "board-spin-loop"))
)
(if (and (< (* 0.9 (fabs (-> self board spin-control))) (fabs f28-0))
(>= (* (-> self board spin-control) f28-0) 0.0)
@@ -2264,7 +2264,7 @@
(logclear! (-> self control status) (collide-status probe-hit))
(let ((v1-2 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-2 command) (sound-command set-param))
(set! (-> v1-2 id) (the-as sound-id (-> self board ride-sound-id)))
(set! (-> v1-2 id) (-> self board ride-sound-id))
(set! (-> v1-2 params volume) -4)
(set! (-> v1-2 auto-time) 24)
(set! (-> v1-2 auto-from) 2)
@@ -2334,7 +2334,7 @@
((= (-> self board ride-speed) 0.0)
(let ((v1-43 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-43 command) (sound-command set-param))
(set! (-> v1-43 id) (the-as sound-id (-> self board ride-sound-id)))
(set! (-> v1-43 id) (-> self board ride-sound-id))
(set! (-> v1-43 params volume) -4)
(set! (-> v1-43 auto-time) 24)
(set! (-> v1-43 auto-from) 2)
@@ -2356,7 +2356,7 @@
)
(sound-play-by-name
(static-sound-name "board-rail")
(the-as sound-id (-> self board ride-sound-id))
(-> self board ride-sound-id)
(the int (* 1024.0 f30-1))
(the int (* 1524.0 f0-23))
0
test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc
Generated Vendored
+18 -18
View File
@@ -631,11 +631,11 @@
(set! (-> self board) (new 'process 'board-info))
(set! (-> self board process) (the-as (pointer target) (process->ppointer self)))
(set! (-> self board latch?) #f)
(set! (-> self board engine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board ride-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board spin-sound-id) (the-as uint 0))
(set! (-> self board wind-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board bank-sound-id) (the-as uint (new-sound-id)))
(set! (-> self board engine-sound-id) (new-sound-id))
(set! (-> self board ride-sound-id) (new-sound-id))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(set! (-> self board wind-sound-id) (new-sound-id))
(set! (-> self board bank-sound-id) (new-sound-id))
(let* ((v1-10 (-> self game))
(a0-5 (+ (-> v1-10 attack-id) 1))
)
@@ -809,12 +809,12 @@
(target-collide-set! 'normal 0.0)
(set! (-> self control reaction) target-collision-reaction)
(set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1))
(sound-stop (the-as sound-id (-> self board wind-sound-id)))
(sound-stop (the-as sound-id (-> self board engine-sound-id)))
(sound-stop (the-as sound-id (-> self board bank-sound-id)))
(sound-stop (the-as sound-id (-> self board ride-sound-id)))
(sound-stop (the-as sound-id (-> self board spin-sound-id)))
(set! (-> self board spin-sound-id) (the-as uint 0))
(sound-stop (-> self board wind-sound-id))
(sound-stop (-> self board engine-sound-id))
(sound-stop (-> self board bank-sound-id))
(sound-stop (-> self board ride-sound-id))
(sound-stop (-> self board spin-sound-id))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
(set! (-> self control cspace-offset quad) (the-as uint128 0))
(remove-setting! 'sound-flava)
@@ -1122,13 +1122,13 @@
(set! (-> a0-18 volume) (the int (* 1024.0 (-> self board engine-sound-volume))))
(set! (-> a0-18 pitch-mod) (the int (* 1524.0 (-> self board engine-sound-pitch))))
(set! (-> a0-18 reg 0) (the-as uint gp-0))
(t9-12 a0-18 (the-as sound-id (-> self board engine-sound-id)) (the-as vector #t))
(t9-12 a0-18 (-> self board engine-sound-id) (the-as vector #t))
)
(if (< (-> self board bank-sound-volume) 0.1)
(sound-stop (the-as sound-id (-> self board bank-sound-id)))
(sound-stop (-> self board bank-sound-id))
(sound-play-by-name
(static-sound-name "board-bank")
(the-as sound-id (-> self board bank-sound-id))
(-> self board bank-sound-id)
(the int (* 1024.0 (-> self board bank-sound-volume)))
(the int (* 1524.0 (-> self board bank-sound-pitch)))
0
@@ -1142,7 +1142,7 @@
(set! (-> a0-23 volume) (the int (-> self board wind-sound-volume)))
(set! (-> a0-23 pitch-mod) (the int (-> self board wind-sound-pitch)))
(set! (-> a0-23 reg 0) (the-as uint gp-0))
(t9-15 a0-23 (the-as sound-id (-> self board wind-sound-id)) (the-as vector #t))
(t9-15 a0-23 (-> self board wind-sound-id) (the-as vector #t))
)
)
(cond
@@ -1160,7 +1160,7 @@
(when *sound-player-enable*
(let ((v1-89 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-89 command) (sound-command set-param))
(set! (-> v1-89 id) (the-as sound-id (-> self board spin-sound-id)))
(set! (-> v1-89 id) (-> self board spin-sound-id))
(set! (-> v1-89 params volume) (the int (* 1024.0 (-> self board spin-sound-volume))))
(set! (-> v1-89 params mask) (the-as uint 1))
(-> v1-89 id)
@@ -1879,14 +1879,14 @@
)
(let ((v1-131 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-131 command) (sound-command set-param))
(set! (-> v1-131 id) (the-as sound-id (-> self board spin-sound-id)))
(set! (-> v1-131 id) (-> self board spin-sound-id))
(set! (-> v1-131 params volume) -4)
(set! (-> v1-131 auto-time) 120)
(set! (-> v1-131 auto-from) 2)
(set! (-> v1-131 params mask) (the-as uint 17))
(-> v1-131 id)
)
(set! (-> self board spin-sound-id) (the-as uint 0))
(set! (-> self board spin-sound-id) (new 'static 'sound-id))
(mode-set! (-> self board main) (joint-mod-mode flex-blend))
(mode-set! (-> self board board 0 main) (joint-mod-mode flex-blend))
(let ((s5-3 (new 'stack-no-clear 'vector)))
test/decompiler/reference/jak2/engine/target/darkjak-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -14,7 +14,7 @@
(clock-vel float :offset-assert 52)
(clock-on symbol :offset-assert 56)
(hud handle 1 :offset 64)
(tone uint32 :offset 72)
(tone sound-id :offset 72)
(bomb uint32 :offset 76)
)
:method-count-assert 10
test/decompiler/reference/jak2/engine/target/gun/gun-dark-shot_REF.gc
Generated Vendored
+27 -32
View File
@@ -84,18 +84,18 @@
;; definition of type gun-dark-shot
(deftype gun-dark-shot (projectile)
((blast-radius float :offset-assert 472)
(core-position vector :inline :offset-assert 480)
(core-velocity vector :inline :offset-assert 496)
(spin-vector vector :inline :offset-assert 512)
(track-target handle :offset-assert 528)
(size-t float :offset-assert 536)
(result-array handle 16 :offset-assert 544)
(charge-sound uint32 :offset-assert 672)
(fire-sound uint32 :offset-assert 676)
(trail-sound uint32 :offset-assert 680)
(explode-sound uint32 :offset-assert 684)
(start-pilot? basic :offset-assert 688)
((blast-radius float :offset-assert 472)
(core-position vector :inline :offset-assert 480)
(core-velocity vector :inline :offset-assert 496)
(spin-vector vector :inline :offset-assert 512)
(track-target handle :offset-assert 528)
(size-t float :offset-assert 536)
(result-array handle 16 :offset-assert 544)
(charge-sound sound-id :offset-assert 672)
(fire-sound sound-id :offset-assert 676)
(trail-sound sound-id :offset-assert 680)
(explode-sound sound-id :offset-assert 684)
(start-pilot? basic :offset-assert 688)
)
:heap-base #x240
:method-count-assert 42
@@ -172,13 +172,13 @@
(set! (-> obj part) (create-launch-control (-> *part-group-id-table* 72) obj))
(set! (-> obj blast-radius) 40960.0)
(set! (-> obj size-t) 0.0)
(set! (-> obj charge-sound) (the-as uint (new-sound-id)))
(set! (-> obj fire-sound) (the-as uint (new-sound-id)))
(set! (-> obj trail-sound) (the-as uint (new-sound-id)))
(set! (-> obj charge-sound) (new-sound-id))
(set! (-> obj fire-sound) (new-sound-id))
(set! (-> obj trail-sound) (new-sound-id))
(set! (-> obj explode-sound)
(the-as uint (add-process *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0))
(add-process *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0)
)
(set-falloff! *gui-control* (the-as sound-id (-> obj explode-sound)) #t 50 150 11)
(set-falloff! *gui-control* (-> obj explode-sound) #t 50 150 11)
(set! (-> obj start-pilot?) (the-as basic (and *target* (focus-test? *target* pilot))))
((method-of-type projectile init-proj-settings!) obj)
0
@@ -225,7 +225,7 @@
(set! (-> self size-t) 1.0)
(let ((v1-6 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-6 command) (sound-command set-param))
(set! (-> v1-6 id) (the-as sound-id (-> self charge-sound)))
(set! (-> v1-6 id) (-> self charge-sound))
(set! (-> v1-6 params volume) -4)
(set! (-> v1-6 auto-time) 24)
(set! (-> v1-6 auto-from) 2)
@@ -276,11 +276,7 @@
(none)
)
:post (behavior ()
(sound-play
"pmkr-charge"
:id (the-as sound-id (-> self charge-sound))
:position (-> self root-override trans)
)
(sound-play "pmkr-charge" :id (-> self charge-sound) :position (-> self root-override trans))
(spawn-impact-particles self)
(none)
)
@@ -439,8 +435,8 @@
(if (logtest? (-> self root-override status) (collide-status touch-surface))
(go-virtual impact)
)
(sound-play "pmkr-fire" :id (the-as sound-id (-> self fire-sound)) :position (-> self root-override trans))
(sound-play "pmkr-trail" :id (the-as sound-id (-> self trail-sound)) :position (-> self root-override trans))
(sound-play "pmkr-fire" :id (-> self fire-sound) :position (-> self root-override trans))
(sound-play "pmkr-trail" :id (-> self trail-sound) :position (-> self root-override trans))
(none)
)
)
@@ -660,14 +656,14 @@
(if (< (- (current-time) (-> self spawn-time)) (seconds 0.1))
(send-event (ppointer->process (-> self parent)) 'release)
)
(sound-stop (the-as sound-id (-> self trail-sound)))
(let ((v1-10 (get-status *gui-control* (the-as sound-id (-> self explode-sound)))))
(sound-stop (-> self trail-sound))
(let ((v1-10 (get-status *gui-control* (-> self explode-sound))))
(cond
((= v1-10 (gui-status ready))
(set-action!
*gui-control*
(gui-action play)
(the-as sound-id (-> self explode-sound))
(-> self explode-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
@@ -679,7 +675,7 @@
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id (-> self explode-sound))
(-> self explode-sound)
(gui-channel none)
(gui-action none)
(the-as string #f)
@@ -912,9 +908,8 @@
)
)
(let ((gp-3 (current-time)))
(while (or (-> self child) (and (nonzero? (get-status *gui-control* (the-as sound-id (-> self explode-sound))))
(< (- (current-time) gp-3) (seconds 10))
)
(while (or (-> self child)
(and (nonzero? (get-status *gui-control* (-> self explode-sound))) (< (- (current-time) gp-3) (seconds 10)))
)
(suspend)
)
test/decompiler/reference/jak2/engine/target/gun/gun-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -109,7 +109,7 @@
(track-trans vector :inline :offset-assert 480)
(track-dir vector :inline :offset-assert 496)
(turn-fast-hold-time time-frame :offset-assert 512)
(blue-whine-sound-id uint32 :offset-assert 520)
(blue-whine-sound-id sound-id :offset-assert 520)
(blue-whine-volume float :offset-assert 524)
(top-anim-twist vector :inline :offset-assert 528)
(top-anim-twist-targ vector :inline :offset-assert 544)
test/decompiler/reference/jak2/engine/target/logic-target_REF.gc
Generated Vendored
+1 -1
View File
@@ -3387,7 +3387,7 @@
(defmethod deactivate target ((obj target))
(kill-persister *setting-control* (the-as engine-pers 'bg-a-speed) 'bg-a-speed)
(if (nonzero? (-> obj darkjak))
(sound-stop (the-as sound-id (-> obj darkjak tone)))
(sound-stop (-> obj darkjak tone))
)
(set! (-> *setting-control* cam-default mode-name) #f)
(set-zero! *camera-smush-control*)
test/decompiler/reference/jak2/engine/target/mech_suit/mech-h_REF.gc
Generated Vendored
+4 -4
View File
@@ -8,12 +8,12 @@
(mech-trans vector :inline :offset-assert 16)
(mech-quat vector :inline :offset-assert 32)
(mech-scale vector :inline :offset-assert 48)
(engine-sound-id uint32 :offset-assert 64)
(engine-sound-id sound-id :offset-assert 64)
(engine-sound-volume float :offset-assert 68)
(engine-sound-pitch float :offset-assert 72)
(thrust-sound-id uint32 :offset-assert 76)
(drag-sound-id uint32 :offset-assert 80)
(whine-sound-id uint32 :offset-assert 84)
(thrust-sound-id sound-id :offset-assert 76)
(drag-sound-id sound-id :offset-assert 80)
(whine-sound-id sound-id :offset-assert 84)
(mech-start-time time-frame :offset-assert 88)
(mech-time time-frame :offset-assert 96)
(no-get-off-time time-frame :offset-assert 104)
test/decompiler/reference/jak2/engine/target/mech_suit/mech-states_REF.gc
Generated Vendored
+56 -56
View File
@@ -951,7 +951,7 @@
:enter (behavior ((arg0 symbol))
(let ((v1-0 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-0 command) (sound-command set-param))
(set! (-> v1-0 id) (the-as sound-id (-> self mech thrust-sound-id)))
(set! (-> v1-0 id) (-> self mech thrust-sound-id))
(set! (-> v1-0 params volume) -4)
(set! (-> v1-0 auto-time) 48)
(set! (-> v1-0 auto-from) 2)
@@ -1932,22 +1932,22 @@
)
(go target-mech-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-24 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-3 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-24 a1-3)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
)
)
(if (and (cpad-pressed? (-> self control cpad number) circle square) (can-hands? #t))
(go target-mech-carry-throw)
)
@@ -2031,22 +2031,22 @@
)
(go target-mech-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-24 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-2 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-24 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
)
)
(if (and (cpad-pressed? (-> self control cpad number) circle square) (can-hands? #t))
(go target-mech-carry-throw)
)
@@ -2149,7 +2149,7 @@
(set! (-> self mech thruster-flame-length) 0.0)
(let ((v1-3 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-3 command) (sound-command set-param))
(set! (-> v1-3 id) (the-as sound-id (-> self mech thrust-sound-id)))
(set! (-> v1-3 id) (-> self mech thrust-sound-id))
(set! (-> v1-3 params volume) -4)
(set! (-> v1-3 auto-time) 48)
(set! (-> v1-3 auto-from) 2)
@@ -2158,7 +2158,7 @@
)
(let ((v1-5 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-5 command) (sound-command set-param))
(set! (-> v1-5 id) (the-as sound-id (-> self mech drag-sound-id)))
(set! (-> v1-5 id) (-> self mech drag-sound-id))
(set! (-> v1-5 params volume) -4)
(set! (-> v1-5 auto-time) 48)
(set! (-> v1-5 auto-from) 2)
@@ -2300,7 +2300,7 @@
)
(sound-play-by-name
(static-sound-name "mech-drag-grind")
(the-as sound-id (-> self mech drag-sound-id))
(-> self mech drag-sound-id)
(the int (* 1024.0 f30-0))
0
0
@@ -2401,7 +2401,7 @@
:enter (behavior ((arg0 symbol))
(let ((v1-0 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-0 command) (sound-command set-param))
(set! (-> v1-0 id) (the-as sound-id (-> self mech thrust-sound-id)))
(set! (-> v1-0 id) (-> self mech thrust-sound-id))
(set! (-> v1-0 params volume) -4)
(set! (-> v1-0 auto-time) 48)
(set! (-> v1-0 auto-from) 2)
@@ -2438,22 +2438,22 @@
(none)
)
:trans (behavior ()
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-16 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-2 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-16 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
)
)
(if (and (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0)
(let ((v1-26 (ja-group)))
(and (and v1-26 (= v1-26 (-> self draw art-group data 342))) (>= (ja-aframe-num 0) 30.0))
@@ -2475,7 +2475,7 @@
;; failed to figure out what this is:
(defstate target-mech-carry-jump (target)
:event (-> target-mech-carry-falling event)
:enter (behavior ((arg0 float) (arg1 float))
:enter (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(set! (-> self state-time) (current-time))
(init-var-jump arg0 arg1 #t #f (-> self control transv) 2.0)
(logclear! (-> self control status) (collide-status on-surface on-ground touch-surface))
@@ -2517,7 +2517,7 @@
)
(none)
)
:code (behavior ((arg0 float) (arg1 float))
:code (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(ja-channel-push! 1 (seconds 0.05))
(ja :group! (-> self draw art-group data 340) :num! min)
(suspend)
@@ -2805,10 +2805,10 @@
(logior! (-> self state-flags) (state-flags sf2))
(logior! (-> self focus-status) (focus-status grabbed))
(set! (-> self mech stick-off) (the-as basic #t))
(sound-stop (the-as sound-id (-> self mech engine-sound-id)))
(sound-stop (the-as sound-id (-> self mech thrust-sound-id)))
(sound-stop (the-as sound-id (-> self mech drag-sound-id)))
(sound-stop (the-as sound-id (-> self mech whine-sound-id)))
(sound-stop (-> self mech engine-sound-id))
(sound-stop (-> self mech thrust-sound-id))
(sound-stop (-> self mech drag-sound-id))
(sound-stop (-> self mech whine-sound-id))
(none)
)
:exit (behavior ()
test/decompiler/reference/jak2/engine/target/mech_suit/target-mech_REF.gc
Generated Vendored
+17 -21
View File
@@ -375,7 +375,7 @@
)
(sound-play-by-name
(static-sound-name "mech-thrust")
(the-as sound-id (-> arg0 mech thrust-sound-id))
(-> arg0 mech thrust-sound-id)
(the int (* 1024.0 (lerp-scale 0.3 1.0 (-> arg0 mech thruster-flame-length) 0.0 4096.0)))
(the int (* 1524.0 f30-0))
0
@@ -827,16 +827,13 @@
)
(set! (-> self control last-trans-any-surf quad) (-> self control trans quad))
(target-timed-invulnerable (seconds 0.1) self 1)
(cond
((focus-test? self carry)
enter-state
(let ((a0-19 (-> *TARGET-bank* mech-carry-jump-height-min))
(a1-8 (-> *TARGET-bank* mech-carry-jump-height-max))
)
(go target-mech-carry-jump a0-19 a1-8)
)
)
(else
(if (focus-test? self carry)
(go
target-mech-carry-jump
(-> *TARGET-bank* mech-carry-jump-height-min)
(-> *TARGET-bank* mech-carry-jump-height-max)
#f
)
(go
target-mech-jump
(-> *TARGET-bank* mech-jump-height-min)
@@ -844,7 +841,6 @@
(the-as surface #f)
)
)
)
)
#f
)
@@ -1115,10 +1111,10 @@
(when (zero? (-> self mech))
(set! (-> self mech) (new 'process 'mech-info))
(set! (-> self mech hud 0) (the-as handle #f))
(set! (-> self mech engine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech thrust-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech drag-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech whine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self mech engine-sound-id) (new-sound-id))
(set! (-> self mech thrust-sound-id) (new-sound-id))
(set! (-> self mech drag-sound-id) (new-sound-id))
(set! (-> self mech whine-sound-id) (new-sound-id))
)
(set! (-> self board latch?) #f)
(set! (-> self mech stick-lock) #f)
@@ -1367,10 +1363,10 @@
(target-collide-set! 'normal 0.0)
(set! (-> self control reaction) target-collision-reaction)
(set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1))
(sound-stop (the-as sound-id (-> self mech engine-sound-id)))
(sound-stop (the-as sound-id (-> self mech thrust-sound-id)))
(sound-stop (the-as sound-id (-> self mech drag-sound-id)))
(sound-stop (the-as sound-id (-> self mech whine-sound-id)))
(sound-stop (-> self mech engine-sound-id))
(sound-stop (-> self mech thrust-sound-id))
(sound-stop (-> self mech drag-sound-id))
(sound-stop (-> self mech whine-sound-id))
(send-event (handle->process (-> self mech hud 0)) 'hide-and-die)
(set! (-> self draw shadow) (-> self shadow-backup))
(set! (-> self control cspace-offset quad) (the-as uint128 0))
@@ -1383,7 +1379,7 @@
;; definition for function target-mech-effect
;; WARN: Return type mismatch int vs none.
(defbehavior target-mech-effect target ()
(sound-play "mech-pulse" :id (the-as sound-id (-> self mech engine-sound-id)))
(sound-play "mech-pulse" :id (-> self mech engine-sound-id))
(set! (-> self game distance) (/ (-> self mech shield-value) (-> self mech shield-max)))
0
(none)
test/decompiler/reference/jak2/engine/target/target-carry_REF.gc
Generated Vendored
+32 -47
View File
@@ -442,22 +442,17 @@
(if (cpad-pressed? (-> self control cpad number) r1)
(go target-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-17 (-> *TARGET-bank* carry-jump-height-min))
(a1-2 (-> *TARGET-bank* carry-jump-height-max))
)
(go target-carry-jump a0-17 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go target-carry-jump (-> *TARGET-bank* carry-jump-height-min) (-> *TARGET-bank* carry-jump-height-max) #f)
)
)
(if (and (cpad-pressed? (-> self control cpad number) square) (can-hands? #t))
(go target-carry-throw)
)
@@ -505,22 +500,17 @@
(if (cpad-pressed? (-> self control cpad number) r1)
(go target-carry-drop)
)
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-17 (-> *TARGET-bank* carry-jump-height-min))
(a1-2 (-> *TARGET-bank* carry-jump-height-max))
)
(go target-carry-jump a0-17 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go target-carry-jump (-> *TARGET-bank* carry-jump-height-min) (-> *TARGET-bank* carry-jump-height-max) #f)
)
)
(if (and (cpad-pressed? (-> self control cpad number) square) (can-hands? #t))
(go target-carry-throw)
)
@@ -640,22 +630,17 @@
(none)
)
:trans (behavior ()
(when (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
enter-state
(let ((a0-16 (-> *TARGET-bank* carry-jump-height-min))
(a1-2 (-> *TARGET-bank* carry-jump-height-max))
)
(go target-carry-jump a0-16 a1-2)
(if (and (logtest? (logior (logior (-> *cpad-list* cpads (-> self control cpad number) button0-rel 0)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 1)
)
(-> *cpad-list* cpads (-> self control cpad number) button0-rel 2)
)
(pad-buttons x)
)
(can-jump? #f)
)
(go target-carry-jump (-> *TARGET-bank* carry-jump-height-min) (-> *TARGET-bank* carry-jump-height-max) #f)
)
)
(if (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0)
(go target-carry-walk)
)
@@ -673,7 +658,7 @@
;; failed to figure out what this is:
(defstate target-carry-jump (target)
:event target-jump-event-handler
:enter (behavior ((arg0 float) (arg1 float))
:enter (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(set! (-> self state-time) (current-time))
(sound-play "jump" :vol 70)
(init-var-jump arg0 arg1 #t #f (-> self control transv) 2.0)
@@ -708,7 +693,7 @@
)
(none)
)
:code (behavior ((arg0 float) (arg1 float))
:code (behavior ((arg0 float) (arg1 float) (arg2 symbol))
(ja-channel-push! 1 (seconds 0.05))
(ja :group! (-> self draw art-group data 321) :num! min)
(suspend)
test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc
Generated Vendored
+2 -2
View File
@@ -14,7 +14,7 @@
(set! (-> self darkjak attack-id) a0-5)
)
(set! (-> self darkjak hud 0) (the-as handle #f))
(set! (-> self darkjak tone) (the-as uint (new-sound-id)))
(set! (-> self darkjak tone) (new-sound-id))
(set! (-> self darkjak-giant-interp) 1.0)
)
0
@@ -86,7 +86,7 @@
(remove-setting! 'string-spline-accel)
(remove-setting! 'string-spline-max-move-player)
(remove-setting! 'string-spline-accel-player)
(sound-stop (the-as sound-id (-> self darkjak tone)))
(sound-stop (-> self darkjak tone))
)
0
(none)
test/decompiler/reference/jak2/engine/target/target-death_REF.gc
Generated Vendored
+1 -2
View File
@@ -336,8 +336,7 @@
)
)
((logtest? (continue-flags indax) (-> arg0 flags))
enter-state
(go target-indax-start)
(go target-indax-start (the-as handle #f))
)
((logtest? (continue-flags record-path) (-> arg0 flags))
)
test/decompiler/reference/jak2/engine/target/target-gun_REF.gc
Generated Vendored
+4 -4
View File
@@ -227,7 +227,7 @@
(set! (-> self control unknown-float003) 0.0)
(set! (-> self gun blue-whine-volume) 0.0)
(if (zero? (-> self gun blue-whine-sound-id))
(set! (-> self gun blue-whine-sound-id) (the-as uint (new-sound-id)))
(set! (-> self gun blue-whine-sound-id) (new-sound-id))
)
(set-setting! 'mode-sound-bank 'gun 0.0 0)
(sound-play "gun-takeout")
@@ -372,7 +372,7 @@
(send-event *camera* 'yes-follow)
(let ((v1-16 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-16 command) (sound-command set-param))
(set! (-> v1-16 id) (the-as sound-id (-> self gun blue-whine-sound-id)))
(set! (-> v1-16 id) (-> self gun blue-whine-sound-id))
(set! (-> v1-16 params volume) -4)
(set! (-> v1-16 auto-time) 120)
(set! (-> v1-16 auto-from) 2)
@@ -2783,7 +2783,7 @@
(set! (-> gp-0 blue-whine-volume) (* 0.000004577637 (-> gp-0 fire-spinv)))
(sound-play-by-name
(static-sound-name "blue-gun-whine")
(the-as sound-id (-> gp-0 blue-whine-sound-id))
(-> gp-0 blue-whine-sound-id)
(the int (* 1024.0 (fmin 1.0 (* 2.0 (-> gp-0 blue-whine-volume)))))
(the int (* 1524.0 (lerp-scale -0.9 0.5 (-> gp-0 blue-whine-volume) 0.0 1.0)))
0
@@ -2795,7 +2795,7 @@
(when (!= (-> gp-0 blue-whine-volume) 0.0)
(let ((v1-245 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-245 command) (sound-command set-param))
(set! (-> v1-245 id) (the-as sound-id (-> gp-0 blue-whine-sound-id)))
(set! (-> v1-245 id) (-> gp-0 blue-whine-sound-id))
(set! (-> v1-245 params volume) -4)
(set! (-> v1-245 auto-time) 120)
(set! (-> v1-245 auto-from) 2)
test/decompiler/reference/jak2/engine/target/target-h_REF.gc
Generated Vendored
+3 -3
View File
@@ -108,7 +108,7 @@
target-carry-drop
target-carry-falling
(target-carry-hit-ground symbol)
(target-carry-jump float float)
(target-carry-jump float float symbol)
target-carry-pickup
target-carry-stance
target-carry-throw
@@ -156,7 +156,7 @@
(target-indax-jump float float surface)
target-indax-running-attack
target-indax-stance
target-indax-start
(target-indax-start handle)
target-indax-trip
target-indax-walk
(target-jump float float surface)
@@ -168,7 +168,7 @@
target-mech-carry-drop
target-mech-carry-falling
(target-mech-carry-hit-ground symbol)
(target-mech-carry-jump float float)
(target-mech-carry-jump float float symbol)
target-mech-carry-pickup
target-mech-carry-stance
target-mech-carry-throw
test/decompiler/reference/jak2/engine/target/target-handler_REF.gc
Generated Vendored
+1 -3
View File
@@ -1237,9 +1237,7 @@
)
)
((= v1-45 'indax)
enter-state
(process->handle (the-as process (-> arg3 param 1)))
(go target-indax-start)
(go target-indax-start (process->handle (the-as process (-> arg3 param 1))))
)
((= v1-45 'gun)
(if (logtest? (-> self game features) (game-feature gun))
test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc
Generated Vendored
+6 -6
View File
@@ -10,7 +10,7 @@
(sound-time time-frame 2 :offset-assert 240)
(sync sync-eased :inline :offset-assert 256)
(piston-id int32 :offset-assert 300)
(looping-id uint32 :offset-assert 304)
(looping-id sound-id :offset-assert 304)
)
:heap-base #xc0
:method-count-assert 31
@@ -131,8 +131,8 @@
)
)
(when (and (logtest? (actor-option user18) (-> self fact options)) (< (-> self sound-time 0) (current-time)))
(sound-stop (the-as sound-id (-> self looping-id)))
(sound-play "piston-loop" :id (the-as sound-id (-> self looping-id)) :position (-> self sound-trans))
(sound-stop (-> self looping-id))
(sound-play "piston-loop" :id (-> self looping-id) :position (-> self sound-trans))
(+! (-> self sound-time 0) (the int (* 0.5 (the float (-> self sync period)))))
)
(rider-post)
@@ -142,7 +142,7 @@
;; definition for method 10 of type piston
(defmethod deactivate piston ((obj piston))
(sound-stop (the-as sound-id (-> obj looping-id)))
(sound-stop (-> obj looping-id))
((method-of-type process-focusable deactivate) obj)
(none)
)
@@ -226,10 +226,10 @@ This commonly includes things such as:
(set! (-> obj root-override trans y) (+ -40960.0 (-> obj root-override trans y)))
(cond
((logtest? (actor-option user18) (-> obj fact options))
(set! (-> obj looping-id) (the-as uint (new-sound-id)))
(set! (-> obj looping-id) (new-sound-id))
)
(else
(set! (-> obj looping-id) (the-as uint 0))
(set! (-> obj looping-id) (new 'static 'sound-id))
0
)
)
test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc
Generated Vendored
+4 -4
View File
@@ -246,7 +246,7 @@ For example for an elevator pre-compute the distance between the first and last
(wiggle-angle degrees :offset-assert 640)
(delta-wiggle-angle degrees :offset-assert 644)
(wiggle-factor float :offset-assert 648)
(id uint32 :offset-assert 652)
(id sound-id :offset-assert 652)
)
:heap-base #x210
:method-count-assert 181
@@ -993,7 +993,7 @@ For example for an elevator pre-compute the distance between the first and last
(none)
)
:exit (behavior ()
(set! (-> self id) (the-as uint (sound-play "krew-travel")))
(set! (-> self id) (sound-play "krew-travel"))
(none)
)
:trans (behavior ()
@@ -1296,7 +1296,7 @@ For example for an elevator pre-compute the distance between the first and last
)
:enter (behavior ()
(if (nonzero? (-> self id))
(sound-stop (the-as sound-id (-> self id)))
(sound-stop (-> self id))
)
(when (< 25 (rand-vu-int-range 0 50))
(let ((gp-1 (-> self root-override2))
@@ -1506,7 +1506,7 @@ For example for an elevator pre-compute the distance between the first and last
(set! (-> obj wiggle-angle) 0.0)
(set! (-> obj delta-wiggle-angle) 182.04445)
(set! (-> obj wiggle-factor) 2.0)
(set! (-> obj id) (the-as uint 0))
(set! (-> obj id) (new 'static 'sound-id))
(logclear! (-> obj mask) (process-mask actor-pause))
(go (method-of-object obj spawning))
(none)
test/decompiler/reference/jak2/levels/city/common/ctyport-obs_REF.gc
Generated Vendored
+8 -8
View File
@@ -694,8 +694,8 @@
;; definition of type barge
(deftype barge (boat-base)
((engine uint32 :offset-assert 896)
(bow-wash uint32 :offset-assert 900)
((engine sound-id :offset-assert 896)
(bow-wash sound-id :offset-assert 900)
)
:heap-base #x310
:method-count-assert 149
@@ -749,11 +749,11 @@
(cond
((< (vector-vector-distance s5-0 (camera-pos)) 614400.0)
(let ((a0-6 (static-sound-spec "barge-engine")))
(sound-play-by-spec a0-6 (the-as sound-id (-> obj engine)) s5-0)
(sound-play-by-spec a0-6 (-> obj engine) s5-0)
)
)
(else
(sound-stop (the-as sound-id (-> obj engine)))
(sound-stop (-> obj engine))
)
)
)
@@ -774,11 +774,11 @@
(cond
((< (vector-vector-distance s5-1 (camera-pos)) 614400.0)
(let ((a0-12 (static-sound-spec "bow-wash")))
(sound-play-by-spec a0-12 (the-as sound-id (-> obj bow-wash)) s5-1)
(sound-play-by-spec a0-12 (-> obj bow-wash) s5-1)
)
)
(else
(sound-stop (the-as sound-id (-> obj bow-wash)))
(sound-stop (-> obj bow-wash))
)
)
)
@@ -918,8 +918,8 @@
)
(alloc-and-init-rigid-body-control obj *barge-constants*)
(set! (-> obj draw lod-set lod 0 dist) 1228800.0)
(set! (-> obj engine) (the-as uint (new-sound-id)))
(set! (-> obj bow-wash) (the-as uint (new-sound-id)))
(set! (-> obj engine) (new-sound-id))
(set! (-> obj bow-wash) (new-sound-id))
(iterate-prims
(-> obj root-override-2)
(lambda ((arg0 collide-shape-prim))
test/decompiler/reference/jak2/levels/city/common/ctywide-obs_REF.gc
Generated Vendored
+22 -23
View File
@@ -2539,12 +2539,12 @@ This commonly includes things such as:
;; definition of type propa
(deftype propa (process-focusable)
((sound-id uint32 :offset-assert 204)
(sound-index uint32 :offset-assert 208)
(handle handle :offset-assert 216)
(y-rot float :offset-assert 224)
(hit-points int32 :offset-assert 228)
(incoming-attack-id uint32 :offset-assert 232)
((sound-id sound-id :offset-assert 204)
(sound-index uint32 :offset-assert 208)
(handle handle :offset-assert 216)
(y-rot float :offset-assert 224)
(hit-points int32 :offset-assert 228)
(incoming-attack-id uint32 :offset-assert 232)
)
:heap-base #x70
:method-count-assert 32
@@ -2815,8 +2815,8 @@ This commonly includes things such as:
)
:exit (behavior ()
(when (nonzero? (-> self sound-id))
(sound-stop (the-as sound-id (-> self sound-id)))
(set! (-> self sound-id) (the-as uint 0))
(sound-stop (-> self sound-id))
(set! (-> self sound-id) (new 'static 'sound-id))
0
)
(none)
@@ -2831,14 +2831,14 @@ This commonly includes things such as:
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id (-> self sound-id))
(-> self sound-id)
(gui-channel none)
(gui-action none)
(the-as string #f)
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(set! (-> self sound-id) (the-as uint 0))
(set! (-> self sound-id) (new 'static 'sound-id))
(+! (-> self sound-index) 1)
(when (>= (-> self sound-index) (the-as uint (-> *propa-sounds* length)))
(set! (-> self sound-index) (the-as uint 0))
@@ -2849,16 +2849,15 @@ This commonly includes things such as:
((< (vector-vector-distance (camera-pos) (-> self root-override trans)) 225280.0)
(cond
((zero? (-> self sound-id))
(set! (-> self sound-id) (the-as uint (add-process
*gui-control*
self
(gui-channel alert)
(gui-action play)
(-> *propa-sounds* (-> self sound-index))
-99.0
0
)
)
(set! (-> self sound-id) (add-process
*gui-control*
self
(gui-channel alert)
(gui-action play)
(-> *propa-sounds* (-> self sound-index))
-99.0
0
)
)
(let ((a1-4 (new 'stack-no-clear 'vector)))
(set! (-> a1-4 quad) (-> self root-override trans quad))
@@ -2870,7 +2869,7 @@ This commonly includes things such as:
(when *sound-player-enable*
(let ((gp-2 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> gp-2 command) (sound-command set-param))
(set! (-> gp-2 id) (the-as sound-id (-> self sound-id)))
(set! (-> gp-2 id) (-> self sound-id))
(set! (-> gp-2 params fo-min) 40)
(set! (-> gp-2 params fo-max) 55)
(set! (-> gp-2 params fo-curve) 2)
@@ -2889,8 +2888,8 @@ This commonly includes things such as:
(-> gp-2 id)
)
)
(when (= (get-status *gui-control* (the-as sound-id (-> self sound-id))) (gui-status unknown))
(set! (-> self sound-id) (the-as uint 0))
(when (= (get-status *gui-control* (-> self sound-id)) (gui-status unknown))
(set! (-> self sound-id) (new 'static 'sound-id))
(+! (-> self sound-index) 1)
(when (>= (-> self sound-index) (the-as uint (-> *propa-sounds* length)))
(set! (-> self sound-index) (the-as uint 0))
test/decompiler/reference/jak2/levels/city/common/ctywide-tasks_REF.gc
Generated Vendored
+10 -10
View File
@@ -182,7 +182,7 @@
(lambda :behavior task-manager
()
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 38) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 38) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-1 (current-time)))
@@ -194,7 +194,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 39) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 39) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(go-virtual complete)
@@ -211,7 +211,7 @@
()
(when (and (= (-> self sub-state) 1) (not (and *target* (focus-test? *target* pilot))))
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 46) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 46) *entity-pool* (target-pos 0) (the-as region #f))
)
(go-virtual fail)
)
@@ -237,7 +237,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 31) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 31) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-1 (current-time)))
@@ -249,7 +249,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-3 (current-time)))
@@ -261,7 +261,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f))
)
(while (let ((v1-34 (handle->process (-> self slave 0))))
(not (logtest? (rigid-body-object-flag flight-level-transition) (-> (the-as vehicle v1-34) flags)))
@@ -273,7 +273,7 @@
(suspend)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(set! (-> self sub-state) (the-as uint 2))
@@ -355,7 +355,7 @@
)
(set! (-> self sub-state) (the-as uint 1))
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 35) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-1 (current-time)))
@@ -364,7 +364,7 @@
)
)
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 36) *entity-pool* (target-pos 0) (the-as region #f))
)
(while (let ((v1-15 (handle->process (-> *target* pilot vehicle))))
(not (logtest? (rigid-body-object-flag flight-level-transition) (-> (the-as vehicle v1-15) flags)))
@@ -373,7 +373,7 @@
)
(wait-for-speech-end (-> self sound-id 0))
(set! (-> self sound-id 0)
(the-as sound-id (talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f)))
(talker-spawn-func (-> *talker-speech* 37) *entity-pool* (target-pos 0) (the-as region #f))
)
(wait-for-speech-end (-> self sound-id 0))
(let ((gp-4 (current-time)))
test/decompiler/reference/jak2/levels/city/common/guard_REF.gc
Generated Vendored
+4 -4
View File
@@ -331,7 +331,7 @@
(target-self-xz-dist float :offset-assert 1220)
(target-y-angle degrees :offset-assert 1224)
(last-visible-target-pos vector :inline :offset-assert 1232)
(lazer-sound uint32 :offset-assert 1248)
(lazer-sound sound-id :offset-assert 1248)
(move-position vector :inline :offset-assert 1264)
(move-index int32 :offset-assert 1280)
(traffic-target-status traffic-target-status :inline :offset-assert 1296)
@@ -3329,13 +3329,13 @@
0
(set! (-> self miss-amount) 0.0)
(set! (-> self state-time) (current-time))
(set! (-> self lazer-sound) (the-as uint 0))
(set! (-> self lazer-sound) (new 'static 'sound-id))
0
(none)
)
:exit (behavior ()
(if (nonzero? (-> self lazer-sound))
(sound-stop (the-as sound-id (-> self lazer-sound)))
(sound-stop (-> self lazer-sound))
)
(iterate-prims
(-> self root-override2)
@@ -3507,7 +3507,7 @@
(set! (-> v1-156 attack-id) a0-52)
(set! (-> self attack-id) a0-52)
)
(set! (-> self lazer-sound) (the-as uint (sound-play "guard-zap")))
(set! (-> self lazer-sound) (sound-play "guard-zap"))
(let ((v1-158 (-> self l-control))
(a0-56 1)
)
test/decompiler/reference/jak2/levels/city/common/transport_REF.gc
Generated Vendored
+5 -5
View File
@@ -247,7 +247,7 @@
(max-guard uint32 :offset-assert 240)
(count-guard uint32 :offset-assert 244)
(max-time float :offset-assert 248)
(ambient-sound-id uint32 :offset-assert 252)
(ambient-sound-id sound-id :offset-assert 252)
(turret handle :offset-assert 256)
)
:heap-base #x90
@@ -336,7 +336,7 @@
)
(set! (-> a0-3 volume) (the int (* 1024.0 f0-4)))
(set! (-> a0-3 pitch-mod) (the int (* 1524.0 f30-0)))
(sound-play-by-spec a0-3 (the-as sound-id (-> obj ambient-sound-id)) (-> obj root-override trans))
(sound-play-by-spec a0-3 (-> obj ambient-sound-id) (-> obj root-override trans))
)
0
(none)
@@ -344,7 +344,7 @@
;; definition for method 10 of type transport
(defmethod deactivate transport ((obj transport))
(sound-stop (the-as sound-id (-> obj ambient-sound-id)))
(sound-stop (-> obj ambient-sound-id))
((the-as (function process-drawable none) (find-parent-method transport 10)) obj)
(none)
)
@@ -457,7 +457,7 @@
(defstate die-fast (transport)
:virtual #t
:code (behavior ()
(sound-stop (the-as sound-id (-> self ambient-sound-id)))
(sound-stop (-> self ambient-sound-id))
(cleanup-for-death self)
(none)
)
@@ -633,7 +633,7 @@
)
(set! (-> self turret) (the-as handle #f))
)
(set! (-> self ambient-sound-id) (the-as uint (new-sound-id)))
(set! (-> self ambient-sound-id) (new-sound-id))
(go-virtual come-down)
(none)
)
test/decompiler/reference/jak2/levels/city/onin_tent/onin-game_REF.gc
Generated Vendored
+6 -9
View File
@@ -2190,7 +2190,7 @@
(hide () _type_ :state 20)
(wait-for-start () _type_ :state 21)
(active (symbol) _type_ :state 22)
(lose () _type_ :state 23)
(lose (symbol) _type_ :state 23)
(win () _type_ :state 24)
(onin-game-method-25 (_type_) none 25)
(onin-game-method-26 (_type_) none 26)
@@ -2525,8 +2525,7 @@
)
)
(('retry)
enter-state
(go-virtual lose)
(go-virtual lose #f)
)
)
)
@@ -2682,9 +2681,7 @@
(go-virtual win)
)
((or (and *cheat-mode* (cpad-pressed? 0 l1)) (>= (-> self miss-count) (-> self miss-max)))
enter-state
#t
(go-virtual lose)
(go-virtual lose #t)
)
((and *cheat-mode* (cpad-pressed? 0 up))
(sound-play-by-spec (static-sound-spec "beep" :fo-curve 1) (new-sound-id) (the-as vector #t))
@@ -2742,7 +2739,7 @@
(defstate lose (onin-game)
:virtual #t
:exit (-> (method-of-type onin-game active) exit)
:code (behavior ()
:code (behavior ((arg0 symbol))
(let ((gp-0 (-> self child)))
(while gp-0
(if (type? (ppointer->process gp-0) onin-game-bubble)
@@ -2787,7 +2784,7 @@
)
)
)
(while (nonzero? (get-status *gui-control* (the-as sound-id s5-1)))
(while (nonzero? (get-status *gui-control* s5-1))
(suspend)
)
)
@@ -2847,7 +2844,7 @@
(if (not (handle->process gp-4))
(auto-save-user)
)
(while (nonzero? (get-status *gui-control* (the-as sound-id s5-1)))
(while (nonzero? (get-status *gui-control* s5-1))
(suspend)
)
(let ((s5-3 (current-time)))
test/decompiler/reference/jak2/levels/common/enemy/bombots/bombbot_REF.gc
Generated Vendored
+21 -20
View File
@@ -588,9 +588,9 @@
(info rigid-body-object-constants :offset-assert 1396)
(explosing symbol :offset-assert 1400)
(minimap connection-minimap :offset-assert 1404)
(lazer-sound uint32 :offset-assert 1408)
(head-sound uint32 :offset-assert 1412)
(cannon-sound uint32 :offset-assert 1416)
(lazer-sound sound-id :offset-assert 1408)
(head-sound sound-id :offset-assert 1412)
(cannon-sound sound-id :offset-assert 1416)
(last-head-roty-speed float :offset-assert 1420)
(head-roty-speed float :offset-assert 1424)
(last-cannon-roty-speed float :offset-assert 1428)
@@ -788,6 +788,7 @@
)
;; definition for method 3 of type ik-setup
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect ik-setup ((obj ik-setup))
(when (not obj)
(set! obj obj)
@@ -1942,7 +1943,7 @@
)
(set! (-> s2-2 volume) 1024)
(set! (-> s2-2 pitch-mod) 0)
(set! (-> obj lazer-sound) (the-as uint (s3-1 s2-2 (new-sound-id) s4-0)))
(set! (-> obj lazer-sound) (s3-1 s2-2 (new-sound-id) s4-0))
)
)
(set! (-> *part-id-table* 4630 init-specs 4 initial-valuef) (vector-length s5-0))
@@ -1991,9 +1992,9 @@
(t9-0)
)
)
(sound-stop (the-as sound-id (-> self lazer-sound)))
(sound-stop (the-as sound-id (-> self head-sound)))
(sound-stop (the-as sound-id (-> self cannon-sound)))
(sound-stop (-> self lazer-sound))
(sound-stop (-> self head-sound))
(sound-stop (-> self cannon-sound))
(none)
)
:trans (behavior ()
@@ -2047,15 +2048,15 @@
(bombbot-method-182 self)
)
(else
(sound-stop (the-as sound-id (-> self lazer-sound)))
(set! (-> self lazer-sound) (the-as uint 0))
(sound-stop (-> self lazer-sound))
(set! (-> self lazer-sound) (new 'static 'sound-id))
0
)
)
)
(else
(sound-stop (the-as sound-id (-> self lazer-sound)))
(set! (-> self lazer-sound) (the-as uint 0))
(sound-stop (-> self lazer-sound))
(set! (-> self lazer-sound) (new 'static 'sound-id))
0
)
)
@@ -2110,15 +2111,15 @@
)
(set! (-> s5-1 volume) 1024)
(set! (-> s5-1 pitch-mod) 0)
(set! (-> self head-sound) (the-as uint (gp-2 s5-1 (new-sound-id) (-> self root-override2 trans))))
(set! (-> self head-sound) (gp-2 s5-1 (new-sound-id) (-> self root-override2 trans)))
)
)
)
(else
(when (nonzero? (-> self head-sound))
(sound-play "bb-turret-end")
(sound-stop (the-as sound-id (-> self head-sound)))
(set! (-> self head-sound) (the-as uint 0))
(sound-stop (-> self head-sound))
(set! (-> self head-sound) (new 'static 'sound-id))
0
)
)
@@ -2133,15 +2134,15 @@
)
(set! (-> s5-3 volume) 1024)
(set! (-> s5-3 pitch-mod) 0)
(set! (-> self cannon-sound) (the-as uint (gp-4 s5-3 (new-sound-id) (-> self root-override2 trans))))
(set! (-> self cannon-sound) (gp-4 s5-3 (new-sound-id) (-> self root-override2 trans)))
)
)
)
(else
(when (nonzero? (-> self cannon-sound))
(sound-stop (the-as sound-id (-> self cannon-sound)))
(sound-stop (-> self cannon-sound))
(sound-play "bb-laser-end")
(set! (-> self cannon-sound) (the-as uint 0))
(set! (-> self cannon-sound) (new 'static 'sound-id))
0
)
)
@@ -3150,9 +3151,9 @@
(method-of-object obj bombbot-method-183)
)
(set! (-> obj shield-hit-points) 3.0)
(set! (-> obj lazer-sound) (the-as uint (new-sound-id)))
(set! (-> obj head-sound) (the-as uint 0))
(set! (-> obj cannon-sound) (the-as uint 0))
(set! (-> obj lazer-sound) (new-sound-id))
(set! (-> obj head-sound) (new 'static 'sound-id))
(set! (-> obj cannon-sound) (new 'static 'sound-id))
(transform-post)
(dotimes (s5-2 4)
(let ((s4-1 (-> obj feet s5-2)))
test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc
Generated Vendored
+3 -3
View File
@@ -13,7 +13,7 @@
(count-guard uint32 :offset-assert 244)
(max-time float :offset-assert 248)
(spawn-time time-frame :offset-assert 256)
(ambient-sound-id uint32 :offset-assert 264)
(ambient-sound-id sound-id :offset-assert 264)
(num-wanted-guards uint32 :offset-assert 268)
(guards handle 8 :offset-assert 272)
)
@@ -121,7 +121,7 @@
)
(set! (-> a0-3 volume) (the int (* 1024.0 f0-4)))
(set! (-> a0-3 pitch-mod) (the int (* 1524.0 f30-0)))
(sound-play-by-spec a0-3 (the-as sound-id (-> obj ambient-sound-id)) (-> obj root-override trans))
(sound-play-by-spec a0-3 (-> obj ambient-sound-id) (-> obj root-override trans))
)
0
(none)
@@ -234,7 +234,7 @@
(defstate die-fast (transport-level)
:virtual #t
:code (behavior ()
(sound-stop (the-as sound-id (-> self ambient-sound-id)))
(sound-stop (-> self ambient-sound-id))
(cleanup-for-death self)
(none)
)
test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc
Generated Vendored
+2
View File
@@ -841,6 +841,7 @@
)
;; definition for method 39 of type vehicle-grenade
;; WARN: Return type mismatch sound-id vs none.
(defmethod play-impact-sound! vehicle-grenade ((obj vehicle-grenade))
"Plays impact sound"
(let* ((a2-0 (-> obj root-override))
@@ -856,6 +857,7 @@
(sound-play "grenade-bounce")
)
)
(none)
)
;; failed to figure out what this is:
test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc
Generated Vendored
+10 -10
View File
@@ -1273,8 +1273,8 @@ This commonly includes things such as:
(twist oscillating-float :inline :offset-assert 1164)
(twist-kicker delayed-rand-float :inline :offset-assert 1192)
(smoke-part sparticle-launch-control :offset-assert 1220)
(motor-sound uint32 :offset-assert 1224)
(bit-sound uint32 :offset-assert 1228)
(motor-sound sound-id :offset-assert 1224)
(bit-sound sound-id :offset-assert 1228)
(movie-handle handle :offset-assert 1232)
(hud-counter handle :offset-assert 1240)
(speech-time time-frame :offset-assert 1248)
@@ -1490,13 +1490,13 @@ This commonly includes things such as:
(set-params! (-> self twist-kicker) 24 75 1.0)
(ja-post)
(dig-digger-method-23 self)
(set! (-> self motor-sound) (the-as uint (new-sound-id)))
(set! (-> self bit-sound) (the-as uint (new-sound-id)))
(set! (-> self motor-sound) (new-sound-id))
(set! (-> self bit-sound) (new-sound-id))
(none)
)
:exit (behavior ()
(sound-stop (the-as sound-id (-> self motor-sound)))
(sound-stop (the-as sound-id (-> self bit-sound)))
(sound-stop (-> self motor-sound))
(sound-stop (-> self bit-sound))
(send-event (handle->process (-> self hud-counter)) 'hide-and-die)
(set! (-> self hud-counter) (the-as handle #f))
(none)
@@ -1508,9 +1508,9 @@ This commonly includes things such as:
(when (< f0-0 (* f1-0 f1-0))
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (-> self node-list data 29))
(sound-play "digger-motor" :id (the-as sound-id (-> self motor-sound)) :position gp-1)
(sound-play "digger-motor" :id (-> self motor-sound) :position gp-1)
)
(sound-play "digger-bit" :id (the-as sound-id (-> self bit-sound)) :position (-> self root trans))
(sound-play "digger-bit" :id (-> self bit-sound) :position (-> self root trans))
)
)
(ja :num! (loop!))
@@ -1866,8 +1866,8 @@ This commonly includes things such as:
(set! (-> obj start-y) (-> obj root trans y))
(set! (-> obj smoke-part) (create-launch-control (-> *part-group-id-table* 1143) obj))
(set! (-> obj part) (create-launch-control (-> *part-group-id-table* 1144) obj))
(set! (-> obj motor-sound) (the-as uint 0))
(set! (-> obj bit-sound) (the-as uint 0))
(set! (-> obj motor-sound) (new 'static 'sound-id))
(set! (-> obj bit-sound) (new 'static 'sound-id))
(set! (-> obj movie-handle) (the-as handle #f))
(set! (-> obj hud-counter) (ppointer->handle (process-spawn hud-dig-clasp :init hud-init-by-other :to obj)))
(go (method-of-object obj idle))
test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc
Generated Vendored
+5 -5
View File
@@ -10,7 +10,7 @@
(path-pos float :offset-assert 428)
(surface-height float :offset-assert 432)
(once basic :offset-assert 436)
(bubbling-sound-id uint32 :offset-assert 440)
(bubbling-sound-id sound-id :offset-assert 440)
)
:heap-base #x140
:method-count-assert 57
@@ -197,20 +197,20 @@
(when (nonzero? (-> obj bubbling-sound-id))
(let ((v1-84 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
(set! (-> v1-84 command) (sound-command set-param))
(set! (-> v1-84 id) (the-as sound-id (-> obj bubbling-sound-id)))
(set! (-> v1-84 id) (-> obj bubbling-sound-id))
(set! (-> v1-84 params volume) -4)
(set! (-> v1-84 auto-time) 120)
(set! (-> v1-84 auto-from) 2)
(set! (-> v1-84 params mask) (the-as uint 17))
(-> v1-84 id)
)
(set! (-> obj bubbling-sound-id) (the-as uint 0))
(set! (-> obj bubbling-sound-id) (new 'static 'sound-id))
0
)
)
(else
(if (zero? (-> obj bubbling-sound-id))
(set! (-> obj bubbling-sound-id) (the-as uint (sound-play "lava-plat-sink")))
(set! (-> obj bubbling-sound-id) (sound-play "lava-plat-sink"))
)
)
)
@@ -319,7 +319,7 @@
(initialize! (-> obj sync) a1-5)
)
)
(set! (-> obj bubbling-sound-id) (the-as uint 0))
(set! (-> obj bubbling-sound-id) (new 'static 'sound-id))
(set! (-> obj once) (the-as basic #t))
0
(none)

Some files were not shown because too many files have changed in this diff Show More