projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added unmapping (invisible) scrollbar gadgets on info sub-screens
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 3e0dd34395e10bed20fe43594895ee2a65dead76..d10b95d101f3bd9ad5112ed6cb34aef2a06c74b5 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-3268,6
+3268,8
@@
static void DrawInfoScreen_TitleScreen(void)
{
SetGameStatus(GAME_MODE_TITLE);
{
SetGameStatus(GAME_MODE_TITLE);
+ UnmapAllGadgets();
+
DrawTitleScreen();
}
DrawTitleScreen();
}
@@
-3280,6
+3282,7
@@
static void DrawInfoScreen_Elements(void)
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
@@
-3382,6
+3385,8
@@
static void DrawInfoScreen_Music(void)
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
+ UnmapAllGadgets();
+
FadeOut(REDRAW_FIELD);
ClearField();
FadeOut(REDRAW_FIELD);
ClearField();
@@
-3591,6
+3596,7
@@
static void DrawInfoScreen_Version(void)
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
@@
-3892,6
+3898,7
@@
static void DrawInfoScreen_Generic(void)
{
SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic());
{
SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic());
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
@@
-9664,8
+9671,8
@@
static struct
FALSE, "play solution tape"
},
{
FALSE, "play solution tape"
},
{
- IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_
ACTIVE
,
- IMG_MENU_BUTTON_LEVELSET_INFO_
PRESSED
,
+ IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_
PRESSED
,
+ IMG_MENU_BUTTON_LEVELSET_INFO_
ACTIVE
,
&menu.main.button.levelset_info, NULL,
SCREEN_CTRL_ID_LEVELSET_INFO,
SCREEN_MASK_MAIN_HAS_SET_INFO,
&menu.main.button.levelset_info, NULL,
SCREEN_CTRL_ID_LEVELSET_INFO,
SCREEN_MASK_MAIN_HAS_SET_INFO,