projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070320-2-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 6529d447a61ecad013805180c6b6f7160d062450..f21f232956e07c2ed8ac11d4924b2a6e569f235d 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-533,8
+533,8
@@
void FadeExt(int fade_mask, int fade_mode)
width = FULL_SXSIZE;
height = FULL_SYSIZE;
width = FULL_SXSIZE;
height = FULL_SYSIZE;
- fade_delay =
menu
.fade_delay;
- post_delay = (fade_mode == FADE_MODE_FADE_OUT ?
menu
.post_delay : 0);
+ fade_delay =
fading
.fade_delay;
+ post_delay = (fade_mode == FADE_MODE_FADE_OUT ?
fading
.post_delay : 0);
draw_border_function = DrawMaskedBorder_FIELD;
}
draw_border_function = DrawMaskedBorder_FIELD;
}
@@
-545,8
+545,8
@@
void FadeExt(int fade_mask, int fade_mode)
width = WIN_XSIZE;
height = WIN_YSIZE;
width = WIN_XSIZE;
height = WIN_YSIZE;
- fade_delay =
title.fade_delay_final
;
- post_delay = (fade_mode == FADE_MODE_FADE_OUT ?
title.post_delay_final
: 0);
+ fade_delay =
fading.fade_delay
;
+ post_delay = (fade_mode == FADE_MODE_FADE_OUT ?
fading.post_delay
: 0);
}
redraw_mask |= fade_mask;
}
redraw_mask |= fade_mask;
@@
-6445,10
+6445,8
@@
void InitGraphicInfo_EM(void)
#endif
}
#endif
}
-void PlayMenuSound
(
)
+void PlayMenuSound
Ext(int sound
)
{
{
- int sound = menu.sound[game_status];
-
if (sound == SND_UNDEFINED)
return;
if (sound == SND_UNDEFINED)
return;
@@
-6462,6
+6460,11
@@
void PlayMenuSound()
PlaySound(sound);
}
PlaySound(sound);
}
+void PlayMenuSound()
+{
+ PlayMenuSoundExt(menu.sound[game_status]);
+}
+
void PlayMenuSoundStereo(int sound, int stereo_position)
{
if (sound == SND_UNDEFINED)
void PlayMenuSoundStereo(int sound, int stereo_position)
{
if (sound == SND_UNDEFINED)
@@
-6477,10
+6480,8
@@
void PlayMenuSoundStereo(int sound, int stereo_position)
PlaySoundStereo(sound, stereo_position);
}
PlaySoundStereo(sound, stereo_position);
}
-void PlayMenuSoundIfLoop
(
)
+void PlayMenuSoundIfLoop
Ext(int sound
)
{
{
- int sound = menu.sound[game_status];
-
if (sound == SND_UNDEFINED)
return;
if (sound == SND_UNDEFINED)
return;
@@
-6492,10
+6493,13
@@
void PlayMenuSoundIfLoop()
PlaySoundLoop(sound);
}
PlaySoundLoop(sound);
}
-void PlayMenu
Music
()
+void PlayMenu
SoundIfLoop
()
{
{
- int music = menu.music[game_status];
+ PlayMenuSoundIfLoopExt(menu.sound[game_status]);
+}
+void PlayMenuMusicExt(int music)
+{
if (music == MUS_UNDEFINED)
return;
if (music == MUS_UNDEFINED)
return;
@@
-6505,6
+6509,11
@@
void PlayMenuMusic()
PlayMusic(music);
}
PlayMusic(music);
}
+void PlayMenuMusic()
+{
+ PlayMenuMusicExt(menu.music[game_status]);
+}
+
void PlaySoundActivating()
{
#if 0
void PlaySoundActivating()
{
#if 0