X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=493aa6cfa5392334c6c4165edfcc0e7c5f0e948a;hp=46c32631aad077b362f9db36bebc7513bd179c10;hb=987971a961454d97082c6448fdc0bbeb540281bb;hpb=be9ebc1104574e5e81e19c5caba0c23b54df826d

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 46c3263..493aa6c 100644
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include <Moof/Engine.hh>
+#include <Moof/Core.hh>
 #include <Moof/Error.hh>
 #include <Moof/Log.hh>
 #include <Moof/Math.hh>
@@ -110,7 +110,7 @@ GameLayer::GameLayer() :
 	mMusic.enqueue("NightFusionLoop");
 
 	bool isMute = false;
-	Mf::Settings::getInstance().get("nomusic", isMute);
+	Mf::settings.get("nomusic", isMute);
 	if (!isMute) mMusic.play();
 
 	//mMusic.setPosition(Mf::Vector3(10.0, 5.0, 0.0));
@@ -133,7 +133,7 @@ GameLayer::GameLayer() :
 
 void GameLayer::pushedOntoEngine()
 {
-	Mf::engine.push(mHud);
+	Mf::core.push(mHud);
 
 	mRay.direction.set(1.0, 0.0);
 
@@ -259,12 +259,12 @@ bool GameLayer::handleEvent(const Mf::Event& event)
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_ESCAPE)
 			{
-				Mf::engine.pop(this);
+				Mf::core.pop(this);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_h)
 			{
-				Mf::engine.push(mHud);
+				Mf::core.push(mHud);
 				return true;
 			}
 			return mState.heroine->handleEvent(event);
@@ -285,8 +285,8 @@ bool GameLayer::handleEvent(const Mf::Event& event)
 
 void GameLayer::setProjection()
 {
-	Mf::VideoP video = Mf::engine.getVideo();
-	setProjection(video->getWidth(), video->getHeight());
+	ASSERT(Mf::video && "no current video context from which to get dimensions");
+	setProjection(Mf::video->getWidth(), Mf::video->getHeight());
 }
 
 void GameLayer::setProjection(Mf::Scalar width, Mf::Scalar height)