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 109b1283b9cadc833b9d5bc21d37f71a8ceb85c7..e65ee1b0bd890ed60af1f4b180ad10c291d541c3 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-68,8
+68,9
@@
void DrawMainMenu()
return;
}
return;
}
- /* needed if last screen was the level editor */
- UnmapLevelEditorGadgets();
+ /* unmap gadgets from last screen, map gadgets for main menu screen */
+ UnmapAllGadgets();
+ MapTapeButtons();
FadeSounds();
GetPlayerConfig();
FadeSounds();
GetPlayerConfig();
@@
-675,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++)
@@
-794,6
+796,7
@@
void HandleTypeName(int newxpos, KeySym key)
void DrawChooseLevel()
{
void DrawChooseLevel()
{
+ UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
FadeToFront();
CloseDoor(DOOR_CLOSE_2);
FadeToFront();
@@
-962,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)
@@
-1029,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++)
{
@@
-2112,6
+2118,11
@@
void HandleGameActions()
void HandleVideoButtons(int mx, int my, int button)
{
void HandleVideoButtons(int mx, int my, int button)
{
+ return;
+
+
+
+
if (game_status != MAINMENU && game_status != PLAYING)
return;
if (game_status != MAINMENU && game_status != PLAYING)
return;
@@
-2216,6
+2227,13
@@
void HandleVideoButtons(int mx, int my, int button)
void HandleSoundButtons(int mx, int my, int button)
{
void HandleSoundButtons(int mx, int my, int button)
{
+
+
+
+ return;
+
+
+
if (game_status != PLAYING)
return;
if (game_status != PLAYING)
return;
@@
-2277,6
+2295,13
@@
void HandleSoundButtons(int mx, int my, int button)
void HandleGameButtons(int mx, int my, int button)
{
void HandleGameButtons(int mx, int my, int button)
{
+
+
+
+ return;
+
+
+
if (game_status != PLAYING)
return;
if (game_status != PLAYING)
return;