From 5e5ddd8cc8204fc6e99d1bdd518a055b88682af2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Fri, 14 Jan 2011 09:22:09 +0000
Subject: [PATCH] - fixed: The help screens were stretched on 16:9 displays -
 fixed: The bunny scroller did not advance its animation to the end when
 aborted.

SVN r3102 (trunk)
---
 src/intermission/intermission.cpp | 11 +++++++++++
 src/intermission/intermission.h   |  1 +
 src/menu/readthis.cpp             | 12 +++---------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp
index 0c75575cd..556f91563 100644
--- a/src/intermission/intermission.cpp
+++ b/src/intermission/intermission.cpp
@@ -612,6 +612,17 @@ void DIntermissionScreenScroller::Init(FIntermissionAction *desc, bool first)
 	mScrollDir = static_cast<FIntermissionActionScroller*>(desc)->mScrollDir;
 }
 
+int DIntermissionScreenScroller::Responder (event_t *ev)
+{
+	int res = Super::Responder(ev);
+	if (res == -1)
+	{
+		mBackground = mSecondPic;
+		mTicker = mScrollDelay + mScrollTime;
+	}
+	return res;
+}
+
 void DIntermissionScreenScroller::Drawer ()
 {
 	FTexture *tex = TexMan[mFirstPic];
diff --git a/src/intermission/intermission.h b/src/intermission/intermission.h
index 1035bd8f3..ee316c349 100644
--- a/src/intermission/intermission.h
+++ b/src/intermission/intermission.h
@@ -268,6 +268,7 @@ public:
 
 	DIntermissionScreenScroller() {}
 	virtual void Init(FIntermissionAction *desc, bool first);
+	virtual int Responder (event_t *ev);
 	virtual void Drawer ();
 };
 
diff --git a/src/menu/readthis.cpp b/src/menu/readthis.cpp
index 388dca716..197981ad3 100644
--- a/src/menu/readthis.cpp
+++ b/src/menu/readthis.cpp
@@ -98,19 +98,13 @@ void DReadThisMenu::Drawer()
 		prevpic = TexMan[gameinfo.infoPages[mScreen-2].GetChars()];
 	}
 
+	screen->Dim(0, 1.0, 0,0, SCREENWIDTH, SCREENHEIGHT);
 	alpha = MIN<fixed_t> (Scale (gametic - mInfoTic, OPAQUE, TICRATE/3), OPAQUE);
 	if (alpha < OPAQUE && prevpic != NULL)
 	{
-		screen->DrawTexture (prevpic, 0, 0,
-			DTA_DestWidth, screen->GetWidth(),
-			DTA_DestHeight, screen->GetHeight(),
-			TAG_DONE);
+		screen->DrawTexture (prevpic, 0, 0, DTA_Fullscreen, true, TAG_DONE);
 	}
-	screen->DrawTexture (tex, 0, 0,
-		DTA_DestWidth, screen->GetWidth(),
-		DTA_DestHeight, screen->GetHeight(),
-		DTA_Alpha, alpha,
-		TAG_DONE);
+	screen->DrawTexture (tex, 0, 0, DTA_Fullscreen, true, DTA_Alpha, alpha,	TAG_DONE);
 
 }