projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030305-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 4970aac4afd76360e37aebac14ba5450a3c783b5..e4f9e1923958d3573d01d802540633bdd5bd0ba7 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-29,7
+29,7
@@
Pixmap tile_clipmask[NUM_TILES];
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
-int game_status =
MAINMENU
;
+int game_status =
-1
;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
@@
-100,6
+100,8
@@
struct SoundInfo *sound_info = NULL;
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
{
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
{
+ /* keyword to start parser: "ELEMENT_INFO_START" <-- do not change! */
+
/* ----------------------------------------------------------------------- */
/* "real" level file elements */
/* ----------------------------------------------------------------------- */
/* ----------------------------------------------------------------------- */
/* "real" level file elements */
/* ----------------------------------------------------------------------- */
@@
-235,8
+237,8
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"nut with emerald"
},
{
"nut with emerald"
},
{
- "game
of
life",
- "game
of
life",
+ "game
_of_
life",
+ "game
_of_
life",
"Conway's wall of life"
},
{
"Conway's wall of life"
},
{
@@
-265,60
+267,60
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"magic wheel (running)"
},
{
"magic wheel (running)"
},
{
- "key1",
+ "key
_
1",
"key",
"red key"
},
{
"key",
"red key"
},
{
- "key2",
+ "key
_
2",
"key",
"yellow key"
},
{
"key",
"yellow key"
},
{
- "key3",
+ "key
_
3",
"key",
"green key"
},
{
"key",
"green key"
},
{
- "key4",
+ "key
_
4",
"key",
"blue key"
},
{
"key",
"blue key"
},
{
- "gate1",
+ "gate
_
1",
"gate",
"red door"
},
{
"gate",
"red door"
},
{
- "gate2",
+ "gate
_
2",
"gate",
"yellow door"
},
{
"gate",
"yellow door"
},
{
- "gate3",
+ "gate
_
3",
"gate",
"green door"
},
{
"gate",
"green door"
},
{
- "gate4",
+ "gate
_
4",
"gate",
"blue door"
},
{
"gate",
"blue door"
},
{
- "gate1_gray",
+ "gate
_
1_gray",
"gate",
"gray door (opened by red key)"
},
{
"gate",
"gray door (opened by red key)"
},
{
- "gate2_gray",
+ "gate
_
2_gray",
"gate",
"gray door (opened by yellow key)"},
{
"gate",
"gray door (opened by yellow key)"},
{
- "gate3_gray",
+ "gate
_
3_gray",
"gate",
"gray door (opened by green key)"},
{
"gate",
"gray door (opened by green key)"},
{
- "gate4_gray",
+ "gate
_
4_gray",
"gate",
"gray door (opened by blue key)"},
{
"gate",
"gray door (opened by blue key)"},
{
@@
-377,7
+379,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"time orb (empty)"
},
{
"time orb (empty)"
},
{
- "
wall_growing
",
+ "
expandable_wall
",
"wall",
"growing wall"
},
"wall",
"growing wall"
},
@@
-422,33
+424,33
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"(not used)"
},
{
"(not used)"
},
{
- "dynabomb_
n
r",
- "dynabomb
_nr
",
+ "dynabomb_
increase_numbe
r",
+ "dynabomb",
"increases number of bombs"
},
{
"increases number of bombs"
},
{
- "dynabomb_
sz
",
- "dynabomb
_sz
",
+ "dynabomb_
increase_size
",
+ "dynabomb",
"increases explosion size"
},
{
"increases explosion size"
},
{
- "dynabomb_
xl
",
- "dynabomb
_xl
",
+ "dynabomb_
increase_power
",
+ "dynabomb",
"increases power of explosion"
},
{
"sokoban_object",
"increases power of explosion"
},
{
"sokoban_object",
- "sokoban
_object
",
+ "sokoban",
"sokoban object"
},
{
"sokoban_field_empty",
"sokoban object"
},
{
"sokoban_field_empty",
- "sokoban
_field
",
+ "sokoban",
"sokoban empty field"
},
{
"sokoban_field_full",
"sokoban empty field"
},
{
"sokoban_field_full",
- "sokoban
_field
",
+ "sokoban",
"sokoban field with object"
},
{
"sokoban field with object"
},
{
@@
-499,22
+501,22
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"firefly"
},
{
"firefly"
},
{
- "player1",
+ "player
_
1",
"player",
"yellow player"
},
{
"player",
"yellow player"
},
{
- "player2",
+ "player
_
2",
"player",
"red player"
},
{
"player",
"red player"
},
{
- "player3",
+ "player
_
3",
"player",
"green player"
},
{
"player",
"green player"
},
{
- "player4",
+ "player
_
4",
"player",
"blue player"
},
"player",
"blue player"
},
@@
-596,27
+598,27
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"wall with purple emerald"
},
{
"wall with purple emerald"
},
{
- "acidpool_topleft",
+ "acid
_
pool_topleft",
"wall",
"acid pool (top left)"
},
{
"wall",
"acid pool (top left)"
},
{
- "acidpool_topright",
+ "acid
_
pool_topright",
"wall",
"acid pool (top right)"
},
{
"wall",
"acid pool (top right)"
},
{
- "acidpool_bottomleft",
+ "acid
_
pool_bottomleft",
"wall",
"acid pool (bottom left)"
},
{
"wall",
"acid pool (bottom left)"
},
{
- "acidpool_bottom",
+ "acid
_
pool_bottom",
"wall",
"acid pool (bottom)"
},
{
"wall",
"acid pool (bottom)"
},
{
- "acidpool_bottomright",
+ "acid
_
pool_bottomright",
"wall",
"acid pool (bottom right)"
},
"wall",
"acid pool (bottom right)"
},
@@
-638,7
+640,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
{
"black_orb",
"black_orb",
{
"black_orb",
"black_orb",
- "b
lack orb b
omb"
+ "bomb"
},
{
"amoeba_to_diamond",
},
{
"amoeba_to_diamond",
@@
-661,22
+663,22
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"satellite"
},
{
"satellite"
},
{
- "arrow_
blue_
left",
+ "arrow_left",
"arrow",
"arrow left"
},
{
"arrow",
"arrow left"
},
{
- "arrow_
blue_
right",
+ "arrow_right",
"arrow",
"arrow right"
},
{
"arrow",
"arrow right"
},
{
- "arrow_
blue_
up",
+ "arrow_up",
"arrow",
"arrow up"
},
{
"arrow",
"arrow up"
},
{
- "arrow_
blue_
down",
+ "arrow_down",
"arrow",
"arrow down"
},
"arrow",
"arrow down"
},
@@
-691,7
+693,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"fire breathing dragon"
},
{
"fire breathing dragon"
},
{
- "em_key1_file",
+ "em_key
_
1_file",
"key",
"red key (EM style)"
},
"key",
"red key (EM style)"
},
@@
-1096,52
+1098,52
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"letter ''"
},
{
"letter ''"
},
{
- "
wall_growing_x
",
+ "
expandable_wall_horizontal
",
"wall",
"growing wall (horizontal)"
},
{
"wall",
"growing wall (horizontal)"
},
{
- "
wall_growing_y
",
+ "
expandable_wall_vertical
",
"wall",
"growing wall (vertical)"
},
{
"wall",
"growing wall (vertical)"
},
{
- "
wall_growing_x
y",
+ "
expandable_wall_an
y",
"wall",
"wall",
- "growing wall (a
ll directions
)"
+ "growing wall (a
ny direction
)"
},
{
},
{
- "em_gate1",
+ "em_gate
_
1",
"gate",
"red door (EM style)"
},
{
"gate",
"red door (EM style)"
},
{
- "em_gate2",
+ "em_gate
_
2",
"gate",
"yellow door (EM style)"
},
{
"gate",
"yellow door (EM style)"
},
{
- "em_gate3",
+ "em_gate
_
3",
"gate",
"green door (EM style)"
},
{
"gate",
"green door (EM style)"
},
{
- "em_gate4",
+ "em_gate
_
4",
"gate",
"blue door (EM style)"
},
{
"gate",
"blue door (EM style)"
},
{
- "em_key2_file",
+ "em_key
_
2_file",
"key",
"yellow key (EM style)"
},
{
"key",
"yellow key (EM style)"
},
{
- "em_key3_file",
+ "em_key
_
3_file",
"key",
"green key (EM style)"
},
{
"key",
"green key (EM style)"
},
{
- "em_key4_file",
+ "em_key
_
4_file",
"key",
"blue key (EM style)"
},
"key",
"blue key (EM style)"
},
@@
-1176,7
+1178,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"chip (single)"
},
{
"chip (single)"
},
{
- "sp_hard_gray",
+ "sp_hard
ware
_gray",
"wall",
"hardware"
},
"wall",
"hardware"
},
@@
-1191,42
+1193,42
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"orange disk"
},
{
"orange disk"
},
{
- "sp_port
1
_right",
+ "sp_port_right",
"sp_port",
"port (leading right)"
},
{
"sp_port",
"port (leading right)"
},
{
- "sp_port
1
_down",
+ "sp_port_down",
"sp_port",
"port (leading down)"
},
{
"sp_port",
"port (leading down)"
},
{
- "sp_port
1
_left",
+ "sp_port_left",
"sp_port",
"port (leading left)"
},
{
"sp_port",
"port (leading left)"
},
{
- "sp_port
1
_up",
+ "sp_port_up",
"sp_port",
"port (leading up)"
},
{
"sp_port",
"port (leading up)"
},
{
- "sp_
port2
_right",
+ "sp_
gravity_port
_right",
"sp_port",
"port (leading right)"
},
{
"sp_port",
"port (leading right)"
},
{
- "sp_
port2
_down",
+ "sp_
gravity_port
_down",
"sp_port",
"port (leading down)"
},
{
"sp_port",
"port (leading down)"
},
{
- "sp_
port2
_left",
+ "sp_
gravity_port
_left",
"sp_port",
"port (leading left)"
},
{
"sp_port",
"port (leading left)"
},
{
- "sp_
port2
_up",
+ "sp_
gravity_port
_up",
"sp_port",
"port (leading up)"
},
"sp_port",
"port (leading up)"
},
@@
-1247,23
+1249,23
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
},
{
"sp_disk_red",
},
{
"sp_disk_red",
- "
sp_disk_red
",
+ "
dynamite
",
"red disk"
},
{
"red disk"
},
{
- "sp_port_
y
",
+ "sp_port_
vertical
",
"sp_port",
"port (vertical)"
},
{
"sp_port",
"port (vertical)"
},
{
- "sp_port_
x
",
+ "sp_port_
horizontal
",
"sp_port",
"port (horizontal)"
},
{
"sp_port",
"port (horizontal)"
},
{
- "sp_port_
x
y",
+ "sp_port_
an
y",
"sp_port",
"sp_port",
- "port (a
ll directions
)"
+ "port (a
ny direction
)"
},
{
"sp_electron",
},
{
"sp_electron",
@@
-1286,82
+1288,82
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"chip (right half)"
},
{
"chip (right half)"
},
{
- "sp_hard
_base
1",
+ "sp_hard
ware_base_
1",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard_green",
+ "sp_hard
ware
_green",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard_blue",
+ "sp_hard
ware
_blue",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard_red",
+ "sp_hard
ware
_red",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard_yellow",
+ "sp_hard
ware
_yellow",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard
_base
2",
+ "sp_hard
ware_base_
2",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard
_base
3",
+ "sp_hard
ware_base_
3",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard
_base
4",
+ "sp_hard
ware_base_
4",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard
_base
5",
+ "sp_hard
ware_base_
5",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_hard
_base
6",
+ "sp_hard
ware_base_
6",
"wall",
"hardware"
},
{
"wall",
"hardware"
},
{
- "sp_chip_
upper
",
+ "sp_chip_
top
",
"wall",
"chip (upper half)"
},
{
"wall",
"chip (upper half)"
},
{
- "sp_chip_
lower
",
+ "sp_chip_
bottom
",
"wall",
"chip (lower half)"
},
{
"wall",
"chip (lower half)"
},
{
- "em_gate1_gray",
+ "em_gate
_
1_gray",
"gate",
"gray door (EM style, red key)"
},
{
"gate",
"gray door (EM style, red key)"
},
{
- "em_gate2_gray",
+ "em_gate
_
2_gray",
"gate",
"gray door (EM style, yellow key)"
},
{
"gate",
"gray door (EM style, yellow key)"
},
{
- "em_gate3_gray",
+ "em_gate
_
3_gray",
"gate",
"gray door (EM style, green key)"
},
{
"gate",
"gray door (EM style, green key)"
},
{
- "em_gate4_gray",
+ "em_gate
_
4_gray",
"gate",
"gray door (EM style, blue key)"
},
"gate",
"gray door (EM style, blue key)"
},
@@
-1451,122
+1453,122
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "conveyor_belt1_left",
+ "conveyor_belt
_
1_left",
"conveyor_belt",
"red conveyor belt (left)"
},
{
"conveyor_belt",
"red conveyor belt (left)"
},
{
- "conveyor_belt1_middle",
+ "conveyor_belt
_
1_middle",
"conveyor_belt",
"red conveyor belt (middle)"
},
{
"conveyor_belt",
"red conveyor belt (middle)"
},
{
- "conveyor_belt1_right",
+ "conveyor_belt
_
1_right",
"conveyor_belt",
"red conveyor belt (right)"
},
{
"conveyor_belt",
"red conveyor belt (right)"
},
{
- "conveyor_belt1_switch_left",
+ "conveyor_belt
_
1_switch_left",
"conveyor_belt_switch",
"switch for red conveyor belt (left)"
},
{
"conveyor_belt_switch",
"switch for red conveyor belt (left)"
},
{
- "conveyor_belt1_switch_middle",
+ "conveyor_belt
_
1_switch_middle",
"conveyor_belt_switch",
"switch for red conveyor belt (middle)"
},
{
"conveyor_belt_switch",
"switch for red conveyor belt (middle)"
},
{
- "conveyor_belt1_switch_right",
+ "conveyor_belt
_
1_switch_right",
"conveyor_belt_switch",
"switch for red conveyor belt (right)"
},
{
"conveyor_belt_switch",
"switch for red conveyor belt (right)"
},
{
- "conveyor_belt2_left",
+ "conveyor_belt
_
2_left",
"conveyor_belt",
"yellow conveyor belt (left)"
},
{
"conveyor_belt",
"yellow conveyor belt (left)"
},
{
- "conveyor_belt2_middle",
+ "conveyor_belt
_
2_middle",
"conveyor_belt",
"yellow conveyor belt (middle)"
},
{
"conveyor_belt",
"yellow conveyor belt (middle)"
},
{
- "conveyor_belt2_right",
+ "conveyor_belt
_
2_right",
"conveyor_belt",
"yellow conveyor belt (right)"
},
{
"conveyor_belt",
"yellow conveyor belt (right)"
},
{
- "conveyor_belt2_switch_left",
+ "conveyor_belt
_
2_switch_left",
"conveyor_belt_switch",
"switch for yellow conveyor belt (left)"
},
{
"conveyor_belt_switch",
"switch for yellow conveyor belt (left)"
},
{
- "conveyor_belt2_switch_middle",
+ "conveyor_belt
_
2_switch_middle",
"conveyor_belt_switch",
"switch for yellow conveyor belt (middle)"
},
{
"conveyor_belt_switch",
"switch for yellow conveyor belt (middle)"
},
{
- "conveyor_belt2_switch_right",
+ "conveyor_belt
_
2_switch_right",
"conveyor_belt_switch",
"switch for yellow conveyor belt (right)"
},
{
"conveyor_belt_switch",
"switch for yellow conveyor belt (right)"
},
{
- "conveyor_belt3_left",
+ "conveyor_belt
_
3_left",
"conveyor_belt",
"green conveyor belt (left)"
},
{
"conveyor_belt",
"green conveyor belt (left)"
},
{
- "conveyor_belt3_middle",
+ "conveyor_belt
_
3_middle",
"conveyor_belt",
"green conveyor belt (middle)"
},
{
"conveyor_belt",
"green conveyor belt (middle)"
},
{
- "conveyor_belt3_right",
+ "conveyor_belt
_
3_right",
"conveyor_belt",
"green conveyor belt (right)"
},
{
"conveyor_belt",
"green conveyor belt (right)"
},
{
- "conveyor_belt3_switch_left",
+ "conveyor_belt
_
3_switch_left",
"conveyor_belt_switch",
"switch for green conveyor belt (left)"
},
{
"conveyor_belt_switch",
"switch for green conveyor belt (left)"
},
{
- "conveyor_belt3_switch_middle",
+ "conveyor_belt
_
3_switch_middle",
"conveyor_belt_switch",
"switch for green conveyor belt (middle)"
},
{
"conveyor_belt_switch",
"switch for green conveyor belt (middle)"
},
{
- "conveyor_belt3_switch_right",
+ "conveyor_belt
_
3_switch_right",
"conveyor_belt_switch",
"switch for green conveyor belt (right)"
},
{
"conveyor_belt_switch",
"switch for green conveyor belt (right)"
},
{
- "conveyor_belt4_left",
+ "conveyor_belt
_
4_left",
"conveyor_belt",
"blue conveyor belt (left)"
},
{
"conveyor_belt",
"blue conveyor belt (left)"
},
{
- "conveyor_belt4_middle",
+ "conveyor_belt
_
4_middle",
"conveyor_belt",
"blue conveyor belt (middle)"
},
{
"conveyor_belt",
"blue conveyor belt (middle)"
},
{
- "conveyor_belt4_right",
+ "conveyor_belt
_
4_right",
"conveyor_belt",
"blue conveyor belt (right)"
},
{
"conveyor_belt",
"blue conveyor belt (right)"
},
{
- "conveyor_belt4_switch_left",
+ "conveyor_belt
_
4_switch_left",
"conveyor_belt_switch",
"switch for blue conveyor belt (left)"
},
{
"conveyor_belt_switch",
"switch for blue conveyor belt (left)"
},
{
- "conveyor_belt4_switch_middle",
+ "conveyor_belt
_
4_switch_middle",
"conveyor_belt_switch",
"switch for blue conveyor belt (middle)"
},
{
"conveyor_belt_switch",
"switch for blue conveyor belt (middle)"
},
{
- "conveyor_belt4_switch_right",
+ "conveyor_belt
_
4_switch_right",
"conveyor_belt_switch",
"switch for blue conveyor belt (right)"
},
"conveyor_belt_switch",
"switch for blue conveyor belt (right)"
},
@@
-1731,94
+1733,94
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"balloon"
},
{
"balloon"
},
{
- "balloon_s
end
_left",
+ "balloon_s
witch
_left",
"balloon_switch",
"send balloon to the left"
},
{
"balloon_switch",
"send balloon to the left"
},
{
- "balloon_s
end
_right",
+ "balloon_s
witch
_right",
"balloon_switch",
"send balloon to the right"
},
{
"balloon_switch",
"send balloon to the right"
},
{
- "balloon_s
end
_up",
+ "balloon_s
witch
_up",
"balloon_switch",
"send balloon up"
},
{
"balloon_switch",
"send balloon up"
},
{
- "balloon_s
end
_down",
+ "balloon_s
witch
_down",
"balloon_switch",
"send balloon down"
},
{
"balloon_switch",
"send balloon down"
},
{
- "balloon_s
end_any_direction
",
+ "balloon_s
witch_any
",
"balloon_switch",
"send balloon in any direction"
},
{
"balloon_switch",
"send balloon in any direction"
},
{
- "emc_steelwall1",
+ "emc_steelwall
_
1",
"wall",
"steel wall"
},
{
"wall",
"steel wall"
},
{
- "emc_steelwall2",
+ "emc_steelwall
_
2",
"wall",
"steel wall"
},
{
"wall",
"steel wall"
},
{
- "emc_steelwall3",
+ "emc_steelwall
_
3",
"wall",
"steel wall"
},
{
"wall",
"steel wall"
},
{
- "emc_steelwall4",
+ "emc_steelwall
_
4",
"wall",
"steel wall"
},
{
"wall",
"steel wall"
},
{
- "emc_wall_
pillar_upper
",
+ "emc_wall_
1
",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "emc_wall_
pillar_middle
",
+ "emc_wall_
2
",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "emc_wall_
pillar_lower
",
+ "emc_wall_
3
",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "emc_wall4",
+ "emc_wall
_
4",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "emc_wall5",
+ "emc_wall
_
5",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "emc_wall6",
+ "emc_wall
_
6",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "emc_wall7",
+ "emc_wall
_
7",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "emc_wall8",
+ "emc_wall
_
8",
"wall",
"normal wall"
},
{
"wall",
"normal wall"
},
{
- "tube_a
ll
",
+ "tube_a
ny
",
"tube",
"tube",
- "tube (a
ll directions
)"
+ "tube (a
ny direction
)"
},
{
"tube_vertical",
},
{
"tube_vertical",
@@
-1882,7
+1884,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
},
{
"dx_supabomb",
},
{
"dx_supabomb",
- "
dx_
bomb",
+ "bomb",
"stable bomb (DX style)"
},
{
"stable bomb (DX style)"
},
{
@@
-2541,45
+2543,50
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
/* ----------------------------------------------------------------------- */
{
/* ----------------------------------------------------------------------- */
{
- "em_key1",
+ "em_key
_
1",
"key",
"-"
},
{
"key",
"-"
},
{
- "em_key2",
+ "em_key
_
2",
"key",
"-"
},
{
"key",
"-"
},
{
- "em_key3",
+ "em_key
_
3",
"key",
"-"
},
{
"key",
"-"
},
{
- "em_key4",
+ "em_key
_
4",
"key",
"-"
},
{
"key",
"-"
},
{
- "dynabomb_player1_active",
+ "dynabomb_player
_
1_active",
"dynabomb",
"-"
},
{
"dynabomb",
"-"
},
{
- "dynabomb_player2_active",
+ "dynabomb_player
_
2_active",
"dynabomb",
"-"
},
{
"dynabomb",
"-"
},
{
- "dynabomb_player3_active",
+ "dynabomb_player
_
3_active",
"dynabomb",
"-"
},
{
"dynabomb",
"-"
},
{
- "dynabomb_player4_active",
+ "dynabomb_player
_
4_active",
"dynabomb",
"-"
},
"dynabomb",
"-"
},
+ {
+ "sp_disk_red_active",
+ "dynamite",
+ "-"
+ },
{
"switchgate_opening",
"switchgate",
{
"switchgate_opening",
"switchgate",
@@
-2626,62
+2633,62
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "conveyor_belt1_left_active",
+ "conveyor_belt
_
1_left_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt1_middle_active",
+ "conveyor_belt
_
1_middle_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt1_right_active",
+ "conveyor_belt
_
1_right_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt2_left_active",
+ "conveyor_belt
_
2_left_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt2_middle_active",
+ "conveyor_belt
_
2_middle_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt2_right_active",
+ "conveyor_belt
_
2_right_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt3_left_active",
+ "conveyor_belt
_
3_left_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt3_middle_active",
+ "conveyor_belt
_
3_middle_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt3_right_active",
+ "conveyor_belt
_
3_right_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt4_left_active",
+ "conveyor_belt
_
4_left_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt4_middle_active",
+ "conveyor_belt
_
4_middle_active",
"conveyor_belt",
"-"
},
{
"conveyor_belt",
"-"
},
{
- "conveyor_belt4_right_active",
+ "conveyor_belt
_
4_right_active",
"conveyor_belt",
"-"
},
"conveyor_belt",
"-"
},
@@
-2716,7
+2723,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "amoeba_dr
i
pping",
+ "amoeba_dr
o
pping",
"amoeba",
"-"
},
"amoeba",
"-"
},
@@
-2781,7
+2788,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "nut_
crac
king",
+ "nut_
brea
king",
"-",
"-"
},
"-",
"-"
},
@@
-2796,7
+2803,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "amoeba_
creat
ing",
+ "amoeba_
grow
ing",
"-",
"-"
},
"-",
"-"
},
@@
-2806,7
+2813,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "
wall_growing_active
",
+ "
expandable_wall_growing
",
"-",
"-"
},
"-",
"-"
},
@@
-2822,7
+2829,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
},
{
"quicksand_filling",
},
{
"quicksand_filling",
- "
-
",
+ "
quicksand
",
"-"
},
{
"-"
},
{
@@
-2905,106
+2912,6
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-",
"-"
},
"-",
"-"
},
- {
- "bd_amoeba_part1",
- "-",
- "-"
- },
- {
- "bd_amoeba_part2",
- "-",
- "-"
- },
- {
- "bd_amoeba_part3",
- "-",
- "-"
- },
- {
- "bd_amoeba_part4",
- "-",
- "-"
- },
- {
- "amoeba_wet_part1",
- "-",
- "-"
- },
- {
- "amoeba_wet_part2",
- "-",
- "-"
- },
- {
- "amoeba_wet_part3",
- "-",
- "-"
- },
- {
- "amoeba_wet_part4",
- "-",
- "-"
- },
- {
- "amoeba_dry_part1",
- "-",
- "-"
- },
- {
- "amoeba_dry_part2",
- "-",
- "-"
- },
- {
- "amoeba_dry_part3",
- "-",
- "-"
- },
- {
- "amoeba_dry_part4",
- "-",
- "-"
- },
- {
- "amoeba_full_part1",
- "-",
- "-"
- },
- {
- "amoeba_full_part2",
- "-",
- "-"
- },
- {
- "amoeba_full_part3",
- "-",
- "-"
- },
- {
- "amoeba_full_part4",
- "-",
- "-"
- },
- {
- "amoeba_dead_part1",
- "-",
- "-"
- },
- {
- "amoeba_dead_part2",
- "-",
- "-"
- },
- {
- "amoeba_dead_part3",
- "-",
- "-"
- },
- {
- "amoeba_dead_part4",
- "-",
- "-"
- },
{
"dynabomb_active",
"-",
{
"dynabomb_active",
"-",
@@
-3020,31
+2927,13
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-",
"-"
},
"-",
"-"
},
- {
- "arrow_red_left",
- "-",
- "-"
- },
- {
- "arrow_red_right",
- "-",
- "-"
- },
- {
- "arrow_red_up",
- "-",
- "-"
- },
- {
- "arrow_red_down",
- "-",
- "-"
- },
+
+ /* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
{
NULL,
NULL,
{
NULL,
NULL,
- "-"
+ NULL
}
};
}
};
@@
-3062,19
+2951,24
@@
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
{ ".digging", ACTION_DIGGING, FALSE },
{ ".snapping", ACTION_SNAPPING, FALSE },
{ ".collecting", ACTION_COLLECTING, FALSE },
{ ".digging", ACTION_DIGGING, FALSE },
{ ".snapping", ACTION_SNAPPING, FALSE },
{ ".collecting", ACTION_COLLECTING, FALSE },
+ { ".dropping", ACTION_DROPPING, FALSE },
{ ".pushing", ACTION_PUSHING, FALSE },
{ ".passing", ACTION_PASSING, FALSE },
{ ".impact", ACTION_IMPACT, FALSE },
{ ".pushing", ACTION_PUSHING, FALSE },
{ ".passing", ACTION_PASSING, FALSE },
{ ".impact", ACTION_IMPACT, FALSE },
- { ".cracking", ACTION_CRACKING, FALSE },
{ ".breaking", ACTION_BREAKING, FALSE },
{ ".activating", ACTION_ACTIVATING, FALSE },
{ ".breaking", ACTION_BREAKING, FALSE },
{ ".activating", ACTION_ACTIVATING, FALSE },
+ { ".deactivating", ACTION_DEACTIVATING, FALSE },
{ ".opening", ACTION_OPENING, FALSE },
{ ".closing", ACTION_CLOSING, FALSE },
{ ".opening", ACTION_OPENING, FALSE },
{ ".closing", ACTION_CLOSING, FALSE },
- { ".eating", ACTION_EATING, FALSE },
{ ".attacking", ACTION_ATTACKING, TRUE },
{ ".growing", ACTION_GROWING, TRUE },
{ ".shrinking", ACTION_SHRINKING, FALSE },
{ ".active", ACTION_ACTIVE, TRUE },
{ ".attacking", ACTION_ATTACKING, TRUE },
{ ".growing", ACTION_GROWING, TRUE },
{ ".shrinking", ACTION_SHRINKING, FALSE },
{ ".active", ACTION_ACTIVE, TRUE },
+ { ".filling", ACTION_FILLING, FALSE },
+ { ".emptying", ACTION_EMPTYING, FALSE },
+ { ".changing", ACTION_CHANGING, FALSE },
+ { ".exploding", ACTION_EXPLODING, FALSE },
+ { ".dying", ACTION_DYING, FALSE },
{ ".other", ACTION_OTHER, FALSE },
{ NULL, 0, 0 }
{ ".other", ACTION_OTHER, FALSE },
{ NULL, 0, 0 }
@@
-3092,12
+2986,47
@@
struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
{
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
{
+ { ".MAIN", 0, },
+ { ".LEVELS", 0, },
+ { ".SCORES", 0, },
{ ".EDITOR", 0, },
{ ".EDITOR", 0, },
+ { ".INFO", 0, },
+ { ".SETUP", 0, },
+ { ".DOOR", 0, },
{ ".PREVIEW", 0, },
{ NULL, 0, }
};
{ ".PREVIEW", 0, },
{ NULL, 0, }
};
+/* ------------------------------------------------------------------------- */
+/* font definitions */
+/* ------------------------------------------------------------------------- */
+
+struct FontInfo font_info[NUM_FONTS + 1] =
+{
+ { "font.initial_1" },
+ { "font.initial_2" },
+ { "font.initial_3" },
+ { "font.initial_4" },
+ { "font.title_1" },
+ { "font.title_2" },
+ { "font.menu_1" },
+ { "font.menu_2" },
+ { "font.text_1" },
+ { "font.text_2" },
+ { "font.text_3" },
+ { "font.text_4" },
+ { "font.input" },
+ { "font.input.active" },
+ { "font.option_off" },
+ { "font.option_on" },
+ { "font.value_1" },
+ { "font.value_2" },
+ { "font.value_old" },
+ { "font.tape_recorder" },
+ { "font.level_number" },
+};
+
/* ========================================================================= */
/* main() */
/* ========================================================================= */
/* main() */