big batch of changes

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index a1b5d6d87f3a5dbf38922de6487d3981e5f76f1c..4e26e689b495a12a39289041ac7fe992b5e085a7 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -36,6 +36,7 @@
 
 #include <iostream>
 #include <string>
+#include <vector>
 
 #include <boost/shared_ptr.hpp>
 
@@ -44,6 +45,7 @@
 #include <Moof/Interpolator.hh>
 #include <Moof/Layer.hh>
 #include <Moof/Math.hh>
+#include <Moof/Script.hh>
 #include <Moof/Sound.hh>
 
 #include "Character.hh"
@@ -66,21 +68,32 @@ public:
        }
 
        void pushed(Mf::Engine& engine);
+
        void update(Mf::Scalar t, Mf::Scalar dt);
        void draw(Mf::Scalar alpha) const;
        bool handleEvent(const Mf::Event& event);
 
 private:
 
+       void loadSceneLoader();
+       void advanceScene();
+
+       Mf::Scalar getZCoord(const Mf::Vector2& position) const;
+
        void setProjection();
        void setProjection(Mf::Scalar width, Mf::Scalar height);
 
 
+       // the script object must be mutable because some script functions must be
+       // called during draw
+       mutable Mf::Script                      mScript;
+       std::vector<std::string>        mSceneList;
+
        Mf::Sound               mMusic;
+       Mf::Sound               mPunchSound;
 
        HeroineP                mHeroine;
        SceneP                  mScene;
-       Mf::Sound               mPunchSound;
 
        Mf::PolynomialInterpolator<5> mInterp;