X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FColorFade.h;h=aad9247e09ac40ee61ec9a6519f1ca31b313fd2f;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=7226a00e29ca658ba57b23ba0e721cd5048619b0;hpb=123ca72f7a92d2529c6f9b6bdff3f13d6f0223c9;p=l2e.git

diff --git a/src/graphics/ColorFade.h b/src/graphics/ColorFade.h
index 7226a00..aad9247 100644
--- a/src/graphics/ColorFade.h
+++ b/src/graphics/ColorFade.h
@@ -1,10 +1,3 @@
-/*
- * ColorFade.h
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_COLORFADE_H_
 #define GRAPHICS_COLORFADE_H_
 
@@ -27,24 +20,24 @@ public:
 	void SetLeadOutTime(int ms) { leadOut = ms; }
 
 public:
-	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-
-	virtual void Resize(int width, int height);
-
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
+private:
+	virtual void OnEnterState(SDL_Surface *screen);
+	virtual void OnExitState(SDL_Surface *screen);
+	virtual void OnResumeState(SDL_Surface *screen);
+	virtual void OnPauseState(SDL_Surface *screen);
+
+	virtual void OnResize(int width, int height);
+
 private:
 	void UpdateBlinds(int width, int height);
 	Uint8 GetAlpha() const;
 
 private:
 	app::Timer<Uint32> timer;
-	app::Application *ctrl;
 	app::State *slave;
 	SDL_Surface *blinds;
 	Uint32 color;
@@ -60,4 +53,4 @@ private:
 
 }
 
-#endif /* GRAPHICS_COLORFADE_H_ */
+#endif