diff --git a/Box b/Box index 4e51590..aded9f5 160000 --- a/Box +++ b/Box @@ -1 +1 @@ -Subproject commit 4e515902bc0e3757db9e0b5141c92e827cce4b75 +Subproject commit aded9f54be5efac9ab833b09bb2a8c04a91ea23f diff --git a/assets/scripts/init.toy b/assets/scripts/init.toy index 65f9d77..86d96ae 100644 --- a/assets/scripts/init.toy +++ b/assets/scripts/init.toy @@ -26,6 +26,8 @@ mapInputEventToKeyUp("character_right", "right"); //event, keysym mapInputEventToKeyDown("character_attack", "space"); //event, keysym +mapInputEventToKeyDown("trigger_music", "m"); //event, keysym + //TODO: escape to kill the game diff --git a/assets/scripts/scene.toy b/assets/scripts/scene.toy index b9a28ee..5b784d5 100644 --- a/assets/scripts/scene.toy +++ b/assets/scripts/scene.toy @@ -2,7 +2,7 @@ import standard; import random; import runner; import node; - +import music; //persistent members of the scene node var rng: opaque = null; @@ -31,6 +31,10 @@ fn onInit(node: opaque) { //generate the child node to render the map var renderer: opaque = node.loadChild("scripts:/tilemap/renderer.toy"); renderer.callNodeFn("setTilemap", tilemap); + + //load the music + loadMusic("music:/Music_Skylands_placeholder.ogg"); + playMusic(); } fn onStep(node: opaque) { @@ -51,6 +55,22 @@ fn onFree(node: opaque) { if (rng != null) { rng.freeRandomGenerator(); } + + freeMusic(); +} + + +//debugging +fn onKeyDown(node: opaque, event: string) { + //test the music + if (event == "trigger_music") { + if (checkMusicPaused() == false) { + pauseMusic(); + } + else { + unpauseMusic(); + } + } }