projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990124-1
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 109b1283b9cadc833b9d5bc21d37f71a8ceb85c7..b5640b614922f9430839e9c8cd0727fac880b22a 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-68,8
+68,10
@@
void DrawMainMenu()
return;
}
return;
}
- /*
needed if last screen was the level editor
*/
+ /*
unmap gadgets from last screen, map gadgets for main menu screen
*/
UnmapLevelEditorGadgets();
UnmapLevelEditorGadgets();
+ UnmapGameButtons();
+ MapTapeButtons();
FadeSounds();
GetPlayerConfig();
FadeSounds();
GetPlayerConfig();
@@
-2112,6
+2114,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
+2223,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
+2291,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;