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 35ecbacae96654b4a5424a29f3f4f3a9e105621f..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",
@@
-3539,10
+3539,20
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"emc_magic_ball",
"magic ball",
},
"emc_magic_ball",
"magic ball",
},
+ {
+ "emc_magic_ball.active",
+ "emc_magic_ball",
+ "magic ball (activated)",
+ },
{
"emc_magic_ball_switch",
"emc_magic_ball_switch",
{
"emc_magic_ball_switch",
"emc_magic_ball_switch",
- "magic ball switch",
+ "magic ball switch (off)",
+ },
+ {
+ "emc_magic_ball_switch.active",
+ "emc_magic_ball_switch",
+ "magic ball switch (on)",
},
{
"emc_spring_bumper",
},
{
"emc_spring_bumper",
@@
-3624,6
+3634,16
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"wall",
"slippery wall"
},
"wall",
"slippery wall"
},
+ {
+ "emc_fake_grass",
+ "fake grass",
+ "fake grass"
+ },
+ {
+ "emc_fake_acid",
+ "fake acid",
+ "fake acid"
+ },
{
"emc_dripper",
"dripper",
{
"emc_dripper",
"dripper",
@@
-4168,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() */