projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020417-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index e6556da224aef86a4f328ecd4370c326fc547aef..76ed7a1e4a054a7adc05df41465b8d4337281bfd 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-135,8
+135,9
@@
void DrawMainMenu()
UnmapAllGadgets();
FadeSounds();
KeyboardAutoRepeatOn();
UnmapAllGadgets();
FadeSounds();
KeyboardAutoRepeatOn();
- ActivateJoystick
IfAvailable
();
+ ActivateJoystick();
SetDrawDeactivationMask(REDRAW_NONE);
SetDrawDeactivationMask(REDRAW_NONE);
+ audio.sound_deactivated = FALSE;
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
@@
-234,7
+235,6
@@
void DrawMainMenu()
#if 0
ClearEventQueue();
#endif
#if 0
ClearEventQueue();
#endif
-
}
static void gotoTopLevelDir()
}
static void gotoTopLevelDir()
@@
-1797,9
+1797,11
@@
void DrawSetupScreen_Input()
DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
+#if 0
DeactivateJoystickForCalibration();
DrawTextFCentered(SYSIZE - 20, FC_BLUE,
"Joysticks deactivated on this screen");
DeactivateJoystickForCalibration();
DrawTextFCentered(SYSIZE - 20, FC_BLUE,
"Joysticks deactivated on this screen");
+#endif
HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
FadeToFront();
HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
FadeToFront();
@@
-2348,6
+2350,8
@@
void CalibrateJoystick(int player_nr)
void DrawSetupScreen()
{
void DrawSetupScreen()
{
+ DeactivateJoystick();
+
if (setup_mode == SETUP_MODE_INPUT)
DrawSetupScreen_Input();
else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
if (setup_mode == SETUP_MODE_INPUT)
DrawSetupScreen_Input();
else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)