projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20050122-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index d954b1accdcaea3855c1fab25e63f1d3646e954a..7ab466ab1ff11efed36c537fc952aebcda0de077 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-750,7
+750,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"letter '$'"
},
{
"letter '$'"
},
{
- "char_p
ro
cent",
+ "char_p
er
cent",
"char",
"letter '%'"
},
"char",
"letter '%'"
},
@@
-1782,7
+1782,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"balloon_switch_any",
"balloon_switch",
{
"balloon_switch_any",
"balloon_switch",
- "send balloon in
any
direction"
+ "send balloon in
pressed
direction"
},
{
"emc_steelwall_1",
},
{
"emc_steelwall_1",
@@
-3465,204
+3465,189
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"stop moving balloon"
},
{
"stop moving balloon"
},
{
- "emc_level_border",
- "wall",
- "level border steelwall",
- },
- {
- "emc_android",
- "emc_android",
- "android",
+ "em_gate_5",
+ "gate",
+ "door 5 (EMC style)",
},
{
},
{
- "em
c_android_right
",
- "
emc_android
",
- "
android
",
+ "em
_gate_6
",
+ "
gate
",
+ "
door 6 (EMC style)
",
},
{
},
{
- "em
c_android_up
",
- "
emc_android
",
- "
android
",
+ "em
_gate_7
",
+ "
gate
",
+ "
door 7 (EMC style)
",
},
{
},
{
- "em
c_android_left
",
- "
emc_android
",
- "
android
",
+ "em
_gate_8
",
+ "
gate
",
+ "
door 8 (EMC style)
",
},
{
},
{
- "em
c_android_down
",
- "
emc_android
",
- "
android
",
+ "em
_gate_5_gray
",
+ "
gate
",
+ "
gray door (EMC style, key 5)
",
},
{
},
{
- "em
c_android_left_up
",
- "
emc_android
",
- "
android
",
+ "em
_gate_6_gray
",
+ "
gate
",
+ "
gray door (EMC style, key 6)
",
},
{
},
{
- "em
c_android_left_down
",
- "
emc_android
",
- "
android
",
+ "em
_gate_7_gray
",
+ "
gate
",
+ "
gray door (EMC style, key 7)
",
},
{
},
{
- "em
c_android_right_up
",
- "
emc_android
",
- "
android
",
+ "em
_gate_8_gray
",
+ "
gate
",
+ "
gray door (EMC style, key 8)
",
},
{
},
{
- "em
c_android_right_down
",
- "
emc_android
",
- "
android
",
+ "em
_key_5
",
+ "
key
",
+ "
key 5 (EMC style)
",
},
{
},
{
- "em
c_grass
",
- "
emc_grass
",
- "
grass
",
+ "em
_key_6
",
+ "
key
",
+ "
key 6 (EMC style)
",
},
{
},
{
- "em
c_generator_ball
",
- "
emc_generator_ball
",
- "
generator ball
",
+ "em
_key_7
",
+ "
key
",
+ "
key 7 (EMC style)
",
},
{
},
{
- "em
c_gate_1
",
- "
gate
",
- "
door 1
(EMC style)",
+ "em
_key_8
",
+ "
key
",
+ "
key 8
(EMC style)",
},
{
},
{
- "emc_
gate_2
",
- "
gate
",
- "
door 2 (EMC style)
",
+ "emc_
android
",
+ "
emc_android
",
+ "
android
",
},
{
},
{
- "emc_g
ate_3
",
- "
gate
",
- "
door 3 (EMC style)
",
+ "emc_g
rass
",
+ "
emc_grass
",
+ "
grass
",
},
{
},
{
- "emc_
gate_4
",
- "
gate
",
- "
door 4 (EMC style)
",
+ "emc_
magic_ball
",
+ "
emc_magic_ball
",
+ "
magic ball
",
},
{
},
{
- "emc_
gate_5
",
- "
gate
",
- "
door 5 (EMC style
)",
+ "emc_
magic_ball.active
",
+ "
emc_magic_ball
",
+ "
magic ball (activated
)",
},
{
},
{
- "emc_
gate_6
",
- "
gate
",
- "
door 6 (EMC style
)",
+ "emc_
magic_ball_switch
",
+ "
emc_magic_ball_switch
",
+ "
magic ball switch (off
)",
},
{
},
{
- "emc_
gate_7
",
- "
gate
",
- "
door 7 (EMC style
)",
+ "emc_
magic_ball_switch.active
",
+ "
emc_magic_ball_switch
",
+ "
magic ball switch (on
)",
},
{
},
{
- "emc_
gate_8
",
- "
gate
",
- "
door 8 (EMC style)
",
+ "emc_
spring_bumper
",
+ "
emc_spring_bumper
",
+ "
spring bumper
",
},
{
},
{
- "emc_gate_1_gray",
- "gate",
- "gray door (EMC style, key 1)",
- },
- {
- "emc_gate_2_gray",
- "gate",
- "gray door (EMC style, key 2)",
- },
- {
- "emc_gate_3_gray",
- "gate",
- "gray door (EMC style, key 3)",
+ "emc_plant",
+ "emc_plant",
+ "plant",
},
{
},
{
- "emc_
gate_4_gray
",
- "
gate
",
- "
gray door (EMC style, key 4)
",
+ "emc_
lenses
",
+ "
emc_lenses
",
+ "
lenses
",
},
{
},
{
- "emc_
gate_5_gray
",
- "
gate
",
- "
gray door (EMC style, key 5)
",
+ "emc_
magnifier
",
+ "
emc_magnifier
",
+ "
magnifier
",
},
{
},
{
- "emc_
gate_6_gray
",
- "
gate
",
- "
gray door (EMC style, key 6)",
+ "emc_
wall_9
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
gate_7_gray
",
- "
gate
",
- "
gray door (EMC style, key 7)",
+ "emc_
wall_10
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
gate_8_gray
",
- "
gate
",
- "
gray door (EMC style, key 8)",
+ "emc_
wall_11
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
key_1
",
- "
key
",
- "
key 1 (EMC style)",
+ "emc_
wall_12
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
key_2
",
- "
key
",
- "
key 2 (EMC style)",
+ "emc_
wall_13
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
key_3
",
- "
key
",
- "
key 3 (EMC style)",
+ "emc_
wall_14
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
key_4
",
- "
key
",
- "
key 4 (EMC style)",
+ "emc_
wall_15
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
key_5
",
- "
key
",
- "
key 5 (EMC style)",
+ "emc_
wall_16
",
+ "
wall
",
+ "
normal wall"
},
{
},
{
- "emc_
key_6
",
- "
key
",
- "
key 6 (EMC style)",
+ "emc_
wall_slippery_1
",
+ "
wall
",
+ "
slippery wall"
},
{
},
{
- "emc_
key_7
",
- "
key
",
- "
key 7 (EMC style)",
+ "emc_
wall_slippery_2
",
+ "
wall
",
+ "
slippery wall"
},
{
},
{
- "emc_
key_8
",
- "
key
",
- "
key 8 (EMC style)",
+ "emc_
wall_slippery_3
",
+ "
wall
",
+ "
slippery wall"
},
{
},
{
- "emc_
bumper
",
- "
emc_bumper
",
- "
bumper",
+ "emc_
wall_slippery_4
",
+ "
wall
",
+ "
slippery wall"
},
{
},
{
- "emc_
plant
",
- "
emc_plant
",
- "
plant",
+ "emc_
fake_grass
",
+ "
fake grass
",
+ "
fake grass"
},
{
},
{
- "emc_
lenses
",
- "
emc_lenses
",
- "
lenses",
+ "emc_
fake_acid
",
+ "
fake acid
",
+ "
fake acid"
},
{
},
{
- "emc_
magnifi
er",
- "
emc_magnifi
er",
- "
magnifier",
+ "emc_
dripp
er",
+ "
dripp
er",
+ "
dripper"
},
/* ----------------------------------------------------------------------- */
},
/* ----------------------------------------------------------------------- */
@@
-4203,6
+4188,10
@@
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{ ".turning_from_right", ACTION_TURNING_FROM_RIGHT, FALSE },
{ ".turning_from_up", ACTION_TURNING_FROM_UP, FALSE },
{ ".turning_from_down", ACTION_TURNING_FROM_DOWN, FALSE },
{ ".turning_from_right", ACTION_TURNING_FROM_RIGHT, FALSE },
{ ".turning_from_up", ACTION_TURNING_FROM_UP, FALSE },
{ ".turning_from_down", ACTION_TURNING_FROM_DOWN, FALSE },
+ { ".smashed_by_rock", ACTION_SMASHED_BY_ROCK, FALSE },
+ { ".smashed_by_spring", ACTION_SMASHED_BY_SPRING, FALSE },
+ { ".slurped_by_spring", ACTION_SLURPED_BY_SPRING, FALSE },
+ { ".twinkling", ACTION_TWINKLING, FALSE },
{ ".other", ACTION_OTHER, FALSE },
/* empty suffix always matches -- check as last entry in InitSoundInfo() */
{ ".other", ACTION_OTHER, FALSE },
/* empty suffix always matches -- check as last entry in InitSoundInfo() */