X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.hh;fp=src%2FGameLayer.hh;h=73b6a23e6a141ec2315cb9f5f2a5f34e91e90dc8;hp=4e0a84f07752c4742417930073cf5e1f53f0a71d;hb=b357615aba1dbde81e3c6999366604e6001010a7;hpb=246d7d6e4386b686327163d621c7c8b398b7d479 diff --git a/src/GameLayer.hh b/src/GameLayer.hh index 4e0a84f..73b6a23 100644 --- a/src/GameLayer.hh +++ b/src/GameLayer.hh @@ -80,9 +80,7 @@ public: struct State { - // the script object must be mutable because some script functions must be - // called during draw - mutable Mf::Script script; + Mf::Script script; std::vector sceneList; HeroineP heroine; @@ -98,12 +96,14 @@ private: void loadSceneLoader(); void advanceScene(); - Mf::Scalar getZCoord(const Mf::Vector2& position) const; + void thinkTimer(); void setProjection(); void setProjection(Mf::Scalar width, Mf::Scalar height); State mState; + Mf::Timer mThinkTimer; + Mf::SoundStream mMusic; Mf::Sound mPunchSound;