Skip to content

Commit

Permalink
mp3 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dallmeyer committed Oct 31, 2023
1 parent 29a4421 commit 5cd23b4
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
42 changes: 21 additions & 21 deletions goal_src/jak1/engine/mods/mod-common-functions.gc
Original file line number Diff line number Diff line change
Expand Up @@ -386,27 +386,27 @@ if the result of rand-vu-int-range is 1, then DANCE! if it is not 1, then Don't
(in-bubble? (meters x) (meters y) (meters z) (meters w))
)

(defun music-manager ()
(stop-main-music)
(case (-> (level-get-target-inside *level*) name)
(('test-zone)
(if (> (knuth-rand-int-range 0 15) (+ 8 5))
(play-main-music "SND/music-test-zone.mp3" (the int (-> *setting-control* default music-volume)))
(play-main-music "SND/music-test-zone-track2.mp3" (the int (-> *setting-control* default music-volume))))
)
;;Add more cases here for each level
(else
(play-main-music "" (the int (-> *setting-control* default music-volume)))
;;(stop-main-music) This function is broken but playing a invalid sound does the same thing
)
)
(none)
)

(defbehavior music-manager-proc process ()
(music-manager)
(none)
)
;; (defun music-manager ()
;; (stop-main-music)
;; (case (-> (level-get-target-inside *level*) name)
;; (('test-zone)
;; (if (> (knuth-rand-int-range 0 15) (+ 8 5))
;; (play-main-music "SND/music-test-zone.mp3" (the int (-> *setting-control* default music-volume)))
;; (play-main-music "SND/music-test-zone-track2.mp3" (the int (-> *setting-control* default music-volume))))
;; )
;; ;;Add more cases here for each level
;; (else
;; (play-main-music "" (the int (-> *setting-control* default music-volume)))
;; ;;(stop-main-music) This function is broken but playing a invalid sound does the same thing
;; )
;; )
;; (none)
;; )

;; (defbehavior music-manager-proc process ()
;; (music-manager)
;; (none)
;; )

;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Jak Color functions
Expand Down
6 changes: 3 additions & 3 deletions goal_src/jak1/engine/mods/mod-custom-code.gc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ an orb |#
(lambda :behavior process ()
(let ((stime (current-time)))
(format 0 "playing zed select~%")
(play-rand-sound "snd/Zed_Select.ogg" 80)
(play-sound-file "snd/Zed_Select.ogg" 60)
(until (> (- (current-time) stime) (seconds 3.5))
(suspend)
)
Expand All @@ -73,7 +73,7 @@ an orb |#
(lambda :behavior process ()
(let ((stime (current-time)))
(format 0 "playing gol NOOO~%")
(play-rand-sound "snd/gol-nooo.mp3" 100)
(play-sound-file "snd/gol-nooo.mp3" 170)
(until (> (- (current-time) stime) (seconds 3.5))
(suspend)
)
Expand All @@ -87,7 +87,7 @@ an orb |#
(lambda :behavior process ()
(let ((stime (current-time)))
(format 0 "playing fart~%")
(play-rand-sound "snd/random-fart-1.mp3" 100)
(play-sound-file "snd/random-fart-1.mp3" 100)
(until (> (- (current-time) stime) (seconds 1.5))
(suspend)
)
Expand Down
Binary file modified out/build/Release/bin/decompiler.exe
Binary file not shown.
Binary file modified out/build/Release/bin/extractor.exe
Binary file not shown.
Binary file modified out/build/Release/bin/gk.exe
Binary file not shown.
Binary file modified out/build/Release/bin/goalc.exe
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5cd23b4

Please sign in to comment.