X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgraphics%2FColorFade.cpp;h=55e14fc811d87e2427a4ef0443259a3da996d1da;hb=7df7c6eca83c2b5c0ee17c55340d8863f9d638f5;hp=45cd6054ce1a810de47df3672da863e59dafad7f;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git

diff --git a/src/graphics/ColorFade.cpp b/src/graphics/ColorFade.cpp
index 45cd605..55e14fc 100644
--- a/src/graphics/ColorFade.cpp
+++ b/src/graphics/ColorFade.cpp
@@ -18,7 +18,8 @@ ColorFade::ColorFade(State *slave, Uint32 color, int duration, bool in, bool int
 , leadInDone(true)
 , fadeDone(false)
 , in(in)
-, interactive(interactive) {
+, interactive(interactive)
+, doublePop(false) {
 
 }
 
@@ -86,15 +87,21 @@ void ColorFade::HandleEvents(const Input &input) {
 				timer = GraphicsTimers().StartCountdown(leadOut);
 			} else {
 				Ctrl().PopState();
+				if (doublePop) {
+					Ctrl().PopState();
+				}
 			}
 		} else {
 			Ctrl().PopState();
+			if (doublePop) {
+				Ctrl().PopState();
+			}
 		}
 	}
 }
 
 
-void ColorFade::UpdateWorld(float deltaT) {
+void ColorFade::UpdateWorld(Uint32 deltaT) {
 	if (interactive) {
 		slave->UpdateWorld(deltaT);
 	}