projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990127-1
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index b5640b614922f9430839e9c8cd0727fac880b22a..e65ee1b0bd890ed60af1f4b180ad10c291d541c3 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-69,8
+69,7
@@
void DrawMainMenu()
}
/* unmap gadgets from last screen, map gadgets for main menu screen */
}
/* unmap gadgets from last screen, map gadgets for main menu screen */
- UnmapLevelEditorGadgets();
- UnmapGameButtons();
+ UnmapAllGadgets();
MapTapeButtons();
FadeSounds();
MapTapeButtons();
FadeSounds();
@@
-677,6
+676,7
@@
void DrawHelpScreen()
{
int i;
{
int i;
+ UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
for(i=0;i<MAX_HELPSCREEN_ELS;i++)
CloseDoor(DOOR_CLOSE_2);
for(i=0;i<MAX_HELPSCREEN_ELS;i++)
@@
-796,6
+796,7
@@
void HandleTypeName(int newxpos, KeySym key)
void DrawChooseLevel()
{
void DrawChooseLevel()
{
+ UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
FadeToFront();
CloseDoor(DOOR_CLOSE_2);
FadeToFront();
@@
-964,6
+965,7
@@
void DrawHallOfFame(int highlight_position)
{
int i;
{
int i;
+ UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
if (highlight_position < 0)
CloseDoor(DOOR_CLOSE_2);
if (highlight_position < 0)
@@
-1031,9
+1033,11
@@
void DrawSetupScreen()
{ NULL, "Save and exit" }
};
{ NULL, "Save and exit" }
};
+ UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
ClearWindow();
CloseDoor(DOOR_CLOSE_2);
ClearWindow();
- DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW);
+
+ DrawText(SX + 16, SY + 16, "SETUP",FS_BIG,FC_YELLOW);
for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++)
{
for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++)
{