projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added all BD engine elements shared with R'n'D engine as native elements
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index ac3d31bf9405b406391c255b3f5f9cf8ffbcfc91..10cca3c3cd19c4c182a55926244f706a8dc14c05 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-3858,7
+3858,7
@@
static void PreparePreviewTileBitmap(void)
int src_x, src_y;
int element_template = EL_BD_GAME_GRAPHICS_COLOR_TEMPLATE;
int graphic_template = el2preimg(element_template);
int src_x, src_y;
int element_template = EL_BD_GAME_GRAPHICS_COLOR_TEMPLATE;
int graphic_template = el2preimg(element_template);
- int element_default = EL_BD_ROCK;
+ int element_default = EL_BD_ROCK
_NATIVE
;
int graphic_default = el2preimg(element_default);
// create special preview bitmap and scale it down to preview tile size
int graphic_default = el2preimg(element_default);
// create special preview bitmap and scale it down to preview tile size
@@
-6030,8
+6030,8
@@
static int getEngineElement_Ext(int element, int game_engine_type, boolean is_dr
{
el_empty = EL_EMPTY;
el_player = EL_BD_PLAYER;
{
el_empty = EL_EMPTY;
el_player = EL_BD_PLAYER;
- el_sand = EL_BD_SAND;
- el_wall = EL_BD_WALL;
+ el_sand = EL_BD_SAND
_1
;
+ el_wall = EL_BD_WALL
_NATIVE
;
el_steelwall = EL_BD_STEELWALL;
el_exit_closed = EL_BD_EXIT_CLOSED;
}
el_steelwall = EL_BD_STEELWALL;
el_exit_closed = EL_BD_EXIT_CLOSED;
}
@@
-6158,7
+6158,7
@@
bd_object_mapping_list[] =
},
{
O_DIRT, TRUE,
},
{
O_DIRT, TRUE,
- EL_BD_SAND
,
-1, -1
+ EL_BD_SAND
_1,
-1, -1
},
{
O_DIRT_SLOPED_UP_RIGHT, TRUE,
},
{
O_DIRT_SLOPED_UP_RIGHT, TRUE,
@@
-6206,7
+6206,7
@@
bd_object_mapping_list[] =
},
{
O_BRICK, TRUE,
},
{
O_BRICK, TRUE,
- EL_BD_WALL
,
-1, -1
+ EL_BD_WALL
_NATIVE,
-1, -1
},
{
O_BRICK_SLOPED_UP_RIGHT, TRUE,
},
{
O_BRICK_SLOPED_UP_RIGHT, TRUE,
@@
-6230,7
+6230,7
@@
bd_object_mapping_list[] =
},
{
O_MAGIC_WALL, TRUE,
},
{
O_MAGIC_WALL, TRUE,
- EL_BD_MAGIC_WALL
,
ACTION_ACTIVE, -1
+ EL_BD_MAGIC_WALL
_NATIVE,
ACTION_ACTIVE, -1
},
{
O_PRE_OUTBOX, TRUE,
},
{
O_PRE_OUTBOX, TRUE,
@@
-6282,15
+6282,15
@@
bd_object_mapping_list[] =
},
{
O_STONE, TRUE,
},
{
O_STONE, TRUE,
- EL_BD_ROCK
,
-1, -1
+ EL_BD_ROCK
_NATIVE,
-1, -1
},
{
O_STONE_F, TRUE,
},
{
O_STONE_F, TRUE,
- EL_BD_ROCK_
FALLING,
-1, -1
+ EL_BD_ROCK_
NATIVE_FALLING,
-1, -1
},
{
O_STONE_F, FALSE,
},
{
O_STONE_F, FALSE,
- EL_BD_ROCK
,
ACTION_FALLING, -1
+ EL_BD_ROCK
_NATIVE,
ACTION_FALLING, -1
},
{
O_FLYING_STONE, TRUE,
},
{
O_FLYING_STONE, TRUE,
@@
-6318,15
+6318,15
@@
bd_object_mapping_list[] =
},
{
O_DIAMOND, TRUE,
},
{
O_DIAMOND, TRUE,
- EL_BD_DIAMOND
,
-1, -1
+ EL_BD_DIAMOND
_NATIVE,
-1, -1
},
{
O_DIAMOND_F, TRUE,
},
{
O_DIAMOND_F, TRUE,
- EL_BD_DIAMOND_
FALLING,
-1, -1
+ EL_BD_DIAMOND_
NATIVE_FALLING,
-1, -1
},
{
O_DIAMOND_F, FALSE,
},
{
O_DIAMOND_F, FALSE,
- EL_BD_DIAMOND
,
ACTION_FALLING, -1
+ EL_BD_DIAMOND
_NATIVE,
ACTION_FALLING, -1
},
{
O_FLYING_DIAMOND, TRUE,
},
{
O_FLYING_DIAMOND, TRUE,
@@
-6726,7
+6726,7
@@
bd_object_mapping_list[] =
},
{
O_AMOEBA, TRUE,
},
{
O_AMOEBA, TRUE,
- EL_BD_AMOEBA
,
-1, -1
+ EL_BD_AMOEBA
_1,
-1, -1
},
{
O_AMOEBA_2, TRUE,
},
{
O_AMOEBA_2, TRUE,
@@
-6842,19
+6842,19
@@
bd_object_mapping_list[] =
},
{
O_FIREFLY_1, TRUE,
},
{
O_FIREFLY_1, TRUE,
- EL_BD_FIREFLY_
LEFT,
-1, -1
+ EL_BD_FIREFLY_
1_LEFT,
-1, -1
},
{
O_FIREFLY_2, TRUE,
},
{
O_FIREFLY_2, TRUE,
- EL_BD_FIREFLY_
UP,
-1, -1
+ EL_BD_FIREFLY_
1_UP,
-1, -1
},
{
O_FIREFLY_3, TRUE,
},
{
O_FIREFLY_3, TRUE,
- EL_BD_FIREFLY_
RIGHT,
-1, -1
+ EL_BD_FIREFLY_
1_RIGHT,
-1, -1
},
{
O_FIREFLY_4, TRUE,
},
{
O_FIREFLY_4, TRUE,
- EL_BD_FIREFLY_
DOWN,
-1, -1
+ EL_BD_FIREFLY_
1_DOWN,
-1, -1
},
{
O_ALT_FIREFLY_1, TRUE,
},
{
O_ALT_FIREFLY_1, TRUE,
@@
-6874,19
+6874,19
@@
bd_object_mapping_list[] =
},
{
O_BUTTER_1, TRUE,
},
{
O_BUTTER_1, TRUE,
- EL_BD_BUTTERFLY_
LEFT,
-1, -1
+ EL_BD_BUTTERFLY_
1_LEFT,
-1, -1
},
{
O_BUTTER_2, TRUE,
},
{
O_BUTTER_2, TRUE,
- EL_BD_BUTTERFLY_
UP,
-1, -1
+ EL_BD_BUTTERFLY_
1_UP,
-1, -1
},
{
O_BUTTER_3, TRUE,
},
{
O_BUTTER_3, TRUE,
- EL_BD_BUTTERFLY_
RIGHT,
-1, -1
+ EL_BD_BUTTERFLY_
1_RIGHT,
-1, -1
},
{
O_BUTTER_4, TRUE,
},
{
O_BUTTER_4, TRUE,
- EL_BD_BUTTERFLY_
DOWN,
-1, -1
+ EL_BD_BUTTERFLY_
1_DOWN,
-1, -1
},
{
O_ALT_BUTTER_1, TRUE,
},
{
O_ALT_BUTTER_1, TRUE,
@@
-7122,43
+7122,43
@@
bd_object_mapping_list[] =
},
{
O_PRE_DIA_1, TRUE,
},
{
O_PRE_DIA_1, TRUE,
- EL_BD_DIAMOND_
GROWING_1,
-1, -1
+ EL_BD_DIAMOND_
NATIVE_GROWING_1,
-1, -1
},
{
O_PRE_DIA_1, FALSE,
},
{
O_PRE_DIA_1, FALSE,
- EL_BD_DIAMOND
,
ACTION_GROWING, -1
+ EL_BD_DIAMOND
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_DIA_2, TRUE,
},
{
O_PRE_DIA_2, TRUE,
- EL_BD_DIAMOND_
GROWING_2,
-1, -1
+ EL_BD_DIAMOND_
NATIVE_GROWING_2,
-1, -1
},
{
O_PRE_DIA_2, FALSE,
},
{
O_PRE_DIA_2, FALSE,
- EL_BD_DIAMOND
,
ACTION_GROWING, -1
+ EL_BD_DIAMOND
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_DIA_3, TRUE,
},
{
O_PRE_DIA_3, TRUE,
- EL_BD_DIAMOND_
GROWING_3,
-1, -1
+ EL_BD_DIAMOND_
NATIVE_GROWING_3,
-1, -1
},
{
O_PRE_DIA_3, FALSE,
},
{
O_PRE_DIA_3, FALSE,
- EL_BD_DIAMOND
,
ACTION_GROWING, -1
+ EL_BD_DIAMOND
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_DIA_4, TRUE,
},
{
O_PRE_DIA_4, TRUE,
- EL_BD_DIAMOND_
GROWING_4,
-1, -1
+ EL_BD_DIAMOND_
NATIVE_GROWING_4,
-1, -1
},
{
O_PRE_DIA_4, FALSE,
},
{
O_PRE_DIA_4, FALSE,
- EL_BD_DIAMOND
,
ACTION_GROWING, -1
+ EL_BD_DIAMOND
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_DIA_5, TRUE,
},
{
O_PRE_DIA_5, TRUE,
- EL_BD_DIAMOND_
GROWING_5,
-1, -1
+ EL_BD_DIAMOND_
NATIVE_GROWING_5,
-1, -1
},
{
O_PRE_DIA_5, FALSE,
},
{
O_PRE_DIA_5, FALSE,
- EL_BD_DIAMOND
,
ACTION_GROWING, -1
+ EL_BD_DIAMOND
_NATIVE,
ACTION_GROWING, -1
},
{
O_EXPLODE_1, TRUE,
},
{
O_EXPLODE_1, TRUE,
@@
-7202,35
+7202,35
@@
bd_object_mapping_list[] =
},
{
O_PRE_STONE_1, TRUE,
},
{
O_PRE_STONE_1, TRUE,
- EL_BD_ROCK_
GROWING_1,
-1, -1
+ EL_BD_ROCK_
NATIVE_GROWING_1,
-1, -1
},
{
O_PRE_STONE_1, FALSE,
},
{
O_PRE_STONE_1, FALSE,
- EL_BD_ROCK
,
ACTION_GROWING, -1
+ EL_BD_ROCK
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_STONE_2, TRUE,
},
{
O_PRE_STONE_2, TRUE,
- EL_BD_ROCK_
GROWING_2,
-1, -1
+ EL_BD_ROCK_
NATIVE_GROWING_2,
-1, -1
},
{
O_PRE_STONE_2, FALSE,
},
{
O_PRE_STONE_2, FALSE,
- EL_BD_ROCK
,
ACTION_GROWING, -1
+ EL_BD_ROCK
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_STONE_3, TRUE,
},
{
O_PRE_STONE_3, TRUE,
- EL_BD_ROCK_
GROWING_3,
-1, -1
+ EL_BD_ROCK_
NATIVE_GROWING_3,
-1, -1
},
{
O_PRE_STONE_3, FALSE,
},
{
O_PRE_STONE_3, FALSE,
- EL_BD_ROCK
,
ACTION_GROWING, -1
+ EL_BD_ROCK
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_STONE_4, TRUE,
},
{
O_PRE_STONE_4, TRUE,
- EL_BD_ROCK_
GROWING_4,
-1, -1
+ EL_BD_ROCK_
NATIVE_GROWING_4,
-1, -1
},
{
O_PRE_STONE_4, FALSE,
},
{
O_PRE_STONE_4, FALSE,
- EL_BD_ROCK
,
ACTION_GROWING, -1
+ EL_BD_ROCK
_NATIVE,
ACTION_GROWING, -1
},
{
O_PRE_STEEL_1, TRUE,
},
{
O_PRE_STEEL_1, TRUE,
@@
-7553,7
+7553,7
@@
bd_object_mapping_list[] =
},
{
O_MAGIC_WALL_ACTIVE, FALSE,
},
{
O_MAGIC_WALL_ACTIVE, FALSE,
- EL_BD_MAGIC_WALL_
ACTIVE,
-1, -1
+ EL_BD_MAGIC_WALL_
NATIVE_ACTIVE,
-1, -1
},
{
O_REPLICATOR_ACTIVE, FALSE,
},
{
O_REPLICATOR_ACTIVE, FALSE,
@@
-10167,9
+10167,7
@@
int el2edimg(int element)
int el2edimg_with_frame(int element, int *graphic, int *frame)
{
int el2edimg_with_frame(int element, int *graphic, int *frame)
{
- element = GFX_ELEMENT(element);
-
- *graphic = element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
+ *graphic = el2edimg(element);
*frame = 0;
if (*graphic == IMG_UNKNOWN)
*frame = 0;
if (*graphic == IMG_UNKNOWN)