projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020519-2-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index bbe7c10f6169cc91c797cc858d68a5056ebd10a2..801eb6b5b7f9c6e432d964407afe5c30b7565ecc 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-20,10
+20,6
@@
#include "network.h"
#include "tape.h"
#include "network.h"
#include "tape.h"
-#if defined(PLATFORM_MSDOS)
-extern boolean wait_for_vsync;
-#endif
-
/* tool button identifiers */
#define TOOL_CTRL_ID_YES 0
#define TOOL_CTRL_ID_NO 1
/* tool button identifiers */
#define TOOL_CTRL_ID_YES 0
#define TOOL_CTRL_ID_NO 1
@@
-2096,13
+2092,19
@@
unsigned int MoveDoor(unsigned int door_state)
{
stepsize = 20;
door_delay_value = 0;
{
stepsize = 20;
door_delay_value = 0;
- StopSound(SND_OEFFNEN);
+ StopSound(SND_MENU_DOOR_OPENING);
+ StopSound(SND_MENU_DOOR_CLOSING);
}
if (door_state & DOOR_ACTION)
{
if (!(door_state & DOOR_NO_DELAY))
}
if (door_state & DOOR_ACTION)
{
if (!(door_state & DOOR_NO_DELAY))
- PlaySoundStereo(SND_OEFFNEN, PSND_MAX_RIGHT);
+ {
+ if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
+ PlaySoundStereo(SND_MENU_DOOR_OPENING, SOUND_MAX_RIGHT);
+ if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
+ PlaySoundStereo(SND_MENU_DOOR_CLOSING, SOUND_MAX_RIGHT);
+ }
start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0);
start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0);
@@
-2197,7
+2199,10
@@
unsigned int MoveDoor(unsigned int door_state)
}
if (setup.quick_doors)
}
if (setup.quick_doors)
- StopSound(SND_OEFFNEN);
+ {
+ StopSound(SND_MENU_DOOR_OPENING);
+ StopSound(SND_MENU_DOOR_CLOSING);
+ }
if (door_state & DOOR_ACTION_1)
door1 = door_state & DOOR_ACTION_1;
if (door_state & DOOR_ACTION_1)
door1 = door_state & DOOR_ACTION_1;