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

diff --git a/ChangeLog b/ChangeLog
index f89b044824084b3e17551cf0b15641ea977d55f8..d0d59fcc4b480adf406f8e8d35be631f0362b154 100644 (file)
--- 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 6640ee06d92313a92b43a069b55a6a5d029e396c..c18ff03f1a776b0a4035fa0c99bfefa2283692dc 100644 (file)
--- 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 982bdf90fc87f91c03585d7c03604bf7fc6f8647..33da76b253b67ab4dcabc307ba575ab4d7e9a7bf 100644 (file)
--- 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,