X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=7a8e98cc32471455749b47cf933df38e816d541c;hp=0ed249c8af964ffffd1bd009c21592350459280e;hb=a295f8def17036c8071b56e181364f99a377cae7;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 0ed249c..7a8e98c 100644
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -27,7 +27,7 @@
 *******************************************************************************/
 
 #include <Moof/Engine.hh>
-#include <Moof/Exception.hh>
+#include <Moof/Error.hh>
 #include <Moof/Log.hh>
 #include <Moof/Math.hh>
 #include <Moof/OpenGL.hh>
@@ -35,7 +35,6 @@
 #include <Moof/Video.hh>
 
 #include "GameLayer.hh"
-#include "Hud.hh"
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -50,7 +49,7 @@ void GameLayer::loadSceneLoader()
 	std::string loaderPath = Scene::getPath("loader");
 	if (loaderPath == "")
 	{
-		throw Mf::Exception(Mf::ErrorCode::RESOURCE_NOT_FOUND, "loader");
+		throw Mf::Error(Mf::Error::RESOURCE_NOT_FOUND, "loader");
 	}
 
 	Mf::Script::Result status = mState.script.doFile(loaderPath);
@@ -59,14 +58,14 @@ void GameLayer::loadSceneLoader()
 		std::string str;
 		mState.script[-1].get(str);
 
-		throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR, str);
+		throw Mf::Error(Mf::Error::SCRIPT_ERROR, str);
 	}
 
 	mState.script.getGlobalTable().pushField("scenes");
 	mState.script.getTop().get(mState.sceneList);
 	if (mState.sceneList.size() == 0)
 	{
-		throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR,
+		throw Mf::Error(Mf::Error::SCRIPT_ERROR,
 				"no variable `scenes' within loader");
 	}
 }
@@ -84,7 +83,7 @@ void GameLayer::advanceScene()
 			std::string str;
 			mState.script[-1].get(str);
 
-			throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR, str);
+			throw Mf::Error(Mf::Error::SCRIPT_ERROR, str);
 		}
 
 		mState.script.getGlobalTable().pushField("Event");
@@ -103,6 +102,7 @@ void GameLayer::advanceScene()
 
 
 GameLayer::GameLayer() :
+	mHud(Hud::alloc(mState)),
 	mMusic("NightFusionIntro"),
 	mPunchSound("Thump")
 {
@@ -131,9 +131,9 @@ GameLayer::GameLayer() :
 }
 
 
-void GameLayer::pushed(Mf::Engine& engine)
+void GameLayer::pushedOntoEngine()
 {
-	engine.push(Hud::alloc(mState));
+	Mf::engine.push(mHud);
 
 	mRay.direction.set(1.0, 0.0);
 
@@ -147,7 +147,7 @@ void GameLayer::pushed(Mf::Engine& engine)
 }
 
 
-void GameLayer::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt)
+void GameLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
 	mState.camera.update(t, dt);
 	mState.heroine->update(t, dt);
@@ -200,7 +200,7 @@ void GameLayer::rayTimer()
 }
 
 
-void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const
+void GameLayer::draw(Mf::Scalar alpha) const
 {
 	mState.camera.uploadToGL(alpha);
 
@@ -219,7 +219,7 @@ void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const
 	mSphere.draw();
 }
 
-bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
+bool GameLayer::handleEvent(const Mf::Event& event)
 {
 	switch (event.type)
 	{
@@ -259,12 +259,12 @@ bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_ESCAPE)
 			{
-				engine.pop(this);
+				Mf::engine.pop(this);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_h)
 			{
-				engine.push(Hud::alloc(mState));
+				Mf::engine.push(mHud);
 				return true;
 			}
 			return mState.heroine->handleEvent(event);
@@ -285,7 +285,7 @@ bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 
 void GameLayer::setProjection()
 {
-	Mf::VideoP video = Mf::Engine::getInstance().getVideo();
+	Mf::VideoP video = Mf::engine.getVideo();
 	setProjection(video->getWidth(), video->getHeight());
 }