projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug in editor when using undo after rotating level repeatedly
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index cf81e97d68c673192c94612c863b327c70609482..33da76b253b67ab4dcabc307ba575ab4d7e9a7bf 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1619,9
+1619,11
@@
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
if (game_status == GAME_MODE_INFO)
{
if (game_status == GAME_MODE_INFO)
{
+ int fade_mask = (num_title_screens == 0 ? REDRAW_FIELD : REDRAW_ALL);
+
info_mode = INFO_MODE_MAIN;
info_mode = INFO_MODE_MAIN;
- DrawInfoScreenExt(
REDRAW_ALL
, use_fading_main_menu);
+ DrawInfoScreenExt(
fade_mask
, use_fading_main_menu);
}
else /* default: return to main menu */
{
}
else /* default: return to main menu */
{
@@
-3019,7
+3021,6
@@
void DrawInfoScreen_LevelSet()
char *filename = getLevelSetInfoFilename();
char *title = "Level Set Information:";
int ystart1 = mSY - SY + 100;
char *filename = getLevelSetInfoFilename();
char *title = "Level Set Information:";
int ystart1 = mSY - SY + 100;
- int ystart2 = mSY - SY + 150;
int ybottom = mSY - SY + SYSIZE - 20;
if (filename == NULL)
int ybottom = mSY - SY + SYSIZE - 20;
if (filename == NULL)
@@
-3297,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 */
int scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
/* correct scrollbar position if placed outside menu (playfield) area */
- if (scrollbar_xpos >
m
SX + SC_SCROLLBAR_XPOS)
- scrollbar_xpos =
m
SX + 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,
/* clear menu list area, but not title or scrollbar */
DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,