X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_tools.c;h=6a9e3a8a8a2da3baeff59f1df1b36037f62fc702;hb=2b9849f490f48a8e2e5dd5aaeadf920827127d78;hp=d8dbe8becaa5270253801ca4a406f0255f8d1aa3;hpb=e81db25c94af29e469fe78f4217089b111a39eff;p=rocksndiamonds.git diff --git a/src/game_mm/mm_tools.c b/src/game_mm/mm_tools.c index d8dbe8be..6a9e3a8a 100644 --- a/src/game_mm/mm_tools.c +++ b/src/game_mm/mm_tools.c @@ -524,8 +524,10 @@ void DrawElement_MM(int x, int y, int element) laser.fuse_x == x && laser.fuse_y == y) DrawGraphic_MM(x, y, IMG_MM_FUSE); + else if (element == EL_GRAY_BALL_ACTIVE) + DrawGraphic_MM(x, y, el_act2gfx(EL_GRAY_BALL, MM_ACTION_ACTIVE)); else if (element == EL_GRAY_BALL_OPENING) - DrawGraphic_MM(x, y, el_act2gfx(EL_BALL_GRAY, MM_ACTION_OPENING)); + DrawGraphic_MM(x, y, el_act2gfx(EL_GRAY_BALL, MM_ACTION_OPENING)); else if (element == EL_BOMB_ACTIVE) DrawGraphic_MM(x, y, el_act2gfx(EL_BOMB, MM_ACTION_ACTIVE)); else if (element == EL_MINE_ACTIVE) @@ -1177,11 +1179,6 @@ Pixel ReadPixel(DrawBuffer *bitmap, int x, int y) return GetPixel(bitmap, x, y); } -void SetRGB(unsigned int pixel, - unsigned short red, unsigned short green, unsigned short blue) -{ -} - int get_base_element(int element) { if (IS_MIRROR(element)) @@ -1293,6 +1290,21 @@ static int map_element(int element) } } +int unmap_element(int element) +{ + switch (element) + { + case EL_STEEL_WALL: return EL_WALL_STEEL; + case EL_WOODEN_WALL: return EL_WALL_WOOD; + case EL_ICE_WALL: return EL_WALL_ICE; + case EL_AMOEBA_WALL: return EL_WALL_AMOEBA; + case EL_DF_STEEL_WALL: return EL_DF_WALL_STEEL; + case EL_DF_WOODEN_WALL: return EL_DF_WALL_WOOD; + + default: return element; + } +} + int el2gfx(int element) { return el2img_mm(map_element(element));