projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020803-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index de9c097383a4626dd85ce693d189903dd4b81e0f..ac88cbbedf89372adb10fff53e13f7a9a158695c 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1,7
+1,7
@@
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-200
1
Artsoft Entertainment *
+* (c) 1995-200
2
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-837,8
+837,8
@@
void HandleHelpScreen(int button)
for(i=0;i<MAX_HELPSCREEN_ELS;i++)
helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
helpscreen_state++;
for(i=0;i<MAX_HELPSCREEN_ELS;i++)
helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
helpscreen_state++;
- DrawHelpScreenElText(helpscreen_state
*
MAX_HELPSCREEN_ELS);
- DrawHelpScreenElAction(helpscreen_state
*
MAX_HELPSCREEN_ELS);
+ DrawHelpScreenElText(helpscreen_state
*
MAX_HELPSCREEN_ELS);
+ DrawHelpScreenElAction(helpscreen_state
*
MAX_HELPSCREEN_ELS);
}
else if (helpscreen_state <
num_helpscreen_els_pages + num_helpscreen_music - 1)
}
else if (helpscreen_state <
num_helpscreen_els_pages + num_helpscreen_music - 1)
@@
-867,11
+867,17
@@
void HandleHelpScreen(int button)
}
else
{
}
else
{
- if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2))
+ if (DelayReached(&hs_delay,
GAME_FRAME_DELAY * 2))
{
{
- if (helpscreen_state
<
num_helpscreen_els_pages)
- DrawHelpScreenElAction(helpscreen_state
*
MAX_HELPSCREEN_ELS);
+ if (helpscreen_state
<
num_helpscreen_els_pages)
+ DrawHelpScreenElAction(helpscreen_state
*
MAX_HELPSCREEN_ELS);
}
}
+
+ /* !!! workaround for playing "music" that is really a sound loop (and
+ must therefore periodically be reactivated with the current sound
+ engine !!! */
+ PlaySoundLoop(SND_MENU_INFO_SCREEN);
+
DoAnimation();
}
DoAnimation();
}
@@
-2091,7
+2097,7
@@
void CustomizeKeyboard(int player_nr)
{
case EVENT_KEYPRESS:
{
{
case EVENT_KEYPRESS:
{
- Key key = GetEventKey((KeyEvent *)&event,
TRU
E);
+ Key key = GetEventKey((KeyEvent *)&event,
FALS
E);
if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
{
if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
{