X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=29f59e295375df4880caf064ef3e918bdc9cd125;hb=38c26472a6e9f0f037ddfe535d3919c00772b26f;hp=88806e9e849096f53439aeb94b6279bb22c10797;hpb=fe0d059d4646a35d85ef508c70eaaaae393302f2;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 88806e9e..29f59e29 100644 --- a/src/init.c +++ b/src/init.c @@ -57,6 +57,7 @@ static char *image_filename[NUM_PICTURES] = static Bitmap *bitmap_font_initial = NULL; +static void InitGlobal(void); static void InitSetup(void); static void InitPlayerInfo(void); static void InitLevelInfo(void); @@ -73,16 +74,14 @@ static void InitElementProperties(void); static void InitElementInfo(void); static void InitGraphicInfo(void); static void InitSoundInfo(); -static void Execute_Debug_Command(char *); +static void Execute_Command(char *); void OpenAll(void) { - if (options.debug_command) - { - Execute_Debug_Command(options.debug_command); + InitGlobal(); /* initialize some global variables */ - exit(0); - } + if (options.execute_command) + Execute_Command(options.execute_command); if (options.serveronly) { @@ -125,16 +124,32 @@ void OpenAll(void) InitImages(); /* needs to know current level directory */ InitSound(); /* needs to know current level directory */ +#if 0 InitGadgets(); /* needs images + number of level series */ +#endif InitGfxBackground(); - InitToons(); + + if (global.autoplay_leveldir) + { + AutoPlayTape(); + return; + } DrawMainMenu(); InitNetworkServer(); } +void InitGlobal() +{ + global.autoplay_leveldir = NULL; + + global.frames_per_second = 0; + global.fps_slowdown = FALSE; + global.fps_slowdown_factor = 1; +} + void InitSetup() { LoadSetup(); /* global setup info */ @@ -199,16 +214,17 @@ static void ReinitializeGraphics() InitGraphicInfo(); /* initialize graphic info from config file */ - InitFontInfo(new_graphic_info[IMG_MENU_FONT_BIG].bitmap, - new_graphic_info[IMG_MENU_FONT_MEDIUM].bitmap, - new_graphic_info[IMG_MENU_FONT_SMALL].bitmap, - new_graphic_info[IMG_MENU_FONT_EM].bitmap); + InitFontInfo(bitmap_font_initial, + new_graphic_info[IMG_FONT_BIG].bitmap, + new_graphic_info[IMG_FONT_MEDIUM].bitmap, + new_graphic_info[IMG_FONT_SMALL].bitmap, + new_graphic_info[IMG_FONT_EM].bitmap); - if (bitmap_font_initial) - { - FreeBitmap(bitmap_font_initial); - bitmap_font_initial = NULL; - } + SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT); + SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); + + InitGadgets(); + InitToons(); } static void InitImages() @@ -238,6 +254,7 @@ static void InitSound() static void InitTileClipmasks() { +#if 0 #if defined(TARGET_X11) XGCValues clip_gc_values; unsigned long clip_gc_valuemask; @@ -372,10 +389,12 @@ static void InitTileClipmasks() #endif /* TARGET_X11_NATIVE */ #endif /* TARGET_X11 */ +#endif } void FreeTileClipmasks() { +#if 0 #if defined(TARGET_X11) int i; @@ -404,6 +423,7 @@ void FreeTileClipmasks() #endif #endif /* TARGET_X11 */ +#endif } void InitGfx() @@ -412,11 +432,6 @@ void InitGfx() int i; #endif - /* initialize some global variables */ - global.frames_per_second = 0; - global.fps_slowdown = FALSE; - global.fps_slowdown_factor = 1; - /* initialize screen properties */ InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); @@ -435,7 +450,7 @@ void InitGfx() #else bitmap_font_initial = LoadCustomImage(image_filename[PIX_FONT_SMALL]); - InitFontInfo(NULL, NULL, bitmap_font_initial, NULL); + InitFontInfo(bitmap_font_initial, NULL, NULL, NULL, NULL); #endif DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW); @@ -473,7 +488,7 @@ void InitGfxBackground() fieldbuffer = bitmap_db_field; SetDrawtoField(DRAW_BACKBUFFER); - BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer, + BlitBitmap(new_graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE); @@ -491,11 +506,21 @@ void ReloadCustomArtwork() static boolean last_override_level_graphics = FALSE; static boolean last_override_level_sounds = FALSE; static boolean last_override_level_music = FALSE; - /* identifier for new artwork; default: artwork configured in setup */ char *gfx_new_identifier = artwork.gfx_current->identifier; char *snd_new_identifier = artwork.snd_current->identifier; char *mus_new_identifier = artwork.mus_current->identifier; + boolean redraw_screen = FALSE; + + if (leveldir_current_identifier == NULL) + leveldir_current_identifier = leveldir_current->identifier; + +#if 0 + printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier, + leveldir_current->graphics_set); + printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier, + leveldir_current->identifier); +#endif #if 0 printf("graphics --> '%s' ('%s')\n", @@ -547,6 +572,11 @@ void ReloadCustomArtwork() if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 || last_override_level_graphics != setup.override_level_graphics) { +#if 0 + printf("CHANGED GFX: '%s' -> '%s'\n", + artwork.gfx_current_identifier, gfx_new_identifier); +#endif + #if 0 int i; #endif @@ -563,18 +593,31 @@ void ReloadCustomArtwork() } #endif +#if 0 + SyncDisplay(); +#endif + ReinitializeGraphics(); FreeTileClipmasks(); InitTileClipmasks(); + +#if 0 InitGfxBackground(); /* force redraw of (open or closed) door graphics */ SetDoorState(DOOR_OPEN_ALL); CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY); +#endif +#if 0 artwork.gfx_current_identifier = gfx_new_identifier; +#else + artwork.gfx_current_identifier = artwork.gfx_current->identifier; +#endif last_override_level_graphics = setup.override_level_graphics; + + redraw_screen = TRUE; } if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 || @@ -587,6 +630,8 @@ void ReloadCustomArtwork() artwork.snd_current_identifier = snd_new_identifier; last_override_level_sounds = setup.override_level_sounds; + + redraw_screen = TRUE; } if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 || @@ -599,6 +644,17 @@ void ReloadCustomArtwork() artwork.mus_current_identifier = mus_new_identifier; last_override_level_music = setup.override_level_music; + + redraw_screen = TRUE; + } + + if (redraw_screen) + { + InitGfxBackground(); + + /* force redraw of (open or closed) door graphics */ + SetDoorState(DOOR_OPEN_ALL); + CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY); } #if 0 @@ -606,385 +662,38 @@ void ReloadCustomArtwork() #endif } +void FreeGadgets() +{ + FreeLevelEditorGadgets(); + FreeGameButtons(); + FreeTapeButtons(); + FreeToolButtons(); + FreeScreenGadgets(); +} + void InitGadgets() { + static boolean gadgets_initialized = FALSE; + + if (gadgets_initialized) + FreeGadgets(); + CreateLevelEditorGadgets(); CreateGameButtons(); CreateTapeButtons(); CreateToolButtons(); CreateScreenGadgets(); + + gadgets_initialized = TRUE; } void InitElementInfo() { -#if 0 - static struct - { - int element; - int graphic; - } - element_to_graphic[] = - { - { EL_EMPTY, GFX_LEERRAUM }, - { EL_SAND, GFX_ERDREICH }, - { EL_WALL, GFX_MAUERWERK }, - { EL_WALL_CRUMBLED, GFX_FELSBODEN }, - { EL_ROCK, GFX_FELSBROCKEN }, - { EL_EMERALD, GFX_EDELSTEIN }, - { EL_EXIT_CLOSED, GFX_AUSGANG_ZU }, - { EL_EXIT_OPENING, GFX_AUSGANG_ACT }, - { EL_EXIT_OPEN, GFX_AUSGANG_AUF }, - { EL_SP_EXIT_OPEN, GFX_SP_EXIT }, - { EL_PLAYER1, GFX_SPIELER1 }, - { EL_PLAYER2, GFX_SPIELER2 }, - { EL_PLAYER3, GFX_SPIELER3 }, - { EL_PLAYER4, GFX_SPIELER4 }, - { EL_BUG, GFX_KAEFER }, - { EL_BUG_RIGHT, GFX_KAEFER_RIGHT }, - { EL_BUG_UP, GFX_KAEFER_UP }, - { EL_BUG_LEFT, GFX_KAEFER_LEFT }, - { EL_BUG_DOWN, GFX_KAEFER_DOWN }, - { EL_SPACESHIP, GFX_FLIEGER }, - { EL_SPACESHIP_RIGHT, GFX_FLIEGER_RIGHT }, - { EL_SPACESHIP_UP, GFX_FLIEGER_UP }, - { EL_SPACESHIP_LEFT, GFX_FLIEGER_LEFT }, - { EL_SPACESHIP_DOWN, GFX_FLIEGER_DOWN }, - { EL_BD_BUTTERFLY, GFX_BUTTERFLY }, - { EL_BD_BUTTERFLY_RIGHT, GFX_BUTTERFLY_RIGHT }, - { EL_BD_BUTTERFLY_UP, GFX_BUTTERFLY_UP }, - { EL_BD_BUTTERFLY_LEFT, GFX_BUTTERFLY_LEFT }, - { EL_BD_BUTTERFLY_DOWN, GFX_BUTTERFLY_DOWN }, - { EL_BD_FIREFLY, GFX_FIREFLY }, - { EL_BD_FIREFLY_RIGHT, GFX_FIREFLY_RIGHT }, - { EL_BD_FIREFLY_UP, GFX_FIREFLY_UP }, - { EL_BD_FIREFLY_LEFT, GFX_FIREFLY_LEFT }, - { EL_BD_FIREFLY_DOWN, GFX_FIREFLY_DOWN }, - { EL_YAMYAM, GFX_MAMPFER }, - { EL_ROBOT, GFX_ROBOT }, - { EL_STEELWALL, GFX_BETON }, - { EL_DIAMOND, GFX_DIAMANT }, - { EL_QUICKSAND_EMPTY, GFX_MORAST_LEER }, - { EL_QUICKSAND_FULL, GFX_MORAST_VOLL }, - { EL_QUICKSAND_EMPTYING, GFX_MORAST_LEER }, - { EL_AMOEBA_DROP, GFX_TROPFEN }, - { EL_BOMB, GFX_BOMBE }, - { EL_MAGIC_WALL, GFX_MAGIC_WALL_OFF }, - { EL_MAGIC_WALL_ACTIVE, GFX_MAGIC_WALL_EMPTY }, - { EL_MAGIC_WALL_EMPTYING, GFX_MAGIC_WALL_EMPTY }, - { EL_MAGIC_WALL_FULL, GFX_MAGIC_WALL_FULL }, - { EL_MAGIC_WALL_DEAD, GFX_MAGIC_WALL_DEAD }, - { EL_ACID, GFX_SALZSAEURE }, - { EL_AMOEBA_DEAD, GFX_AMOEBE_TOT }, - { EL_AMOEBA_WET, GFX_AMOEBE_NASS }, - { EL_AMOEBA_DRY, GFX_AMOEBE_NORM }, - { EL_AMOEBA_FULL, GFX_AMOEBE_VOLL }, - { EL_BD_AMOEBA, GFX_AMOEBE_BD }, - { EL_AMOEBA_TO_DIAMOND, GFX_AMOEBA2DIAM }, - { EL_AMOEBA_DRIPPING, GFX_AMOEBE_NASS }, - { EL_NUT, GFX_KOKOSNUSS }, - { EL_GAMEOFLIFE, GFX_LIFE }, - { EL_BIOMAZE, GFX_LIFE_ASYNC }, - { EL_DYNAMITE_ACTIVE, GFX_DYNAMIT }, - { EL_STONEBLOCK, GFX_BADEWANNE }, - { EL_ACIDPOOL_TOPLEFT, GFX_BADEWANNE1 }, - { EL_ACIDPOOL_TOPRIGHT, GFX_BADEWANNE2 }, - { EL_ACIDPOOL_BOTTOMLEFT, GFX_BADEWANNE3 }, - { EL_ACIDPOOL_BOTTOM, GFX_BADEWANNE4 }, - { EL_ACIDPOOL_BOTTOMRIGHT, GFX_BADEWANNE5 }, - { EL_ROBOT_WHEEL, GFX_ABLENK_AUS }, - { EL_ROBOT_WHEEL_ACTIVE, GFX_ABLENK_EIN }, - { EL_KEY1, GFX_SCHLUESSEL1 }, - { EL_KEY2, GFX_SCHLUESSEL2 }, - { EL_KEY3, GFX_SCHLUESSEL3 }, - { EL_KEY4, GFX_SCHLUESSEL4 }, - { EL_GATE1, GFX_PFORTE1 }, - { EL_GATE2, GFX_PFORTE2 }, - { EL_GATE3, GFX_PFORTE3 }, - { EL_GATE4, GFX_PFORTE4 }, - { EL_GATE1_GRAY, GFX_PFORTE1X }, - { EL_GATE2_GRAY, GFX_PFORTE2X }, - { EL_GATE3_GRAY, GFX_PFORTE3X }, - { EL_GATE4_GRAY, GFX_PFORTE4X }, - { EL_DYNAMITE, GFX_DYNAMIT_AUS }, - { EL_PACMAN, GFX_PACMAN }, - { EL_PACMAN_RIGHT, GFX_PACMAN_RIGHT }, - { EL_PACMAN_UP, GFX_PACMAN_UP }, - { EL_PACMAN_LEFT, GFX_PACMAN_LEFT }, - { EL_PACMAN_DOWN, GFX_PACMAN_DOWN }, - { EL_INVISIBLE_WALL, GFX_UNSICHTBAR }, - { EL_INVISIBLE_WALL_ACTIVE, GFX_UNSICHTBAR_ON }, - { EL_WALL_EMERALD, GFX_ERZ_EDEL }, - { EL_WALL_DIAMOND, GFX_ERZ_DIAM }, - { EL_LAMP, GFX_BIRNE_AUS }, - { EL_LAMP_ACTIVE, GFX_BIRNE_EIN }, - { EL_TIME_ORB_FULL, GFX_ZEIT_VOLL }, - { EL_TIME_ORB_EMPTY, GFX_ZEIT_LEER }, - { EL_WALL_GROWING, GFX_MAUER_LEBT }, - { EL_WALL_GROWING_X, GFX_MAUER_X }, - { EL_WALL_GROWING_Y, GFX_MAUER_Y }, - { EL_WALL_GROWING_XY, GFX_MAUER_XY }, - { EL_BD_DIAMOND, GFX_EDELSTEIN_BD }, - { EL_EMERALD_YELLOW, GFX_EDELSTEIN_GELB }, - { EL_EMERALD_RED, GFX_EDELSTEIN_ROT }, - { EL_EMERALD_PURPLE, GFX_EDELSTEIN_LILA }, - { EL_WALL_BD_DIAMOND, GFX_ERZ_EDEL_BD }, - { EL_WALL_EMERALD_YELLOW, GFX_ERZ_EDEL_GELB }, - { EL_WALL_EMERALD_RED, GFX_ERZ_EDEL_ROT }, - { EL_WALL_EMERALD_PURPLE, GFX_ERZ_EDEL_LILA }, - { EL_DARK_YAMYAM, GFX_MAMPFER2 }, - { EL_BD_MAGIC_WALL, GFX_MAGIC_WALL_BD_OFF }, - { EL_BD_MAGIC_WALL_ACTIVE, GFX_MAGIC_WALL_BD_EMPTY }, - { EL_BD_MAGIC_WALL_EMPTYING, GFX_MAGIC_WALL_BD_EMPTY }, - { EL_BD_MAGIC_WALL_FULL, GFX_MAGIC_WALL_BD_FULL }, - { EL_BD_MAGIC_WALL_DEAD, GFX_MAGIC_WALL_BD_DEAD }, - { EL_DYNABOMB_PLAYER1_ACTIVE, GFX_DYNABOMB }, - { EL_DYNABOMB_PLAYER2_ACTIVE, GFX_DYNABOMB }, - { EL_DYNABOMB_PLAYER3_ACTIVE, GFX_DYNABOMB }, - { EL_DYNABOMB_PLAYER4_ACTIVE, GFX_DYNABOMB }, - { EL_DYNABOMB_NR, GFX_DYNABOMB_NR }, - { EL_DYNABOMB_SZ, GFX_DYNABOMB_SZ }, - { EL_DYNABOMB_XL, GFX_DYNABOMB_XL }, - { EL_SOKOBAN_OBJECT, GFX_SOKOBAN_OBJEKT }, - { EL_SOKOBAN_FIELD_EMPTY, GFX_SOKOBAN_FELD_LEER }, - { EL_SOKOBAN_FIELD_FULL, GFX_SOKOBAN_FELD_VOLL }, - { EL_MOLE, GFX_MOLE }, - { EL_PENGUIN, GFX_PINGUIN }, - { EL_PIG, GFX_SCHWEIN }, - { EL_DRAGON, GFX_DRACHE }, - { EL_SATELLITE, GFX_SONDE }, - { EL_ARROW_BLUE_LEFT, GFX_PFEIL_LEFT }, - { EL_ARROW_BLUE_RIGHT, GFX_PFEIL_RIGHT }, - { EL_ARROW_BLUE_UP, GFX_PFEIL_UP }, - { EL_ARROW_BLUE_DOWN, GFX_PFEIL_DOWN }, - { EL_SPEED_PILL, GFX_SPEED_PILL }, - { EL_SP_TERMINAL_ACTIVE, GFX_SP_TERMINAL }, - { EL_SP_BUGGY_BASE_ACTIVE, GFX_SP_BUG_ACTIVE }, - { EL_SP_ZONK, GFX_SP_ZONK }, - { EL_INVISIBLE_STEELWALL, GFX_INVISIBLE_STEEL }, - { EL_INVISIBLE_STEELWALL_ACTIVE, GFX_INVISIBLE_STEEL_ON }, - { EL_BLACK_ORB, GFX_BLACK_ORB }, - { EL_EM_GATE1, GFX_EM_GATE_1 }, - { EL_EM_GATE2, GFX_EM_GATE_2 }, - { EL_EM_GATE3, GFX_EM_GATE_3 }, - { EL_EM_GATE4, GFX_EM_GATE_4 }, - { EL_EM_GATE1_GRAY, GFX_EM_GATE_1X }, - { EL_EM_GATE2_GRAY, GFX_EM_GATE_2X }, - { EL_EM_GATE3_GRAY, GFX_EM_GATE_3X }, - { EL_EM_GATE4_GRAY, GFX_EM_GATE_4X }, - { EL_EM_KEY1_FILE, GFX_EM_KEY_1 }, - { EL_EM_KEY2_FILE, GFX_EM_KEY_2 }, - { EL_EM_KEY3_FILE, GFX_EM_KEY_3 }, - { EL_EM_KEY4_FILE, GFX_EM_KEY_4 }, - { EL_EM_KEY1, GFX_EM_KEY_1 }, - { EL_EM_KEY2, GFX_EM_KEY_2 }, - { EL_EM_KEY3, GFX_EM_KEY_3 }, - { EL_EM_KEY4, GFX_EM_KEY_4 }, - { EL_PEARL, GFX_PEARL }, - { EL_CRYSTAL, GFX_CRYSTAL }, - { EL_WALL_PEARL, GFX_WALL_PEARL }, - { EL_WALL_CRYSTAL, GFX_WALL_CRYSTAL }, - { EL_DOOR_WHITE, GFX_DOOR_WHITE }, - { EL_DOOR_WHITE_GRAY, GFX_DOOR_WHITE_GRAY }, - { EL_KEY_WHITE, GFX_KEY_WHITE }, - { EL_SHIELD_NORMAL, GFX_SHIELD_PASSIVE }, - { EL_SHIELD_DEADLY, GFX_SHIELD_ACTIVE }, - { EL_EXTRA_TIME, GFX_EXTRA_TIME }, - { EL_SWITCHGATE_OPEN, GFX_SWITCHGATE_OPEN }, - { EL_SWITCHGATE_CLOSED, GFX_SWITCHGATE_CLOSED }, - { EL_SWITCHGATE_SWITCH_UP, GFX_SWITCHGATE_SWITCH_1 }, - { EL_SWITCHGATE_SWITCH_DOWN, GFX_SWITCHGATE_SWITCH_2 }, - { EL_CONVEYOR_BELT1_LEFT, GFX_BELT1_LEFT }, - { EL_CONVEYOR_BELT1_MIDDLE, GFX_BELT1_MIDDLE }, - { EL_CONVEYOR_BELT1_RIGHT, GFX_BELT1_RIGHT }, - { EL_CONVEYOR_BELT1_LEFT_ACTIVE, GFX_BELT1_LEFT }, - { EL_CONVEYOR_BELT1_MIDDLE_ACTIVE, GFX_BELT1_MIDDLE }, - { EL_CONVEYOR_BELT1_RIGHT_ACTIVE, GFX_BELT1_RIGHT }, - { EL_CONVEYOR_BELT1_SWITCH_LEFT, GFX_BELT1_SWITCH_LEFT }, - { EL_CONVEYOR_BELT1_SWITCH_MIDDLE, GFX_BELT1_SWITCH_MIDDLE }, - { EL_CONVEYOR_BELT1_SWITCH_RIGHT, GFX_BELT1_SWITCH_RIGHT }, - { EL_CONVEYOR_BELT2_LEFT, GFX_BELT2_LEFT }, - { EL_CONVEYOR_BELT2_MIDDLE, GFX_BELT2_MIDDLE }, - { EL_CONVEYOR_BELT2_RIGHT, GFX_BELT2_RIGHT }, - { EL_CONVEYOR_BELT2_LEFT_ACTIVE, GFX_BELT2_LEFT }, - { EL_CONVEYOR_BELT2_MIDDLE_ACTIVE, GFX_BELT2_MIDDLE }, - { EL_CONVEYOR_BELT2_RIGHT_ACTIVE, GFX_BELT2_RIGHT }, - { EL_CONVEYOR_BELT2_SWITCH_LEFT, GFX_BELT2_SWITCH_LEFT }, - { EL_CONVEYOR_BELT2_SWITCH_MIDDLE, GFX_BELT2_SWITCH_MIDDLE }, - { EL_CONVEYOR_BELT2_SWITCH_RIGHT, GFX_BELT2_SWITCH_RIGHT }, - { EL_CONVEYOR_BELT3_LEFT, GFX_BELT3_LEFT }, - { EL_CONVEYOR_BELT3_MIDDLE, GFX_BELT3_MIDDLE }, - { EL_CONVEYOR_BELT3_RIGHT, GFX_BELT3_RIGHT }, - { EL_CONVEYOR_BELT3_LEFT_ACTIVE, GFX_BELT3_LEFT }, - { EL_CONVEYOR_BELT3_MIDDLE_ACTIVE, GFX_BELT3_MIDDLE }, - { EL_CONVEYOR_BELT3_RIGHT_ACTIVE, GFX_BELT3_RIGHT }, - { EL_CONVEYOR_BELT3_SWITCH_LEFT, GFX_BELT3_SWITCH_LEFT }, - { EL_CONVEYOR_BELT3_SWITCH_MIDDLE, GFX_BELT3_SWITCH_MIDDLE }, - { EL_CONVEYOR_BELT3_SWITCH_RIGHT, GFX_BELT3_SWITCH_RIGHT }, - { EL_CONVEYOR_BELT4_LEFT, GFX_BELT4_LEFT }, - { EL_CONVEYOR_BELT4_MIDDLE, GFX_BELT4_MIDDLE }, - { EL_CONVEYOR_BELT4_RIGHT, GFX_BELT4_RIGHT }, - { EL_CONVEYOR_BELT4_LEFT_ACTIVE, GFX_BELT4_LEFT }, - { EL_CONVEYOR_BELT4_MIDDLE_ACTIVE, GFX_BELT4_MIDDLE }, - { EL_CONVEYOR_BELT4_RIGHT_ACTIVE, GFX_BELT4_RIGHT }, - { EL_CONVEYOR_BELT4_SWITCH_LEFT, GFX_BELT4_SWITCH_LEFT }, - { EL_CONVEYOR_BELT4_SWITCH_MIDDLE, GFX_BELT4_SWITCH_MIDDLE }, - { EL_CONVEYOR_BELT4_SWITCH_RIGHT, GFX_BELT4_SWITCH_RIGHT }, - { EL_LANDMINE, GFX_LANDMINE }, - { EL_ENVELOPE, GFX_ENVELOPE }, - { EL_LIGHT_SWITCH, GFX_LIGHT_SWITCH_OFF }, - { EL_LIGHT_SWITCH_ACTIVE, GFX_LIGHT_SWITCH_ON }, - { EL_SIGN_EXCLAMATION, GFX_SIGN_EXCLAMATION }, - { EL_SIGN_RADIOACTIVITY, GFX_SIGN_RADIOACTIVITY }, - { EL_SIGN_STOP, GFX_SIGN_STOP }, - { EL_SIGN_WHEELCHAIR, GFX_SIGN_WHEELCHAIR }, - { EL_SIGN_PARKING, GFX_SIGN_PARKING }, - { EL_SIGN_ONEWAY, GFX_SIGN_ONEWAY }, - { EL_SIGN_HEART, GFX_SIGN_HEART }, - { EL_SIGN_TRIANGLE, GFX_SIGN_TRIANGLE }, - { EL_SIGN_ROUND, GFX_SIGN_ROUND }, - { EL_SIGN_EXIT, GFX_SIGN_EXIT }, - { EL_SIGN_YINYANG, GFX_SIGN_YINYANG }, - { EL_SIGN_OTHER, GFX_SIGN_OTHER }, - { EL_MOLE_LEFT, GFX_MOLE_LEFT }, - { EL_MOLE_RIGHT, GFX_MOLE_RIGHT }, - { EL_MOLE_UP, GFX_MOLE_UP }, - { EL_MOLE_DOWN, GFX_MOLE_DOWN }, - { EL_STEELWALL_SLANTED, GFX_STEEL_SLANTED }, - { EL_INVISIBLE_SAND, GFX_SAND_INVISIBLE }, - { EL_INVISIBLE_SAND_ACTIVE, GFX_SAND_INVISIBLE_ON }, - { EL_DX_UNKNOWN_15, GFX_DX_UNKNOWN_15 }, - { EL_DX_UNKNOWN_42, GFX_DX_UNKNOWN_42 }, - { EL_TIMEGATE_OPEN, GFX_TIMEGATE_OPEN }, - { EL_TIMEGATE_CLOSED, GFX_TIMEGATE_CLOSED }, - { EL_TIMEGATE_SWITCH_ACTIVE, GFX_TIMEGATE_SWITCH }, - { EL_TIMEGATE_SWITCH, GFX_TIMEGATE_SWITCH }, - { EL_BALLOON, GFX_BALLOON }, - { EL_BALLOON_SEND_LEFT, GFX_BALLOON_SEND_LEFT }, - { EL_BALLOON_SEND_RIGHT, GFX_BALLOON_SEND_RIGHT }, - { EL_BALLOON_SEND_UP, GFX_BALLOON_SEND_UP }, - { EL_BALLOON_SEND_DOWN, GFX_BALLOON_SEND_DOWN }, - { EL_BALLOON_SEND_ANY_DIRECTION, GFX_BALLOON_SEND_ANY }, - { EL_EMC_STEELWALL1, GFX_EMC_STEEL_WALL_1 }, - { EL_EMC_STEELWALL2, GFX_EMC_STEEL_WALL_2 }, - { EL_EMC_STEELWALL3, GFX_EMC_STEEL_WALL_3 }, - { EL_EMC_STEELWALL4, GFX_EMC_STEEL_WALL_4 }, - { EL_EMC_WALL_PILLAR_UPPER, GFX_EMC_WALL_1 }, - { EL_EMC_WALL_PILLAR_MIDDLE, GFX_EMC_WALL_2 }, - { EL_EMC_WALL_PILLAR_LOWER, GFX_EMC_WALL_3 }, - { EL_EMC_WALL4, GFX_EMC_WALL_4 }, - { EL_EMC_WALL5, GFX_EMC_WALL_5 }, - { EL_EMC_WALL6, GFX_EMC_WALL_6 }, - { EL_EMC_WALL7, GFX_EMC_WALL_7 }, - { EL_EMC_WALL8, GFX_EMC_WALL_8 }, - { EL_TUBE_ALL, GFX_TUBE_CROSS }, - { EL_TUBE_VERTICAL, GFX_TUBE_VERTICAL }, - { EL_TUBE_HORIZONTAL, GFX_TUBE_HORIZONTAL }, - { EL_TUBE_VERTICAL_LEFT, GFX_TUBE_VERT_LEFT }, - { EL_TUBE_VERTICAL_RIGHT, GFX_TUBE_VERT_RIGHT }, - { EL_TUBE_HORIZONTAL_UP, GFX_TUBE_HORIZ_UP }, - { EL_TUBE_HORIZONTAL_DOWN, GFX_TUBE_HORIZ_DOWN }, - { EL_TUBE_LEFT_UP, GFX_TUBE_LEFT_UP }, - { EL_TUBE_LEFT_DOWN, GFX_TUBE_LEFT_DOWN }, - { EL_TUBE_RIGHT_UP, GFX_TUBE_RIGHT_UP }, - { EL_TUBE_RIGHT_DOWN, GFX_TUBE_RIGHT_DOWN }, - { EL_SPRING, GFX_SPRING }, - { EL_SPRING_MOVING, GFX_SPRING }, - { EL_TRAP, GFX_TRAP_INACTIVE }, - { EL_TRAP_ACTIVE, GFX_TRAP_ACTIVE }, - { EL_BD_WALL, GFX_BD_WALL }, - { EL_BD_ROCK, GFX_BD_ROCK }, - { EL_DX_SUPABOMB, GFX_DX_SUPABOMB }, - { EL_SP_MURPHY_CLONE, GFX_SP_MURPHY_CLONE }, - { -1, -1 } - }; - - static struct - { - int element; - int graphic_left; - int graphic_right; - int graphic_up; - int graphic_down; - } - element_to_direction_graphic[] = - { - { - EL_PLAYER1, - IMG_PLAYER1_LEFT, IMG_PLAYER1_RIGHT, - IMG_PLAYER1_UP, IMG_PLAYER1_DOWN - }, - { - EL_PLAYER2, - IMG_PLAYER2_LEFT, IMG_PLAYER2_RIGHT, - IMG_PLAYER2_UP, IMG_PLAYER2_DOWN - }, - { - EL_PLAYER3, - IMG_PLAYER3_LEFT, IMG_PLAYER3_RIGHT, - IMG_PLAYER3_UP, IMG_PLAYER3_DOWN - }, - { - EL_PLAYER4, - IMG_PLAYER4_LEFT, IMG_PLAYER4_RIGHT, - IMG_PLAYER4_UP, IMG_PLAYER4_DOWN - }, - { - EL_SP_MURPHY, - IMG_SP_MURPHY_LEFT, IMG_SP_MURPHY_RIGHT, - IMG_SP_MURPHY_UP, IMG_SP_MURPHY_DOWN - }, - { - EL_SP_SNIKSNAK, - IMG_SP_SNIKSNAK_LEFT, IMG_SP_SNIKSNAK_RIGHT, - IMG_SP_SNIKSNAK_UP, IMG_SP_SNIKSNAK_DOWN - }, - { - EL_BUG, - IMG_BUG_LEFT, IMG_BUG_RIGHT, - IMG_BUG_UP, IMG_BUG_DOWN - }, - { - EL_SPACESHIP, - IMG_SPACESHIP_LEFT, IMG_SPACESHIP_RIGHT, - IMG_SPACESHIP_UP, IMG_SPACESHIP_DOWN - }, - { - EL_PACMAN, - IMG_PACMAN_LEFT, IMG_PACMAN_RIGHT, - IMG_PACMAN_UP, IMG_PACMAN_DOWN - }, - { - EL_MOLE, - IMG_MOLE_LEFT, IMG_MOLE_RIGHT, - IMG_MOLE_UP, IMG_MOLE_DOWN - }, - { - EL_PENGUIN, - IMG_PENGUIN_LEFT, IMG_PENGUIN_RIGHT, - IMG_PENGUIN_UP, IMG_PENGUIN_DOWN - }, - { - EL_PIG, - IMG_PIG_LEFT, IMG_PIG_RIGHT, - IMG_PIG_UP, IMG_PIG_DOWN - }, - { - EL_DRAGON, - IMG_DRAGON_LEFT, IMG_DRAGON_RIGHT, - IMG_DRAGON_UP, IMG_DRAGON_DOWN - }, - { - -1, - -1, -1, - -1, -1 - } - }; -#endif int i, act, dir; /* set values to -1 to identify later as "uninitialized" values */ - for (i=0; i -1) - { - int element = element_to_graphic[i].element; - int graphic = element_to_graphic[i].graphic; - - element_info[element].graphic[GFX_ACTION_DEFAULT] = graphic; - i++; - } - - /* this initializes special graphics for left/right/up/down directions */ - i = 0; - while (element_to_direction_graphic[i].element > -1) - { - int element = element_to_direction_graphic[i].element; - - element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_LEFT] = - element_to_direction_graphic[i].graphic_left; - element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_RIGHT] = - element_to_direction_graphic[i].graphic_right; - element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_UP] = - element_to_direction_graphic[i].graphic_up; - element_info[element].direction_graphic[GFX_ACTION_DEFAULT][MV_BIT_DOWN] = - element_to_direction_graphic[i].graphic_down; - - element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT] = TRUE; - i++; - } -#else + IMG_CUSTOM_START + (i - EL_CUSTOM_START); i = 0; while (element_to_graphic[i].element > -1) @@ -1077,7 +738,7 @@ void InitElementInfo() } /* now set all '-1' values to element specific default values */ - for (i=0; iwidth : TILEX) / TILEX; + int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY; int *parameter = image_files[i].parameter; - new_graphic_info[i].bitmap = getBitmapFromImageID(i); + new_graphic_info[i].bitmap = src_bitmap; new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX; new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY; @@ -1178,7 +849,21 @@ static void InitGraphicInfo() new_graphic_info[i].offset_y = parameter[GFX_ARG_OFFSET]; } - new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES]; + /* optionally, the x and y offset of frames can be specified directly */ + if (parameter[GFX_ARG_XOFFSET] != GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].offset_x = parameter[GFX_ARG_XOFFSET]; + if (parameter[GFX_ARG_YOFFSET] != GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].offset_y = parameter[GFX_ARG_YOFFSET]; + + /* automatically determine correct number of frames, if not defined */ + if (parameter[GFX_ARG_FRAMES] != GFX_ARG_UNDEFINED_VALUE) + new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES]; + else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL]) + new_graphic_info[i].anim_frames = num_xtiles; + else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL]) + new_graphic_info[i].anim_frames = num_ytiles; + else + new_graphic_info[i].anim_frames = 1; new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY]; if (new_graphic_info[i].anim_delay == 0) /* delay must be at least 1 */ @@ -1193,7 +878,9 @@ static void InitGraphicInfo() new_graphic_info[i].anim_mode = ANIM_PINGPONG; else if (parameter[GFX_ARG_MODE_PINGPONG2]) new_graphic_info[i].anim_mode = ANIM_PINGPONG2; - else if (parameter[GFX_ARG_FRAMES] > 1) + else if (parameter[GFX_ARG_MODE_RANDOM]) + new_graphic_info[i].anim_mode = ANIM_RANDOM; + else if (new_graphic_info[i].anim_frames > 1) new_graphic_info[i].anim_mode = ANIM_LOOP; else new_graphic_info[i].anim_mode = ANIM_NONE; @@ -1202,93 +889,100 @@ static void InitGraphicInfo() if (parameter[GFX_ARG_MODE_REVERSE]) new_graphic_info[i].anim_mode |= ANIM_REVERSE; -#if 1 /* set first frame of animation after determining animation mode */ new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME]; - if (new_graphic_info[i].anim_start_frame == -1) + + /* automatically determine correct start frame, if not defined */ + if (parameter[GFX_ARG_START_FRAME] == GFX_ARG_UNDEFINED_VALUE) new_graphic_info[i].anim_start_frame = 0; else if (new_graphic_info[i].anim_mode & ANIM_REVERSE) new_graphic_info[i].anim_start_frame = - new_graphic_info[i].anim_frames - - new_graphic_info[i].anim_start_frame - 1; -#else - /* set first frame of animation after determining animation mode */ - new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME]; - if (parameter[GFX_ARG_START_FRAME] == -1) /* default: start with ... */ - { - if (parameter[GFX_ARG_MODE_REVERSE]) - new_graphic_info[i].anim_start_frame = - new_graphic_info[i].anim_frames - 1; /* ... last frame */ - else - new_graphic_info[i].anim_start_frame = 0; /* ... first frame */ - } -#endif + new_graphic_info[i].anim_frames - parameter[GFX_ARG_START_FRAME] - 1; -#if 1 /* animation synchronized with global frame counter, not move position */ new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC]; - if (parameter[GFX_ARG_GLOBAL_SYNC] == -1) + + /* set global_sync for all animations with undefined "animation action" */ + if (parameter[GFX_ARG_GLOBAL_SYNC] == GFX_ARG_UNDEFINED_VALUE) new_graphic_info[i].anim_global_sync = (gfx_action[i] == GFX_ACTION_DEFAULT ? TRUE : FALSE); -#else - /* animation synchronized with global frame counter, not move position */ - new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC]; -#endif - /* now check if the loaded image is large enough for the animation */ - last_frame = new_graphic_info[i].anim_frames - 1; + /* "linear" animations are never globally synchronized */ + if (parameter[GFX_ARG_MODE_LINEAR]) + new_graphic_info[i].anim_global_sync = FALSE; + + /* now check if no animation frames are outside of the loaded image */ + + if (new_graphic_info[i].bitmap == NULL) + continue; /* skip check for optional images that are undefined */ + first_frame = 0; + getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y); + if (src_x < 0 || src_y < 0 || + src_x + TILEX > src_bitmap->width || + src_y + TILEY > src_bitmap->height) + { + Error(ERR_RETURN, "custom artwork configuration error:"); + Error(ERR_RETURN, "- config file: '%s'", + getImageConfigFilename()); + Error(ERR_RETURN, "- config token: '%s'", + getTokenFromImageID(i)); + Error(ERR_RETURN, "- image file: '%s'", + src_bitmap->source_filename); + Error(ERR_EXIT, "error: first animation frame out of bounds (%d,%d)", + src_x, src_y); + } + + last_frame = new_graphic_info[i].anim_frames - 1; getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y); - if (src_x + TILEX > src_bitmap->width || + if (src_x < 0 || src_y < 0 || + src_x + TILEX > src_bitmap->width || src_y + TILEY > src_bitmap->height) - Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d (normal size)", src_bitmap->source_filename, i); + { + Error(ERR_RETURN, "custom artwork configuration error:"); + Error(ERR_RETURN, "- config file: '%s'", + getImageConfigFilename()); + Error(ERR_RETURN, "- config token: '%s'", + getTokenFromImageID(i)); + Error(ERR_RETURN, "- image file: '%s'", + src_bitmap->source_filename); + Error(ERR_EXIT, "error: last animation frame (%d) out of bounds (%d,%d)", + last_frame, src_x, src_y); + } - getMiniGraphicSource(i, &src_bitmap, &src_x, &src_y); - if (src_x + MINI_TILEX > src_bitmap->width || - src_y + MINI_TILEY > src_bitmap->height) - Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d ('mini' size)", src_bitmap->source_filename, i); +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + /* currently we need only a tile clip mask from the first frame */ + getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y); - getMicroGraphicSource(i, &src_bitmap, &src_x, &src_y); - if (src_x + MICRO_TILEX > src_bitmap->width || - src_y + MICRO_TILEY > src_bitmap->height) - Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d ('micro' size)", src_bitmap->source_filename, i); + if (copy_clipmask_gc == None) + { + clip_gc_values.graphics_exposures = False; + clip_gc_valuemask = GCGraphicsExposures; + copy_clipmask_gc = XCreateGC(display, src_bitmap->clip_mask, + clip_gc_valuemask, &clip_gc_values); + } + new_graphic_info[i].clip_mask = + XCreatePixmap(display, window->drawable, TILEX, TILEY, 1); -#if 0 - { - int j; + src_pixmap = src_bitmap->clip_mask; + XCopyArea(display, src_pixmap, new_graphic_info[i].clip_mask, + copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0); - if (i == IMG_EMERALD) - { - for (j=0; j %d\n", image_config_suffix[j].token, parameter[j]); - printf("-> %d\n", new_graphic_info[i].anim_frames); - printf("\n"); - } - } + clip_gc_values.graphics_exposures = False; + clip_gc_values.clip_mask = new_graphic_info[i].clip_mask; + clip_gc_valuemask = GCGraphicsExposures | GCClipMask; + new_graphic_info[i].clip_gc = + XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values); #endif - } - -#if 0 - printf("D> %d\n", image_files[GFX_BD_DIAMOND].parameter[GFX_ARG_NUM_FRAMES]); - printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFX_ARG_NUM_FRAMES]); - - graphic_info[GFX_ABLENK].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); - graphic_info[GFX_ABLENK].src_x = 0; - graphic_info[GFX_ABLENK].src_y = 0; - - graphic_info[GFX_ABLENK + 1].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); - graphic_info[GFX_ABLENK + 2].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); - graphic_info[GFX_ABLENK + 3].bitmap = getBitmapFromImageID(GFX_ROBOT_WHEEL); - graphic_info[GFX_ABLENK + 1].src_x = 1 * TILEX; - graphic_info[GFX_ABLENK + 2].src_x = 2 * TILEX; - graphic_info[GFX_ABLENK + 3].src_x = 3 * TILEX; - graphic_info[GFX_ABLENK + 1].src_y = 0; - graphic_info[GFX_ABLENK + 2].src_y = 0; - graphic_info[GFX_ABLENK + 3].src_y = 0; +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + if (copy_clipmask_gc) + XFreeGC(display, copy_clipmask_gc); #endif + + clipmasks_initialized = TRUE; } static void InitSoundInfo() @@ -2186,6 +1880,7 @@ void InitElementProperties() EL_SAND, EL_SP_BASE, EL_SP_BUGGY_BASE, + EL_SP_BUGGY_BASE_ACTIVATING, EL_TRAP, EL_INVISIBLE_SAND, EL_INVISIBLE_SAND_ACTIVE @@ -2498,26 +2193,26 @@ void InitElementProperties() static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *); static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *); - for (i=0; i