X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FColorFade.cpp;h=45cd6054ce1a810de47df3672da863e59dafad7f;hb=2255d436a0c2acc10b015827366a72b2ece86094;hp=196b0d8386f3d6aff03268ababc15a800c412b72;hpb=7252571fb926a187c4c40e8f4eec718f16d63ffa;p=l2e.git

diff --git a/src/graphics/ColorFade.cpp b/src/graphics/ColorFade.cpp
index 196b0d8..45cd605 100644
--- a/src/graphics/ColorFade.cpp
+++ b/src/graphics/ColorFade.cpp
@@ -1,10 +1,3 @@
-/*
- * ColorFade.cpp
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #include "ColorFade.h"
 
 #include "../app/Application.h"
@@ -16,8 +9,7 @@ using app::Input;
 namespace graphics {
 
 ColorFade::ColorFade(State *slave, Uint32 color, int duration, bool in, bool interactive)
-: ctrl(0)
-, slave(slave)
+: slave(slave)
 , blinds(0)
 , color(color)
 , duration(duration)
@@ -30,8 +22,7 @@ ColorFade::ColorFade(State *slave, Uint32 color, int duration, bool in, bool int
 
 }
 
-void ColorFade::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void ColorFade::OnEnterState(SDL_Surface *screen) {
 	if (leadIn > 0) {
 		timer = GraphicsTimers().StartCountdown(leadIn);
 	} else {
@@ -40,18 +31,18 @@ void ColorFade::OnEnterState(Application &c, SDL_Surface *screen) {
 	}
 }
 
-void ColorFade::OnExitState(Application &, SDL_Surface *screen) {
+void ColorFade::OnExitState(SDL_Surface *screen) {
 	if (blinds) {
 		SDL_FreeSurface(blinds);
 		blinds = 0;
 	}
 }
 
-void ColorFade::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void ColorFade::OnResumeState(SDL_Surface *screen) {
 	UpdateBlinds(screen->w, screen->h);
 }
 
-void ColorFade::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void ColorFade::OnPauseState(SDL_Surface *screen) {
 
 }
 
@@ -94,10 +85,10 @@ void ColorFade::HandleEvents(const Input &input) {
 			if (leadOut > 0) {
 				timer = GraphicsTimers().StartCountdown(leadOut);
 			} else {
-				ctrl->PopState();
+				Ctrl().PopState();
 			}
 		} else {
-			ctrl->PopState();
+			Ctrl().PopState();
 		}
 	}
 }