fixed some resource management bugs

[chaz/yoink] / src / GameLayer.cc

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 86b871076ef68aca1d27fddda59f3a3c6b7dcf54..54e40687cfdae138a94814abae26251ac5785e7a 100644 (file)
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -27,8 +27,8 @@ void GameLayer::loadSceneLoader()
        state_.script.import_standard_libraries();
        moof::log::import(state_.script);
 
-       std::string path("loader");
-       if (!moof::resource::find(path))
+       std::string path = moof::resource::find_file("scenes/loader.lua");
+       if (path.empty())
        {
                throw std::runtime_error("cannot find scene loader script");
        }
@@ -80,9 +80,9 @@ void GameLayer::advanceScene(moof::settings& settings)
 GameLayer::GameLayer()
 {
        moof::log_info("about to load sound resource...");
-       music_.sample("NightFusionIntro.ogg");
+       music_.sample("sounds/NightFusionIntro.ogg");
        music_.loop(true);
-       music_.enqueue("NightFusionLoop.ogg");
+       music_.enqueue("sounds/NightFusionLoop.ogg");
        music_.position(moof::vector3(10.0, 5.0, 0.0));
 
        mThinkTimer.init(boost::bind(&GameLayer::thinkTimer, this),
@@ -99,7 +99,7 @@ void GameLayer::did_add_to_view()
 {
        bool isMute = false;
        settings().get("nomusic", isMute);
-       if (!isMute) music_.stream();
+       music_.stream();
 
        loadSceneLoader();
        advanceScene(settings());               // load the first scene