X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=10cca3c3cd19c4c182a55926244f706a8dc14c05;hb=33aea5bc32e267538f3993b27774c636211bca1d;hp=babb4987171bd73559191c0429f79aed62e64432;hpb=be208e8ebb9fbe5a97e7ed1d63aa421ac303c0bc;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index babb4987..10cca3c3 100644 --- a/src/tools.c +++ b/src/tools.c @@ -2818,12 +2818,14 @@ static void DrawSizedElementExt(int x, int y, int element, int tilesize, } else { - int graphic = el2edimg(element); + int graphic, frame; + + el2edimg_with_frame(element, &graphic, &frame); if (masked) - DrawSizedGraphicThruMask(x, y, graphic, 0, tilesize); + DrawSizedGraphicThruMask(x, y, graphic, frame, tilesize); else - DrawSizedGraphic(x, y, graphic, 0, tilesize); + DrawSizedGraphic(x, y, graphic, frame, tilesize); } } @@ -3856,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 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 @@ -5515,6 +5517,10 @@ unsigned int MoveDoor(unsigned int door_state) } } + SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); + + game.any_door_active = TRUE; + for (k = start; k < num_move_steps; k++) { int last_frame = num_move_steps - 1; // last frame of this "for" loop @@ -5709,6 +5715,8 @@ unsigned int MoveDoor(unsigned int door_state) BackToFront(); } } + + game.any_door_active = FALSE; } if (door_state & DOOR_ACTION_1) @@ -6006,6 +6014,88 @@ static void HandleToolButtons(struct GadgetInfo *gi) request_gadget_id = gi->custom_id; } +static int getEngineElement_Ext(int element, int game_engine_type, boolean is_drawing_element) +{ + int el_empty; + int el_player; + int el_sand; + int el_wall; + int el_steelwall; + int el_exit_closed; + + if (game_engine_type == -1) + game_engine_type = level.game_engine_type; + + if (level.game_engine_type == GAME_ENGINE_TYPE_BD) + { + el_empty = EL_EMPTY; + el_player = EL_BD_PLAYER; + el_sand = EL_BD_SAND_1; + el_wall = EL_BD_WALL_NATIVE; + el_steelwall = EL_BD_STEELWALL; + el_exit_closed = EL_BD_EXIT_CLOSED; + } + else if (level.game_engine_type == GAME_ENGINE_TYPE_EM) + { + el_empty = EL_EMPTY; + el_player = EL_PLAYER_1; + el_sand = EL_SAND; + el_wall = EL_WALL; + el_steelwall = EL_STEELWALL; + el_exit_closed = EL_EM_EXIT_CLOSED; + } + else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) + { + el_empty = EL_EMPTY; + el_player = EL_SP_MURPHY; + el_sand = EL_SP_BASE; + el_wall = EL_SP_CHIP_SINGLE; + el_steelwall = EL_SP_HARDWARE_GRAY; + el_exit_closed = EL_SP_EXIT_CLOSED; + } + else if (level.game_engine_type == GAME_ENGINE_TYPE_MM) + { + el_empty = EL_EMPTY; + el_player = EL_MM_MCDUFFIN_DOWN; + el_sand = EL_EMPTY; + el_wall = EL_MM_WOODEN_WALL; + el_steelwall = EL_MM_STEEL_WALL; + el_exit_closed = EL_MM_EXIT_CLOSED; + + if (is_drawing_element) + { + el_wall = EL_MM_MIRROR_START; + el_sand = EL_MM_WOODEN_WALL; + } + } + else + { + el_empty = EL_EMPTY; + el_player = EL_PLAYER_1; + el_sand = EL_SAND; + el_wall = EL_WALL; + el_steelwall = EL_STEELWALL; + el_exit_closed = EL_EXIT_CLOSED; + } + + return (element == EL_EMPTY ? el_empty : + element == EL_PLAYER_1 ? el_player : + element == EL_SAND ? el_sand : + element == EL_WALL ? el_wall : + element == EL_STEELWALL ? el_steelwall : + element == EL_EXIT_CLOSED ? el_exit_closed : EL_EMPTY); +} + +int getEngineElement(int element) +{ + return getEngineElement_Ext(element, -1, FALSE); +} + +int getDrawingElement(int element) +{ + return getEngineElement_Ext(element, -1, TRUE); +} + static struct Mapping_BD_to_RND_object { int element_bd; @@ -6068,7 +6158,7 @@ bd_object_mapping_list[] = }, { O_DIRT, TRUE, - EL_BD_SAND, -1, -1 + EL_BD_SAND_1, -1, -1 }, { O_DIRT_SLOPED_UP_RIGHT, TRUE, @@ -6116,7 +6206,7 @@ bd_object_mapping_list[] = }, { O_BRICK, TRUE, - EL_BD_WALL, -1, -1 + EL_BD_WALL_NATIVE, -1, -1 }, { O_BRICK_SLOPED_UP_RIGHT, TRUE, @@ -6140,7 +6230,7 @@ bd_object_mapping_list[] = }, { O_MAGIC_WALL, TRUE, - EL_BD_MAGIC_WALL, ACTION_ACTIVE, -1 + EL_BD_MAGIC_WALL_NATIVE, ACTION_ACTIVE, -1 }, { O_PRE_OUTBOX, TRUE, @@ -6192,15 +6282,15 @@ bd_object_mapping_list[] = }, { O_STONE, TRUE, - EL_BD_ROCK, -1, -1 + EL_BD_ROCK_NATIVE, -1, -1 }, { O_STONE_F, TRUE, - EL_BD_ROCK_FALLING, -1, -1 + EL_BD_ROCK_NATIVE_FALLING, -1, -1 }, { O_STONE_F, FALSE, - EL_BD_ROCK, ACTION_FALLING, -1 + EL_BD_ROCK_NATIVE, ACTION_FALLING, -1 }, { O_FLYING_STONE, TRUE, @@ -6212,7 +6302,7 @@ bd_object_mapping_list[] = }, { O_FLYING_STONE_F, FALSE, - EL_BD_FLYING_ROCK, ACTION_FALLING, -1 + EL_BD_FLYING_ROCK, ACTION_FLYING, -1 }, { O_MEGA_STONE, TRUE, @@ -6228,15 +6318,15 @@ bd_object_mapping_list[] = }, { O_DIAMOND, TRUE, - EL_BD_DIAMOND, -1, -1 + EL_BD_DIAMOND_NATIVE, -1, -1 }, { O_DIAMOND_F, TRUE, - EL_BD_DIAMOND_FALLING, -1, -1 + EL_BD_DIAMOND_NATIVE_FALLING, -1, -1 }, { O_DIAMOND_F, FALSE, - EL_BD_DIAMOND, ACTION_FALLING, -1 + EL_BD_DIAMOND_NATIVE, ACTION_FALLING, -1 }, { O_FLYING_DIAMOND, TRUE, @@ -6248,7 +6338,7 @@ bd_object_mapping_list[] = }, { O_FLYING_DIAMOND_F, FALSE, - EL_BD_FLYING_DIAMOND, ACTION_FALLING, -1 + EL_BD_FLYING_DIAMOND, ACTION_FLYING, -1 }, { O_NUT, TRUE, @@ -6296,7 +6386,7 @@ bd_object_mapping_list[] = }, { O_EXPANDING_WALL_SWITCH, TRUE, - EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL, -1, -1 + EL_BD_EXPANDABLE_WALL_SWITCH, -1, -1 }, { O_CREATURE_SWITCH, TRUE, @@ -6316,7 +6406,7 @@ bd_object_mapping_list[] = }, { O_CONVEYOR_DIR_SWITCH, TRUE, - EL_BD_CONVEYOR_DIR_SWITCH_NORMAL, -1, -1 + EL_BD_CONVEYOR_DIR_SWITCH, -1, -1 }, { O_ACID, TRUE, @@ -6636,7 +6726,7 @@ bd_object_mapping_list[] = }, { O_AMOEBA, TRUE, - EL_BD_AMOEBA, -1, -1 + EL_BD_AMOEBA_1, -1, -1 }, { O_AMOEBA_2, TRUE, @@ -6752,19 +6842,19 @@ bd_object_mapping_list[] = }, { O_FIREFLY_1, TRUE, - EL_BD_FIREFLY_LEFT, -1, -1 + EL_BD_FIREFLY_1_LEFT, -1, -1 }, { O_FIREFLY_2, TRUE, - EL_BD_FIREFLY_UP, -1, -1 + EL_BD_FIREFLY_1_UP, -1, -1 }, { O_FIREFLY_3, TRUE, - EL_BD_FIREFLY_RIGHT, -1, -1 + EL_BD_FIREFLY_1_RIGHT, -1, -1 }, { O_FIREFLY_4, TRUE, - EL_BD_FIREFLY_DOWN, -1, -1 + EL_BD_FIREFLY_1_DOWN, -1, -1 }, { O_ALT_FIREFLY_1, TRUE, @@ -6784,19 +6874,19 @@ bd_object_mapping_list[] = }, { O_BUTTER_1, TRUE, - EL_BD_BUTTERFLY_LEFT, -1, -1 + EL_BD_BUTTERFLY_1_LEFT, -1, -1 }, { O_BUTTER_2, TRUE, - EL_BD_BUTTERFLY_UP, -1, -1 + EL_BD_BUTTERFLY_1_UP, -1, -1 }, { O_BUTTER_3, TRUE, - EL_BD_BUTTERFLY_RIGHT, -1, -1 + EL_BD_BUTTERFLY_1_RIGHT, -1, -1 }, { O_BUTTER_4, TRUE, - EL_BD_BUTTERFLY_DOWN, -1, -1 + EL_BD_BUTTERFLY_1_DOWN, -1, -1 }, { O_ALT_BUTTER_1, TRUE, @@ -6894,6 +6984,10 @@ bd_object_mapping_list[] = O_PLAYER_BOMB, TRUE, EL_BD_PLAYER_WITH_BOMB, -1, -1 }, + { + O_PLAYER_ROCKET_LAUNCHER, TRUE, + EL_BD_PLAYER_WITH_ROCKET_LAUNCHER, -1, -1 + }, { O_PLAYER_GLUED, TRUE, EL_BD_PLAYER_GLUED, -1, -1 @@ -6902,6 +6996,26 @@ bd_object_mapping_list[] = O_PLAYER_STIRRING, TRUE, EL_BD_PLAYER_STIRRING, -1, -1 }, + { + O_ROCKET_LAUNCHER, TRUE, + EL_BD_ROCKET_LAUNCHER, -1, -1 + }, + { + O_ROCKET_1, TRUE, + EL_BD_ROCKET_RIGHT, -1, -1 + }, + { + O_ROCKET_2, TRUE, + EL_BD_ROCKET_UP, -1, -1 + }, + { + O_ROCKET_3, TRUE, + EL_BD_ROCKET_LEFT, -1, -1 + }, + { + O_ROCKET_4, TRUE, + EL_BD_ROCKET_DOWN, -1, -1 + }, { O_BOMB, TRUE, EL_BD_BOMB, -1, -1 @@ -6974,14 +7088,6 @@ bd_object_mapping_list[] = O_NITRO_PACK_F, FALSE, EL_BD_NITRO_PACK, ACTION_FALLING, -1 }, - { - O_NITRO_PACK_EXPLODE, TRUE, - EL_BD_NITRO_PACK_EXPLODING, -1, -1 - }, - { - O_NITRO_PACK_EXPLODE, FALSE, - EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 - }, { O_PRE_CLOCK_1, TRUE, EL_BD_CLOCK_GROWING_1, -1, -1 @@ -7016,43 +7122,43 @@ bd_object_mapping_list[] = }, { 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, - EL_BD_DIAMOND, ACTION_GROWING, -1 + EL_BD_DIAMOND_NATIVE, ACTION_GROWING, -1 }, { 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, - EL_BD_DIAMOND, ACTION_GROWING, -1 + EL_BD_DIAMOND_NATIVE, ACTION_GROWING, -1 }, { 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, - EL_BD_DIAMOND, ACTION_GROWING, -1 + EL_BD_DIAMOND_NATIVE, ACTION_GROWING, -1 }, { 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, - EL_BD_DIAMOND, ACTION_GROWING, -1 + EL_BD_DIAMOND_NATIVE, ACTION_GROWING, -1 }, { 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, - EL_BD_DIAMOND, ACTION_GROWING, -1 + EL_BD_DIAMOND_NATIVE, ACTION_GROWING, -1 }, { O_EXPLODE_1, TRUE, @@ -7096,35 +7202,35 @@ bd_object_mapping_list[] = }, { 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, - EL_BD_ROCK, ACTION_GROWING, -1 + EL_BD_ROCK_NATIVE, ACTION_GROWING, -1 }, { 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, - EL_BD_ROCK, ACTION_GROWING, -1 + EL_BD_ROCK_NATIVE, ACTION_GROWING, -1 }, { 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, - EL_BD_ROCK, ACTION_GROWING, -1 + EL_BD_ROCK_NATIVE, ACTION_GROWING, -1 }, { 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, - EL_BD_ROCK, ACTION_GROWING, -1 + EL_BD_ROCK_NATIVE, ACTION_GROWING, -1 }, { O_PRE_STEEL_1, TRUE, @@ -7254,6 +7360,14 @@ bd_object_mapping_list[] = O_NITRO_EXPL_4, FALSE, EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 }, + { + O_NITRO_PACK_EXPLODE, TRUE, + EL_BD_NITRO_PACK_EXPLODING, -1, -1 + }, + { + O_NITRO_PACK_EXPLODE, FALSE, + EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 + }, { O_AMOEBA_2_EXPL_1, TRUE, EL_BD_AMOEBA_2_EXPLODING_1, -1, -1 @@ -7327,11 +7441,11 @@ bd_object_mapping_list[] = EL_BD_PLAYER, ACTION_HITTING, MV_BIT_RIGHT }, { - O_PNEUMATIC_ACTIVE_LEFT, TRUE, + O_PNEUMATIC_ACTIVE_LEFT, FALSE, EL_BD_PNEUMATIC_HAMMER, ACTION_HITTING, MV_BIT_LEFT }, { - O_PNEUMATIC_ACTIVE_RIGHT, TRUE, + O_PNEUMATIC_ACTIVE_RIGHT, FALSE, EL_BD_PNEUMATIC_HAMMER, ACTION_HITTING, MV_BIT_RIGHT }, @@ -7369,6 +7483,14 @@ bd_object_mapping_list[] = O_PLAYER_RIGHT, FALSE, EL_BD_PLAYER, ACTION_MOVING, MV_BIT_RIGHT }, + { + O_PLAYER_UP, FALSE, + EL_BD_PLAYER, ACTION_MOVING, MV_BIT_UP + }, + { + O_PLAYER_DOWN, FALSE, + EL_BD_PLAYER, ACTION_MOVING, MV_BIT_DOWN + }, { O_PLAYER_BLINK, FALSE, EL_BD_PLAYER, ACTION_BORING_1, -1 @@ -7381,17 +7503,25 @@ bd_object_mapping_list[] = O_PLAYER_TAP_BLINK, FALSE, EL_BD_PLAYER, ACTION_BORING_3, -1 }, + { + O_PLAYER_PUSH_LEFT, FALSE, + EL_BD_PLAYER, ACTION_PUSHING, MV_BIT_LEFT + }, + { + O_PLAYER_PUSH_RIGHT, FALSE, + EL_BD_PLAYER, ACTION_PUSHING, MV_BIT_RIGHT + }, { O_CREATURE_SWITCH_ON, FALSE, EL_BD_CREATURE_SWITCH_ACTIVE, -1, -1 }, { O_EXPANDING_WALL_SWITCH_HORIZ, FALSE, - EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL, -1, -1 + EL_BD_EXPANDABLE_WALL_SWITCH, -1, -1 }, { O_EXPANDING_WALL_SWITCH_VERT, FALSE, - EL_BD_EXPANDABLE_WALL_SWITCH_VERTICAL, -1, -1 + EL_BD_EXPANDABLE_WALL_SWITCH_ACTIVE, -1, -1 }, { O_GRAVITY_SWITCH_ACTIVE, FALSE, @@ -7407,11 +7537,11 @@ bd_object_mapping_list[] = }, { O_CONVEYOR_DIR_NORMAL, FALSE, - EL_BD_CONVEYOR_DIR_SWITCH_NORMAL, -1, -1 + EL_BD_CONVEYOR_DIR_SWITCH, -1, -1 }, { O_CONVEYOR_DIR_CHANGED, FALSE, - EL_BD_CONVEYOR_DIR_SWITCH_CHANGED, -1, -1 + EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE, -1, -1 }, { O_CONVEYOR_SWITCH_OFF, FALSE, @@ -7423,7 +7553,7 @@ bd_object_mapping_list[] = }, { O_MAGIC_WALL_ACTIVE, FALSE, - EL_BD_MAGIC_WALL_ACTIVE, -1, -1 + EL_BD_MAGIC_WALL_NATIVE_ACTIVE, -1, -1 }, { O_REPLICATOR_ACTIVE, FALSE, @@ -10035,6 +10165,29 @@ int el2edimg(int element) return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR]; } +int el2edimg_with_frame(int element, int *graphic, int *frame) +{ + *graphic = el2edimg(element); + *frame = 0; + + if (*graphic == IMG_UNKNOWN) + { + // no graphic defined -- if BD style, try to get runtime ("effect") element graphics + // (normal BD style elements have graphics, but runtime ("effects") elements do not) + int element_bd = map_element_RND_to_BD_cave(element); + + if (element_bd != O_UNKNOWN) + { + struct GraphicInfo_BD *g_bd = &graphic_info_bd_object[element_bd][0]; + + *graphic = g_bd->graphic; + *frame = g_bd->frame; + } + } + + return *graphic; +} + int el2preimg(int element) { element = GFX_ELEMENT(element); @@ -11303,6 +11456,27 @@ void PlaySoundSelecting(void) #endif } +void ToggleAudioSampleRateIfNeeded(void) +{ + int setup_audio_sample_rate = (setup.audio_sample_rate_44100 ? 44100 : 22050); + + // if setup and audio sample rate are already matching, nothing do do + if ((setup_audio_sample_rate == audio.sample_rate) || + !audio.sound_available) + return; + +#if 1 + // apparently changing the audio output sample rate does not work at runtime, + // so currently the program has to be restarted to apply the new sample rate + Request("Please restart the program to change audio sample rate!", REQ_CONFIRM); +#else + SDLReopenAudio(); + + // set setup value according to successfully changed audio sample rate + setup.audio_sample_rate_44100 = (audio.sample_rate == 44100); +#endif +} + void ToggleFullscreenIfNeeded(void) { // if setup and video fullscreen state are already matching, nothing do do