destroyed global classes; view hierarchy instead

[chaz/yoink] / src / Scene.hh

diff --git a/src/Scene.hh b/src/Scene.hh
index 85a6716953109c9739c7b0c6ba97108c18a01912..31a4ecd919f8cba737c8849fea1cbf9d22e5926a 100644 (file)
--- 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);