X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FTitleLayer.cc;h=ed8f4c1acd340d2ca952c32b90275f704d696f2a;hp=f5e4ef02a423300c928e5cc77c52dd153dfc96af;hb=a295f8def17036c8071b56e181364f99a377cae7;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/TitleLayer.cc b/src/TitleLayer.cc
index f5e4ef0..ed8f4c1 100644
--- a/src/TitleLayer.cc
+++ b/src/TitleLayer.cc
@@ -34,7 +34,7 @@
 #include "TitleLayer.hh"
 
 
-void TitleLayer::pushed(Mf::Engine& engine)
+void TitleLayer::pushedOntoEngine()
 {
 	Mf::Scalar coeff[] = {0.0, 1.0};
 	mFadeIn.init(coeff, 0.1);
@@ -42,18 +42,18 @@ void TitleLayer::pushed(Mf::Engine& engine)
 	mGameLayer = GameLayer::alloc();
 }
 
-void TitleLayer::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt)
+void TitleLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
 	if (!mFadeIn.isDone()) mFadeIn.update(t, dt);
 }
 
-void TitleLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const
+void TitleLayer::draw(Mf::Scalar alpha) const
 {
 	glClearColor(0.0, 0.0, mFadeIn.getState(alpha), 1.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 }
 
-bool TitleLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
+bool TitleLayer::handleEvent(const Mf::Event& event)
 {
 	switch (event.type)
 	{
@@ -63,7 +63,7 @@ bool TitleLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 				//break;
 			//}
 
-			Mf::LayerP titleLayer = engine.pop(this);
+			Mf::LayerP titleLayer = Mf::engine.pop(this);
 			//engine.pushLayer(GameLayer::alloc());
 
 			Mf::Scalar coeff[] = {0.0, 0.75, 0.99, 1.0};
@@ -72,7 +72,7 @@ bool TitleLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 			//Mf::LayerP mGameLayer = GameLayer::alloc();
 			Mf::Transition<Mf::PolynomialInterpolator<3> >::Ptr transition =
 				Mf::Transition<Mf::PolynomialInterpolator<3> >::alloc(mGameLayer, titleLayer, interp);
-			engine.push(transition);
+			Mf::engine.push(transition);
 			return true;
 	}