X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.hh;h=31a4ecd919f8cba737c8849fea1cbf9d22e5926a;hp=85a6716953109c9739c7b0c6ba97108c18a01912;hb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Scene.hh b/src/Scene.hh
index 85a6716..31a4ecd 100644
--- a/src/Scene.hh
+++ b/src/Scene.hh
@@ -26,6 +26,10 @@
 class Character;
 
 
+namespace Mf {
+class Settings;
+}
+
 class Scene;
 typedef boost::shared_ptr<Scene> SceneP;
 
@@ -43,7 +47,7 @@ public:
 		return SceneP(new Scene(name));
 	}
 
-	Mf::Script::Result load(Mf::Script& script);
+	Mf::Script::Result load(Mf::Settings& settings, Mf::Script& script);
 
 	void draw(Mf::Scalar alpha) const;
 	void drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const;
@@ -51,7 +55,7 @@ public:
 	Mf::Scalar getZCoord(const Mf::Vector2& position) const;
 
 	bool castRay(const Mf::Ray<2>& ray,
-			std::list<Mf::Ray<2>::Intersection>& hits) const;
+			std::list<Mf::Ray<2>::Contact>& hits) const;
 	bool checkForCollision(Character& character);
 
 	static std::string getPath(const std::string& name);