projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030924-B-src
[rocksndiamonds.git]
/
src
/
conf_e2s.c
diff --git
a/src/conf_e2s.c
b/src/conf_e2s.c
index 76b0dab529650e497764d06734a709992f5ba361..a986c3d33184edb4b28e157c94757d76ed9e1359 100644
(file)
--- a/
src/conf_e2s.c
+++ b/
src/conf_e2s.c
@@
-29,33
+29,45
@@
static struct
element_to_sound[] =
{
{
element_to_sound[] =
{
{
- EL_
INTERNAL_DEFAULT_ELEMENT, TRUE,
ACTION_DIGGING,
+ EL_
DEFAULT, TRUE,
ACTION_DIGGING,
SND_CLASS_DEFAULT_DIGGING
},
{
SND_CLASS_DEFAULT_DIGGING
},
{
- EL_
INTERNAL_DEFAULT_ELEMENT, TRUE,
ACTION_COLLECTING,
+ EL_
DEFAULT, TRUE,
ACTION_COLLECTING,
SND_CLASS_DEFAULT_COLLECTING
},
{
SND_CLASS_DEFAULT_COLLECTING
},
{
- EL_
INTERNAL_DEFAULT_ELEMENT, TRUE,
ACTION_SNAPPING,
+ EL_
DEFAULT, TRUE,
ACTION_SNAPPING,
SND_CLASS_DEFAULT_SNAPPING
},
{
SND_CLASS_DEFAULT_SNAPPING
},
{
- EL_
INTERNAL_DEFAULT_ELEMENT, TRUE,
ACTION_PUSHING,
+ EL_
DEFAULT, TRUE,
ACTION_PUSHING,
SND_CLASS_DEFAULT_PUSHING
},
{
SND_CLASS_DEFAULT_PUSHING
},
{
- EL_
INTERNAL_DEFAULT_ELEMENT, TRUE,
ACTION_IMPACT,
+ EL_
DEFAULT, TRUE,
ACTION_IMPACT,
SND_CLASS_DEFAULT_IMPACT
},
{
SND_CLASS_DEFAULT_IMPACT
},
{
- EL_INTERNAL_DEFAULT_ELEMENT, TRUE, ACTION_PASSING,
+ EL_DEFAULT, TRUE, ACTION_WALKING,
+ SND_CLASS_DEFAULT_WALKING
+ },
+ {
+ EL_DEFAULT, TRUE, ACTION_PASSING,
SND_CLASS_DEFAULT_PASSING
},
{
SND_CLASS_DEFAULT_PASSING
},
{
- EL_INTERNAL_DEFAULT_ELEMENT, TRUE, ACTION_EXPLODING,
+ EL_DEFAULT, TRUE, ACTION_DYING,
+ SND_CLASS_DEFAULT_DYING
+ },
+ {
+ EL_DEFAULT, TRUE, ACTION_EXPLODING,
SND_CLASS_DEFAULT_EXPLODING
},
SND_CLASS_DEFAULT_EXPLODING
},
+ {
+ EL_SP_DEFAULT, TRUE, ACTION_EXPLODING,
+ SND_CLASS_SP_DEFAULT_EXPLODING
+ },
{
EL_BD_DIAMOND, FALSE, ACTION_COLLECTING,
SND_BD_DIAMOND_COLLECTING
{
EL_BD_DIAMOND, FALSE, ACTION_COLLECTING,
SND_BD_DIAMOND_COLLECTING
@@
-213,8
+225,8
@@
element_to_sound[] =
SND_CLASS_SOKOBAN_EMPTYING
},
{
SND_CLASS_SOKOBAN_EMPTYING
},
{
- EL_
EMPTY_SPACE, FALSE, ACTION_DIGG
ING,
- SND_
EMPTY_SPACE_DIGG
ING
+ EL_
PLAYER_1, TRUE, ACTION_MOV
ING,
+ SND_
CLASS_PLAYER_MOV
ING
},
{
EL_SAND, FALSE, ACTION_DIGGING,
},
{
EL_SAND, FALSE, ACTION_DIGGING,
@@
-285,7
+297,7
@@
element_to_sound[] =
SND_CLASS_DYNAMITE_ACTIVE
},
{
SND_CLASS_DYNAMITE_ACTIVE
},
{
- EL_KEY_
OBSOLETE, TRUE,
ACTION_COLLECTING,
+ EL_KEY_
1, TRUE,
ACTION_COLLECTING,
SND_CLASS_KEY_COLLECTING
},
{
SND_CLASS_KEY_COLLECTING
},
{
@@
-384,6
+396,10
@@
element_to_sound[] =
EL_EXIT_CLOSED, TRUE, ACTION_OPENING,
SND_CLASS_EXIT_OPENING
},
EL_EXIT_CLOSED, TRUE, ACTION_OPENING,
SND_CLASS_EXIT_OPENING
},
+ {
+ EL_EXIT_CLOSED, TRUE, ACTION_CLOSING,
+ SND_CLASS_EXIT_CLOSING
+ },
{
EL_EXIT_CLOSED, TRUE, ACTION_PASSING,
SND_CLASS_EXIT_PASSING
{
EL_EXIT_CLOSED, TRUE, ACTION_PASSING,
SND_CLASS_EXIT_PASSING
@@
-449,8
+465,8
@@
element_to_sound[] =
SND_CRYSTAL_IMPACT
},
{
SND_CRYSTAL_IMPACT
},
{
- EL_ENVELOPE
, FALSE,
ACTION_COLLECTING,
- SND_ENVELOPE_COLLECTING
+ EL_ENVELOPE
_1, TRUE,
ACTION_COLLECTING,
+ SND_
CLASS_
ENVELOPE_COLLECTING
},
{
EL_INVISIBLE_SAND, FALSE, ACTION_DIGGING,
},
{
EL_INVISIBLE_SAND, FALSE, ACTION_DIGGING,
@@
-573,8
+589,8
@@
element_to_sound[] =
SND_TRAP_ACTIVATING
},
{
SND_TRAP_ACTIVATING
},
{
- EL_TUBE_ANY, TRUE, ACTION_
PASS
ING,
- SND_CLASS_TUBE_
PASS
ING
+ EL_TUBE_ANY, TRUE, ACTION_
WALK
ING,
+ SND_CLASS_TUBE_
WALK
ING
},
{
EL_SPEED_PILL, FALSE, ACTION_COLLECTING,
},
{
EL_SPEED_PILL, FALSE, ACTION_COLLECTING,
@@
-708,10
+724,6
@@
element_to_sound[] =
EL_DRAGON, FALSE, ACTION_ATTACKING,
SND_DRAGON_ATTACKING
},
EL_DRAGON, FALSE, ACTION_ATTACKING,
SND_DRAGON_ATTACKING
},
- {
- EL_PLAYER_OBSOLETE, TRUE, ACTION_DYING,
- SND_CLASS_PLAYER_DYING
- },
{
-1, -1, -1,
-1
{
-1, -1, -1,
-1