working on ios.

This commit is contained in:
Bryce Covert
2015-09-12 23:11:18 -07:00
parent 0ca5dc3fc5
commit 43152747bc
16 changed files with 49 additions and 42 deletions

View File

@@ -301,7 +301,7 @@ void main()
(get-in @entities [:room :entities :warden])
(do
(actions/talk entities :ego "I'll just take a sip!")
(sound! (sound "ego/potion.ogg") :play (utils/current-sound-volume))
(sound! (utils/load-sound "ego/potion.ogg") :play (utils/current-sound-volume))
(actions/play-animation entities :ego :grow :stop? false)
(actions/talk entities :warden "Huh? What was that?!")
(Thread/sleep 1000)
@@ -314,7 +314,7 @@ void main()
:else
(do
(actions/talk entities :ego "I'll just take a sip!")
(sound! (sound "ego/potion.ogg") :play (utils/current-sound-volume))
(sound! (utils/load-sound "ego/potion.ogg") :play (utils/current-sound-volume))
(actions/play-animation entities :ego :grow :stop? false))))
:recipe
@@ -677,13 +677,13 @@ void main()
:origin-x 9
:origin-y 0
:scaled true
:milk-sound (sound "outsidehouse/milk.ogg")
:step-sound-1 (sound "ego/step-1.ogg")
:step-sound-2 (sound "ego/step-2.ogg")
:sigh-sound (sound "ego/sigh.ogg")
:breakglass-sound (sound "ego/breakglass.ogg")
:idea-sound (sound "ego/idea.ogg")
:blink (sound "ego/blink2.ogg")
:milk-sound (utils/load-sound "outsidehouse/milk.ogg")
:step-sound-1 (utils/load-sound "ego/step-1.ogg")
:step-sound-2 (utils/load-sound "ego/step-2.ogg")
:sigh-sound (utils/load-sound "ego/sigh.ogg")
:breakglass-sound (utils/load-sound "ego/breakglass.ogg")
:idea-sound (utils/load-sound "ego/idea.ogg")
:blink (utils/load-sound "ego/blink2.ogg")
:scale-x start-scale
:scale-y start-scale
:talk-color (color 0.6 1.0 1.0 1.0)
@@ -996,7 +996,7 @@ void main()
:closing? {:object nil
:value false}
:sounds {:blink (sound "blink-other.ogg")
:sounds {:blink (utils/load-sound "blink-other.ogg")
:object nil}
:fade {:object nil
:opacity 0.0}