projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19991023-2-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 64b0ae4eebecbbf16f01283f7cbda7c35401b5ab..7f5a4aeabf5b6be571cac08af04afb1166565ee4 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-875,7
+875,18
@@
void InitElementProperties()
EL_SWITCHGATE_OPEN,
EL_SWITCHGATE_CLOSED,
EL_TIMEGATE_OPEN,
EL_SWITCHGATE_OPEN,
EL_SWITCHGATE_CLOSED,
EL_TIMEGATE_OPEN,
- EL_TIMEGATE_CLOSED
+ EL_TIMEGATE_CLOSED,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
};
static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int);
};
static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int);
@@
-887,6
+898,7
@@
void InitElementProperties()
EL_MAUER_X,
EL_MAUER_Y,
EL_MAUER_XY,
EL_MAUER_X,
EL_MAUER_Y,
EL_MAUER_XY,
+ EL_BD_WALL,
EL_FELSBODEN,
EL_AUSGANG_ZU,
EL_AUSGANG_ACT,
EL_FELSBODEN,
EL_AUSGANG_ZU,
EL_AUSGANG_ACT,
@@
-898,14
+910,14
@@
void InitElementProperties()
EL_AMOEBE_BD,
EL_MORAST_VOLL,
EL_MORAST_LEER,
EL_AMOEBE_BD,
EL_MORAST_VOLL,
EL_MORAST_LEER,
- EL_
SIEB_INAKTIV
,
- EL_
SIEB_LEER
,
- EL_
SIEB_VO
LL,
- EL_
SIEB_TOT
,
- EL_
SIEB2_INAKTIV
,
- EL_
SIEB2_LEER
,
- EL_
SIEB2_VO
LL,
- EL_
SIEB2_TOT
,
+ EL_
MAGIC_WALL_OFF
,
+ EL_
MAGIC_WALL_EMPTY
,
+ EL_
MAGIC_WALL_FU
LL,
+ EL_
MAGIC_WALL_DEAD
,
+ EL_
MAGIC_WALL_BD_OFF
,
+ EL_
MAGIC_WALL_BD_EMPTY
,
+ EL_
MAGIC_WALL_BD_FU
LL,
+ EL_
MAGIC_WALL_BD_DEAD
,
EL_LIFE,
EL_LIFE_ASYNC,
EL_BADEWANNE1,
EL_LIFE,
EL_LIFE_ASYNC,
EL_BADEWANNE1,
@@
-974,7
+986,21
@@
void InitElementProperties()
EL_EMC_WALL_5,
EL_EMC_WALL_6,
EL_EMC_WALL_7,
EL_EMC_WALL_5,
EL_EMC_WALL_6,
EL_EMC_WALL_7,
- EL_EMC_WALL_8
+ EL_EMC_WALL_8,
+ EL_CRYSTAL,
+ EL_WALL_PEARL,
+ EL_WALL_CRYSTAL,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
};
static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
};
static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
@@
-1049,14
+1075,28
@@
void InitElementProperties()
EL_EMC_STEEL_WALL_1,
EL_EMC_STEEL_WALL_2,
EL_EMC_STEEL_WALL_3,
EL_EMC_STEEL_WALL_1,
EL_EMC_STEEL_WALL_2,
EL_EMC_STEEL_WALL_3,
- EL_EMC_STEEL_WALL_4
+ EL_EMC_STEEL_WALL_4,
+ EL_CRYSTAL,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
};
static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
static int ep_slippery[] =
{
EL_FELSBODEN,
};
static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
static int ep_slippery[] =
{
EL_FELSBODEN,
+ EL_BD_WALL,
EL_FELSBROCKEN,
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
@@
-1082,7
+1122,9
@@
void InitElementProperties()
EL_SP_CHIP_UPPER,
EL_SP_CHIP_LOWER,
EL_SPEED_PILL,
EL_SP_CHIP_UPPER,
EL_SP_CHIP_LOWER,
EL_SPEED_PILL,
- EL_STEEL_SLANTED
+ EL_STEEL_SLANTED,
+ EL_PEARL,
+ EL_CRYSTAL
};
static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
};
static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
@@
-1130,6
+1172,7
@@
void InitElementProperties()
EL_MAUER_Y,
EL_MAUER_XY,
EL_MAUERND,
EL_MAUER_Y,
EL_MAUER_XY,
EL_MAUERND,
+ EL_BD_WALL,
EL_SP_CHIP_SINGLE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
EL_SP_CHIP_SINGLE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
@@
-1168,6
+1211,7
@@
void InitElementProperties()
static int ep_can_fall[] =
{
EL_FELSBROCKEN,
static int ep_can_fall[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
@@
-1178,19
+1222,24
@@
void InitElementProperties()
EL_KOKOSNUSS,
EL_TROPFEN,
EL_MORAST_VOLL,
EL_KOKOSNUSS,
EL_TROPFEN,
EL_MORAST_VOLL,
- EL_
SIEB_VO
LL,
- EL_
SIEB2_VO
LL,
+ EL_
MAGIC_WALL_FU
LL,
+ EL_
MAGIC_WALL_BD_FU
LL,
EL_ZEIT_VOLL,
EL_ZEIT_LEER,
EL_SP_ZONK,
EL_SP_INFOTRON,
EL_ZEIT_VOLL,
EL_ZEIT_LEER,
EL_SP_ZONK,
EL_SP_INFOTRON,
- EL_SP_DISK_ORANGE
+ EL_SP_DISK_ORANGE,
+ EL_PEARL,
+ EL_CRYSTAL,
+ EL_SPRING,
+ EL_DX_SUPABOMB
};
static int ep_can_fall_num = sizeof(ep_can_fall)/sizeof(int);
static int ep_can_smash[] =
{
EL_FELSBROCKEN,
};
static int ep_can_fall_num = sizeof(ep_can_fall)/sizeof(int);
static int ep_can_smash[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
@@
-1212,13
+1261,18
@@
void InitElementProperties()
EL_ZEIT_LEER,
EL_SP_ZONK,
EL_SP_INFOTRON,
EL_ZEIT_LEER,
EL_SP_ZONK,
EL_SP_INFOTRON,
- EL_SP_DISK_ORANGE
+ EL_SP_DISK_ORANGE,
+ EL_PEARL,
+ EL_CRYSTAL,
+ EL_SPRING,
+ EL_DX_SUPABOMB
};
static int ep_can_smash_num = sizeof(ep_can_smash)/sizeof(int);
static int ep_can_change[] =
{
EL_FELSBROCKEN,
};
static int ep_can_smash_num = sizeof(ep_can_smash)/sizeof(int);
static int ep_can_change[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
@@
-1245,7
+1299,8
@@
void InitElementProperties()
EL_SONDE,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
EL_SONDE,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
- EL_BALLOON
+ EL_BALLOON,
+ EL_SPRING_MOVING
};
static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int);
};
static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int);
@@
-1298,6
+1353,7
@@
void InitElementProperties()
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
EL_SP_BUG_ACTIVE,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
EL_SP_BUG_ACTIVE,
+ EL_TRAP_ACTIVE,
EL_LANDMINE
};
static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int);
EL_LANDMINE
};
static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int);
@@
-1323,7
+1379,9
@@
void InitElementProperties()
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
- EL_DIAMANT
+ EL_DIAMANT,
+ EL_PEARL,
+ EL_CRYSTAL
};
static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int);
};
static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int);
@@
-1332,9
+1390,11
@@
void InitElementProperties()
EL_LEERRAUM,
EL_ERDREICH,
EL_FELSBODEN,
EL_LEERRAUM,
EL_ERDREICH,
EL_FELSBODEN,
+ EL_BD_WALL,
EL_FELSBROCKEN,
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_BD,
- EL_
SIEB2_INAKTIV
,
+ EL_
MAGIC_WALL_BD_OFF
,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_BETON,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_BETON,
@@
-1383,6
+1443,7
@@
void InitElementProperties()
EL_LEERRAUM,
EL_ERDREICH,
EL_MAUERWERK,
EL_LEERRAUM,
EL_ERDREICH,
EL_MAUERWERK,
+ EL_BD_WALL,
EL_FELSBODEN,
EL_SCHLUESSEL,
EL_BETON,
EL_FELSBODEN,
EL_SCHLUESSEL,
EL_BETON,
@@
-1435,10
+1496,10
@@
void InitElementProperties()
EL_BADEWANNE3,
EL_BADEWANNE4,
EL_BADEWANNE5,
EL_BADEWANNE3,
EL_BADEWANNE4,
EL_BADEWANNE5,
- EL_
SIEB_INAKTIV
,
- EL_
SIEB_TOT
,
- EL_
SIEB2_INAKTIV
,
- EL_
SIEB2_TOT
,
+ EL_
MAGIC_WALL_OFF
,
+ EL_
MAGIC_WALL_DEAD
,
+ EL_
MAGIC_WALL_BD_OFF
,
+ EL_
MAGIC_WALL_BD_DEAD
,
EL_AMOEBA2DIAM,
EL_BLOCKED,
EL_SP_EMPTY,
EL_AMOEBA2DIAM,
EL_BLOCKED,
EL_SP_EMPTY,
@@
-1536,7
+1597,8
@@
void InitElementProperties()
EL_SP_DISK_ORANGE,
EL_SP_DISK_YELLOW,
EL_SP_SNIKSNAK,
EL_SP_DISK_ORANGE,
EL_SP_DISK_YELLOW,
EL_SP_SNIKSNAK,
- EL_SP_ELECTRON
+ EL_SP_ELECTRON,
+ EL_DX_SUPABOMB
};
static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int);
};
static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int);
@@
-1547,13
+1609,16
@@
void InitElementProperties()
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
- EL_DIAMANT
+ EL_DIAMANT,
+ EL_PEARL,
+ EL_CRYSTAL
};
static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int);
static int ep_pushable[] =
{
EL_FELSBROCKEN,
};
static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int);
static int ep_pushable[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_BOMBE,
EL_KOKOSNUSS,
EL_ZEIT_LEER,
EL_BOMBE,
EL_KOKOSNUSS,
EL_ZEIT_LEER,
@@
-1563,7
+1628,9
@@
void InitElementProperties()
EL_SP_ZONK,
EL_SP_DISK_ORANGE,
EL_SP_DISK_YELLOW,
EL_SP_ZONK,
EL_SP_DISK_ORANGE,
EL_SP_DISK_YELLOW,
- EL_BALLOON
+ EL_BALLOON,
+ EL_SPRING,
+ EL_DX_SUPABOMB
};
static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
};
static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
@@
-1592,6
+1659,7
@@
void InitElementProperties()
EL_ERDREICH,
EL_SP_BASE,
EL_SP_BUG,
EL_ERDREICH,
EL_SP_BASE,
EL_SP_BUG,
+ EL_TRAP_INACTIVE,
EL_SAND_INVISIBLE
};
static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int);
EL_SAND_INVISIBLE
};
static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int);
@@
-1681,7
+1749,18
@@
void InitElementProperties()
EL_SP_PORT2_DOWN,
EL_SP_PORT_X,
EL_SP_PORT_Y,
EL_SP_PORT2_DOWN,
EL_SP_PORT_X,
EL_SP_PORT_Y,
- EL_SP_PORT_XY
+ EL_SP_PORT_XY,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
};
static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int);
};
static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int);
@@
-1729,6
+1808,22
@@
void InitElementProperties()
};
static int ep_belt_switch_num = sizeof(ep_belt_switch)/sizeof(int);
};
static int ep_belt_switch_num = sizeof(ep_belt_switch)/sizeof(int);
+ static int ep_tube[] =
+ {
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
+ };
+ static int ep_tube_num = sizeof(ep_tube)/sizeof(int);
+
static long ep1_bit[] =
{
EP_BIT_AMOEBALIVE,
static long ep1_bit[] =
{
EP_BIT_AMOEBALIVE,
@@
-1766,7
+1861,8
@@
void InitElementProperties()
static long ep2_bit[] =
{
EP_BIT_BELT,
static long ep2_bit[] =
{
EP_BIT_BELT,
- EP_BIT_BELT_SWITCH
+ EP_BIT_BELT_SWITCH,
+ EP_BIT_TUBE
};
static int *ep1_array[] =
{
};
static int *ep1_array[] =
{
@@
-1805,7
+1901,8
@@
void InitElementProperties()
static int *ep2_array[] =
{
ep_belt,
static int *ep2_array[] =
{
ep_belt,
- ep_belt_switch
+ ep_belt_switch,
+ ep_tube
};
static int *ep1_num[] =
{
};
static int *ep1_num[] =
{
@@
-1844,7
+1941,8
@@
void InitElementProperties()
static int *ep2_num[] =
{
&ep_belt_num,
static int *ep2_num[] =
{
&ep_belt_num,
- &ep_belt_switch_num
+ &ep_belt_switch_num,
+ &ep_tube_num
};
static int num_properties1 = sizeof(ep1_num)/sizeof(int *);
static int num_properties2 = sizeof(ep2_num)/sizeof(int *);
};
static int num_properties1 = sizeof(ep1_num)/sizeof(int *);
static int num_properties2 = sizeof(ep2_num)/sizeof(int *);