projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed some EM engine game element names
[rocksndiamonds.git]
/
src
/
game_em
/
tab_generate.c
diff --git
a/src/game_em/tab_generate.c
b/src/game_em/tab_generate.c
index bcdecfe5c27cb664125e9ebd37601b9872bfea52..2d7c114843aeeadf0bae82edce23ffa381a650fc 100644
(file)
--- a/
src/game_em/tab_generate.c
+++ b/
src/game_em/tab_generate.c
@@
-20,8
+20,16
@@
int tile_blank[] =
{
Xblank, 1,
int tile_blank[] =
{
Xblank, 1,
- Xacid_splash_e, 1,
- Xacid_splash_w, 1,
+ Xsplash_e, 1,
+ Xsplash_w, 1,
+ Xfake_acid_1, 1,
+ Xfake_acid_2, 1,
+ Xfake_acid_3, 1,
+ Xfake_acid_4, 1,
+ Xfake_acid_5, 1,
+ Xfake_acid_6, 1,
+ Xfake_acid_7, 1,
+ Xfake_acid_8, 1,
TILE_MAX
};
TILE_MAX
};
@@
-29,8
+37,16
@@
int tile_blank[] =
int tile_acid[] =
{
Xblank, 1,
int tile_acid[] =
{
Xblank, 1,
- Xacid_splash_e, 1,
- Xacid_splash_w, 1,
+ Xsplash_e, 1,
+ Xsplash_w, 1,
+ Xfake_acid_1, 1,
+ Xfake_acid_2, 1,
+ Xfake_acid_3, 1,
+ Xfake_acid_4, 1,
+ Xfake_acid_5, 1,
+ Xfake_acid_6, 1,
+ Xfake_acid_7, 1,
+ Xfake_acid_8, 1,
Xacid_1, 1,
Xacid_2, 1,
Xacid_3, 1,
Xacid_1, 1,
Xacid_2, 1,
Xacid_3, 1,
@@
-42,6
+58,20
@@
int tile_acid[] =
TILE_MAX
};
TILE_MAX
};
+/* 0=stop 1=fake_acid */
+int tile_fake_acid[] =
+{
+ Xfake_acid_1, 1,
+ Xfake_acid_2, 1,
+ Xfake_acid_3, 1,
+ Xfake_acid_4, 1,
+ Xfake_acid_5, 1,
+ Xfake_acid_6, 1,
+ Xfake_acid_7, 1,
+ Xfake_acid_8, 1,
+ TILE_MAX
+};
+
/* 0=stop 1=amoeba */
int tile_amoeba[] =
{
/* 0=stop 1=amoeba */
int tile_amoeba[] =
{
@@
-62,8
+92,16
@@
int tile_amoeba[] =
int tile_android_move[] =
{
Xblank, 1,
int tile_android_move[] =
{
Xblank, 1,
- Xacid_splash_e, 1,
- Xacid_splash_w, 1,
+ Xsplash_e, 1,
+ Xsplash_w, 1,
+ Xfake_acid_1, 1,
+ Xfake_acid_2, 1,
+ Xfake_acid_3, 1,
+ Xfake_acid_4, 1,
+ Xfake_acid_5, 1,
+ Xfake_acid_6, 1,
+ Xfake_acid_7, 1,
+ Xfake_acid_8, 1,
Xplant, 1,
TILE_MAX
};
Xplant, 1,
TILE_MAX
};
@@
-243,8
+281,6
@@
int obj_map[] =
Xstone_fall, 5,
Xstone_fall, 6,
Xstone_fall, 7,
Xstone_fall, 5,
Xstone_fall, 6,
Xstone_fall, 7,
-
-#ifdef BAD_ROLL
Xpush_stone_e, 0,
Xpush_stone_e, 1,
Xpush_stone_e, 2,
Xpush_stone_e, 0,
Xpush_stone_e, 1,
Xpush_stone_e, 2,
@@
-261,8
+297,6
@@
int obj_map[] =
Xpush_stone_w, 5,
Xpush_stone_w, 6,
Xpush_stone_w, 7,
Xpush_stone_w, 5,
Xpush_stone_w, 6,
Xpush_stone_w, 7,
-#endif
-
Ystone_s, 7,
Xsand_stoneout_2, 7,
Xsand_stonein_1, 0,
Ystone_s, 7,
Xsand_stoneout_2, 7,
Xsand_stonein_1, 0,
@@
-363,8
+397,6
@@
int obj_map[] =
Xnut_fall, 5,
Xnut_fall, 6,
Xnut_fall, 7,
Xnut_fall, 5,
Xnut_fall, 6,
Xnut_fall, 7,
-
-#ifdef BAD_ROLL
Xpush_nut_e, 0,
Xpush_nut_e, 1,
Xpush_nut_e, 2,
Xpush_nut_e, 0,
Xpush_nut_e, 1,
Xpush_nut_e, 2,
@@
-381,8
+413,6
@@
int obj_map[] =
Xpush_nut_w, 5,
Xpush_nut_w, 6,
Xpush_nut_w, 7,
Xpush_nut_w, 5,
Xpush_nut_w, 6,
Xpush_nut_w, 7,
-#endif
-
-1,
-1,
Ynut_s, 6,
-1,
-1,
Ynut_s, 6,
@@
-1457,8
+1487,6
@@
int obj_map[] =
Xspring_fall, 5,
Xspring_fall, 6,
Xspring_fall, 7,
Xspring_fall, 5,
Xspring_fall, 6,
Xspring_fall, 7,
-
-#ifdef BAD_ROLL
Xpush_spring_e, 0,
Xpush_spring_e, 1,
Xpush_spring_e, 2,
Xpush_spring_e, 0,
Xpush_spring_e, 1,
Xpush_spring_e, 2,
@@
-1475,8
+1503,6
@@
int obj_map[] =
Xpush_spring_w, 5,
Xpush_spring_w, 6,
Xpush_spring_w, 7,
Xpush_spring_w, 5,
Xpush_spring_w, 6,
Xpush_spring_w, 7,
-#endif
-
-1,
Yspring_sB, 6,
-1,
-1,
Yspring_sB, 6,
-1,
@@
-1919,8
+1945,6
@@
int obj_map[] =
Xemerald_fall, 5,
Xemerald_fall, 6,
Xemerald_fall, 7,
Xemerald_fall, 5,
Xemerald_fall, 6,
Xemerald_fall, 7,
-
-#ifdef BAD_ROLL
Xpush_emerald_e, 0,
Xpush_emerald_e, 1,
Xpush_emerald_e, 2,
Xpush_emerald_e, 0,
Xpush_emerald_e, 1,
Xpush_emerald_e, 2,
@@
-1937,8
+1961,6
@@
int obj_map[] =
Xpush_emerald_w, 5,
Xpush_emerald_w, 6,
Xpush_emerald_w, 7,
Xpush_emerald_w, 5,
Xpush_emerald_w, 6,
Xpush_emerald_w, 7,
-#endif
-
Xemerald_shine, 0,
Xemerald_shine, 7,
Ynut_stone, 7,
Xemerald_shine, 0,
Xemerald_shine, 7,
Ynut_stone, 7,
@@
-2078,8
+2100,6
@@
int obj_map[] =
Xdiamond_fall, 5,
Xdiamond_fall, 6,
Xdiamond_fall, 7,
Xdiamond_fall, 5,
Xdiamond_fall, 6,
Xdiamond_fall, 7,
-
-#ifdef BAD_ROLL
Xpush_diamond_e, 0,
Xpush_diamond_e, 1,
Xpush_diamond_e, 2,
Xpush_diamond_e, 0,
Xpush_diamond_e, 1,
Xpush_diamond_e, 2,
@@
-2096,8
+2116,6
@@
int obj_map[] =
Xpush_diamond_w, 5,
Xpush_diamond_w, 6,
Xpush_diamond_w, 7,
Xpush_diamond_w, 5,
Xpush_diamond_w, 6,
Xpush_diamond_w, 7,
-#endif
-
Xdiamond_shine, 0,
Xdiamond_shine, 7,
Ydiamond_s, 7,
Xdiamond_shine, 0,
Xdiamond_shine, 7,
Ydiamond_s, 7,
@@
-2338,8
+2356,6
@@
int obj_map[] =
Xbomb_fall, 5,
Xbomb_fall, 6,
Xbomb_fall, 7,
Xbomb_fall, 5,
Xbomb_fall, 6,
Xbomb_fall, 7,
-
-#ifdef BAD_ROLL
Xpush_bomb_e, 0,
Xpush_bomb_e, 1,
Xpush_bomb_e, 2,
Xpush_bomb_e, 0,
Xpush_bomb_e, 1,
Xpush_bomb_e, 2,
@@
-2356,8
+2372,6
@@
int obj_map[] =
Xpush_bomb_w, 5,
Xpush_bomb_w, 6,
Xpush_bomb_w, 7,
Xpush_bomb_w, 5,
Xpush_bomb_w, 6,
Xpush_bomb_w, 7,
-#endif
-
Ybomb_s, 7,
Ybomb_e, 7,
Ybomb_w, 7,
Ybomb_s, 7,
Ybomb_e, 7,
Ybomb_w, 7,
@@
-2802,23
+2816,23
@@
int obj_map[] =
Xacid_8, 6,
Xacid_8, 7,
-1,
Xacid_8, 6,
Xacid_8, 7,
-1,
- X
acid_
splash_w, 4,
- X
acid_
splash_w, 5,
+ Xsplash_w, 4,
+ Xsplash_w, 5,
-1,
-1,
- X
acid_
splash_w, 2,
- X
acid_
splash_w, 3,
+ Xsplash_w, 2,
+ Xsplash_w, 3,
-1,
-1,
- X
acid_
splash_w, 0,
- X
acid_
splash_w, 1,
+ Xsplash_w, 0,
+ Xsplash_w, 1,
-1,
-1,
- X
acid_
splash_e, 4,
- X
acid_
splash_e, 5,
+ Xsplash_e, 4,
+ Xsplash_e, 5,
-1,
-1,
- X
acid_
splash_e, 2,
- X
acid_
splash_e, 3,
+ Xsplash_e, 2,
+ Xsplash_e, 3,
-1,
-1,
- X
acid_
splash_e, 0,
- X
acid_
splash_e, 1,
+ Xsplash_e, 0,
+ Xsplash_e, 1,
-1,
Yball_2, 7,
-1,
Yball_2, 7,
@@
-2870,53
+2884,53
@@
int obj_map[] =
Yball_2, 6,
-1,
Yball_2, 6,
-1,
- Yslide
wall
_ew_blank, 7,
- Xslide
wall
_ew, 0,
- Xslide
wall
_ew, 1,
- Xslide
wall
_ew, 2,
- Xslide
wall
_ew, 3,
- Xslide
wall
_ew, 4,
- Xslide
wall
_ew, 5,
- Xslide
wall
_ew, 6,
- Xslide
wall
_ew, 7,
+ Yslide_ew_blank, 7,
+ Xslide_ew, 0,
+ Xslide_ew, 1,
+ Xslide_ew, 2,
+ Xslide_ew, 3,
+ Xslide_ew, 4,
+ Xslide_ew, 5,
+ Xslide_ew, 6,
+ Xslide_ew, 7,
-1,
-1,
- Yslide
wall
_ew_blank, 0,
+ Yslide_ew_blank, 0,
-1,
-1,
- Yslide
wall
_ew_blank, 1,
+ Yslide_ew_blank, 1,
-1,
-1,
- Yslide
wall
_ew_blank, 2,
+ Yslide_ew_blank, 2,
-1,
-1,
- Yslide
wall
_ew_blank, 3,
+ Yslide_ew_blank, 3,
-1,
-1,
- Yslide
wall
_ew_blank, 4,
+ Yslide_ew_blank, 4,
-1,
-1,
- Yslide
wall
_ew_blank, 5,
+ Yslide_ew_blank, 5,
-1,
-1,
- Yslide
wall
_ew_blank, 6,
+ Yslide_ew_blank, 6,
-1,
-1,
- Yslide
wall
_ns_blank, 7,
- Xslide
wall
_ns, 0,
- Xslide
wall
_ns, 1,
- Xslide
wall
_ns, 2,
- Xslide
wall
_ns, 3,
- Xslide
wall
_ns, 4,
- Xslide
wall
_ns, 5,
- Xslide
wall
_ns, 6,
- Xslide
wall
_ns, 7,
+ Yslide_ns_blank, 7,
+ Xslide_ns, 0,
+ Xslide_ns, 1,
+ Xslide_ns, 2,
+ Xslide_ns, 3,
+ Xslide_ns, 4,
+ Xslide_ns, 5,
+ Xslide_ns, 6,
+ Xslide_ns, 7,
-1,
-1,
- Yslide
wall
_ns_blank, 0,
+ Yslide_ns_blank, 0,
-1,
-1,
- Yslide
wall
_ns_blank, 1,
+ Yslide_ns_blank, 1,
-1,
-1,
- Yslide
wall
_ns_blank, 2,
+ Yslide_ns_blank, 2,
-1,
-1,
- Yslide
wall
_ns_blank, 3,
+ Yslide_ns_blank, 3,
-1,
-1,
- Yslide
wall
_ns_blank, 4,
+ Yslide_ns_blank, 4,
-1,
-1,
- Yslide
wall
_ns_blank, 5,
+ Yslide_ns_blank, 5,
-1,
-1,
- Yslide
wall
_ns_blank, 6,
+ Yslide_ns_blank, 6,
-1,
XwonderwallB, 7,
-1,
XwonderwallB, 7,
@@
-4411,6
+4425,9
@@
unsigned char tab_blank[TILE_MAX];
/* 0=stop 1=acid */
unsigned char tab_acid[TILE_MAX];
/* 0=stop 1=acid */
unsigned char tab_acid[TILE_MAX];
+/* 0=stop 1=fake_acid */
+unsigned char tab_fake_acid[TILE_MAX];
+
/* 0=stop 1=amoeba */
unsigned char tab_amoeba[TILE_MAX];
/* 0=stop 1=amoeba */
unsigned char tab_amoeba[TILE_MAX];
@@
-4603,6
+4620,7
@@
void tab_generate(void)
{
create_tab(tile_blank, tab_blank);
create_tab(tile_acid, tab_acid);
{
create_tab(tile_blank, tab_blank);
create_tab(tile_acid, tab_acid);
+ create_tab(tile_fake_acid, tab_fake_acid);
create_tab(tile_amoeba, tab_amoeba);
create_tab(tile_android_move, tab_android_move);
create_explode();
create_tab(tile_amoeba, tab_amoeba);
create_tab(tile_android_move, tab_android_move);
create_explode();