From: Holger Schemel <info@artsoft.org>
Date: Fri, 21 Nov 2014 23:28:36 +0000 (+0100)
Subject: fixed menu display bugs caused by drawing outside menu area (again)
X-Git-Tag: 4.0.0.0-rc1~313
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=ef04ef978ebcaec42520650271b9ec741fa26c6b

fixed menu display bugs caused by drawing outside menu area (again)
---

diff --git a/ChangeLog b/ChangeLog
index f89b0448..d0d59fcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-11-22
+	* fixed menu display bugs caused by drawing outside menu area (again)
+
 2014-11-19
 	* fixed broken door animations when switching between custom graphics
 
diff --git a/src/conftime.h b/src/conftime.h
index 6640ee06..c18ff03f 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2014-11-19 21:47"
+#define COMPILE_DATE_STRING "2014-11-22 00:24"
diff --git a/src/screens.c b/src/screens.c
index 982bdf90..33da76b2 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -3298,8 +3298,8 @@ static void clearMenuListArea()
   int scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
 
   /* correct scrollbar position if placed outside menu (playfield) area */
-  if (scrollbar_xpos > mSX + SC_SCROLLBAR_XPOS)
-    scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS;
+  if (scrollbar_xpos > SX + SC_SCROLLBAR_XPOS)
+    scrollbar_xpos = SX + SC_SCROLLBAR_XPOS;
 
   /* clear menu list area, but not title or scrollbar */
   DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,