X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.cc;h=bfc788af1a75f46ed0f5adfa19ac963be5420c74;hp=8b155e7dd96bf991df058a41806fe5d760214c99;hb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c;hpb=76b3f4be992514a740ac03cdbdd57844142a0b4c

diff --git a/src/Scene.cc b/src/Scene.cc
index 8b155e7..bfc788a 100644
--- a/src/Scene.cc
+++ b/src/Scene.cc
@@ -156,7 +156,7 @@ struct Scene::Impl : public Mf::Manager<Impl>
 	void init(const std::string& name) {}
 
 
-	void importSceneBindings(Mf::Script& script)
+	void importSceneBindings(Mf::Settings& settings, Mf::Script& script)
 	{
 		script.importFunction("SetBounds",
 				boost::bind(&Impl::setBounds, this, _1));
@@ -176,7 +176,7 @@ struct Scene::Impl : public Mf::Manager<Impl>
 				boost::bind(&Impl::drawTile, this, _1));
 
 		int detail = 3;
-		Mf::settings.get("detail", detail);
+		settings.get("detail", detail);
 		script.push(detail); script.set("detail");
 
 		script.push(1); script.set("LOW");
@@ -193,7 +193,7 @@ struct Scene::Impl : public Mf::Manager<Impl>
 	}
 
 
-	Mf::Script::Result load(Mf::Script& script)
+	Mf::Script::Result load(Mf::Settings& settings, Mf::Script& script)
 	{
 		std::string filePath = Scene::getPath(getName());
 		if (filePath == "")
@@ -202,7 +202,7 @@ struct Scene::Impl : public Mf::Manager<Impl>
 			return Mf::Script::FILE_ERROR;
 		}
 
-		importSceneBindings(script);
+		importSceneBindings(settings, script);
 		return script.doFile(filePath);
 	}
 
@@ -482,10 +482,10 @@ Scene::Scene(const std::string& name) :
 	mImpl(Scene::Impl::getInstance(name)) {}
 
 
-Mf::Script::Result Scene::load(Mf::Script& script)
+Mf::Script::Result Scene::load(Mf::Settings& settings, Mf::Script& script)
 {
 	// pass through
-	return mImpl->load(script);
+	return mImpl->load(settings, script);
 }