X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=bbf595143e6254954283f20c18d235791af1b768;hp=723f8af0e2597b1a5924c86104ed4e365cb0b5f6;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=faad97c450f035fb84748e8ca72048e53c92de78 diff --git a/src/init.c b/src/init.c index 723f8af0..bbf59514 100644 --- a/src/init.c +++ b/src/init.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* init.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// init.c +// ============================================================================ #include "libgame/libgame.h" @@ -196,11 +194,14 @@ inline void InitElementSmallImagesScaledUp(int graphic) printf("::: '%s' -> '%s'\n", fi->token, fi->filename); #endif - CreateImageWithSmallImages(graphic, graphic_info[graphic].scale_up_factor); + CreateImageWithSmallImages(graphic, graphic_info[graphic].scale_up_factor, + graphic_info[graphic].tile_size); } void InitElementSmallImages() { + print_timestamp_init("InitElementSmallImages"); + static int special_graphics[] = { IMG_EDITOR_ELEMENT_BORDER, @@ -213,21 +214,30 @@ void InitElementSmallImages() int num_property_mappings = getImageListPropertyMappingSize(); int i; + print_timestamp_time("getImageListPropertyMapping/Size"); + + print_timestamp_init("InitElementSmallImagesScaledUp (1)"); /* initialize normal images from static configuration */ for (i = 0; element_to_graphic[i].element > -1; i++) InitElementSmallImagesScaledUp(element_to_graphic[i].graphic); + print_timestamp_done("InitElementSmallImagesScaledUp (1)"); /* initialize special images from static configuration */ for (i = 0; element_to_special_graphic[i].element > -1; i++) InitElementSmallImagesScaledUp(element_to_special_graphic[i].graphic); + print_timestamp_time("InitElementSmallImagesScaledUp (2)"); /* initialize images from dynamic configuration (may be elements or other) */ for (i = 0; i < num_property_mappings; i++) InitElementSmallImagesScaledUp(property_mapping[i].artwork_index); + print_timestamp_time("InitElementSmallImagesScaledUp (3)"); /* initialize special images from above list (non-element images) */ for (i = 0; special_graphics[i] > -1; i++) InitElementSmallImagesScaledUp(special_graphics[i]); + print_timestamp_time("InitElementSmallImagesScaledUp (4)"); + + print_timestamp_done("InitElementSmallImages"); } void InitScaledImages() @@ -1182,6 +1192,7 @@ static void set_graphic_parameters_ext(int graphic, int *parameter, g->diggable_like = -1; /* do not use clone element */ g->border_size = TILEX / 8; /* "CRUMBLED" border size */ g->scale_up_factor = 1; /* default: no scaling up */ + g->tile_size = TILESIZE; /* default: standard tile size */ g->clone_from = -1; /* do not use clone graphic */ g->anim_delay_fixed = 0; g->anim_delay_random = 0; @@ -1207,6 +1218,14 @@ static void set_graphic_parameters_ext(int graphic, int *parameter, g->scale_up_factor = 1; /* no scaling */ #endif +#if 1 + /* optional tile size for using non-standard image size */ + if (parameter[GFX_ARG_TILE_SIZE] != ARG_UNDEFINED_VALUE) + g->tile_size = parameter[GFX_ARG_TILE_SIZE]; + if (g->tile_size < TILESIZE) + g->tile_size = TILESIZE; /* standard tile size */ +#endif + #if 1 if (g->use_image_size) { @@ -1753,14 +1772,6 @@ static void InitGraphicInfo() int num_images = getImageListSize(); int i; -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - static boolean clipmasks_initialized = FALSE; - Pixmap src_pixmap; - XGCValues clip_gc_values; - unsigned int clip_gc_valuemask; - GC copy_clipmask_gc = None; -#endif - /* use image size as default values for width and height for these images */ static int full_size_graphics[] = { @@ -1771,6 +1782,7 @@ static void InitGraphicInfo() IMG_BACKGROUND_ENVELOPE_2, IMG_BACKGROUND_ENVELOPE_3, IMG_BACKGROUND_ENVELOPE_4, + IMG_BACKGROUND_REQUEST, IMG_BACKGROUND, IMG_BACKGROUND_TITLE_INITIAL, @@ -1785,11 +1797,15 @@ static void InitGraphicInfo() IMG_BACKGROUND_INFO_MUSIC, IMG_BACKGROUND_INFO_CREDITS, IMG_BACKGROUND_INFO_PROGRAM, + IMG_BACKGROUND_INFO_VERSION, IMG_BACKGROUND_INFO_LEVELSET, IMG_BACKGROUND_SETUP, + IMG_BACKGROUND_PLAYING, IMG_BACKGROUND_DOOR, IMG_BACKGROUND_TAPE, IMG_BACKGROUND_PANEL, + IMG_BACKGROUND_PALETTE, + IMG_BACKGROUND_TOOLBOX, IMG_TITLESCREEN_INITIAL_1, IMG_TITLESCREEN_INITIAL_2, @@ -1802,6 +1818,17 @@ static void InitGraphicInfo() IMG_TITLESCREEN_4, IMG_TITLESCREEN_5, + IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1, + IMG_BACKGROUND_TITLEMESSAGE_INITIAL_2, + IMG_BACKGROUND_TITLEMESSAGE_INITIAL_3, + IMG_BACKGROUND_TITLEMESSAGE_INITIAL_4, + IMG_BACKGROUND_TITLEMESSAGE_INITIAL_5, + IMG_BACKGROUND_TITLEMESSAGE_1, + IMG_BACKGROUND_TITLEMESSAGE_2, + IMG_BACKGROUND_TITLEMESSAGE_3, + IMG_BACKGROUND_TITLEMESSAGE_4, + IMG_BACKGROUND_TITLEMESSAGE_5, + -1 }; @@ -1819,22 +1846,6 @@ static void InitGraphicInfo() graphic_info[full_size_graphics[i]].use_image_size = TRUE; #endif -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - if (clipmasks_initialized) - { - for (i = 0; i < num_images; i++) - { - if (graphic_info[i].clip_mask) - XFreePixmap(display, graphic_info[i].clip_mask); - if (graphic_info[i].clip_gc) - XFreeGC(display, graphic_info[i].clip_gc); - - graphic_info[i].clip_mask = None; - graphic_info[i].clip_gc = None; - } - } -#endif - /* first set all graphic paramaters ... */ for (i = 0; i < num_images; i++) set_graphic_parameters(i); @@ -1927,41 +1938,7 @@ static void InitGraphicInfo() graphic_info[i] = graphic_info[fallback_graphic]; } - -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - /* currently we only need a tile clip mask from the first frame */ - getFixedGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y); - - 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); - } - - graphic_info[i].clip_mask = - XCreatePixmap(display, window->drawable, TILEX, TILEY, 1); - - src_pixmap = src_bitmap->clip_mask; - XCopyArea(display, src_pixmap, graphic_info[i].clip_mask, - copy_clipmask_gc, src_x, src_y, TILEX, TILEY, 0, 0); - - clip_gc_values.graphics_exposures = False; - clip_gc_values.clip_mask = graphic_info[i].clip_mask; - clip_gc_valuemask = GCGraphicsExposures | GCClipMask; - - graphic_info[i].clip_gc = - XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values); -#endif } - -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - if (copy_clipmask_gc) - XFreeGC(display, copy_clipmask_gc); - - clipmasks_initialized = TRUE; -#endif } static void InitGraphicCompatibilityInfo() @@ -2002,6 +1979,54 @@ static void InitGraphicCompatibilityInfo() } } +#if 1 + InitGraphicCompatibilityInfo_Doors(); +#endif + +#if 0 + struct + { + int graphic; + int *width, *height; + boolean right_wing; + } + doors[] = + { + { IMG_DOOR_1_WING_LEFT, &door_1.width, &door_1.height, FALSE }, + { IMG_DOOR_1_WING_RIGHT, &door_1.width, &door_1.height, TRUE }, + { IMG_DOOR_2_WING_LEFT, &door_2.width, &door_2.height, FALSE }, + { IMG_DOOR_2_WING_RIGHT, &door_2.width, &door_2.height, TRUE }, + + { 0, NULL, NULL, FALSE } + }; + + for (i = 0; doors[i].graphic != 0; i++) + { + int graphic = doors[i].graphic; + int *width = doors[i].width; + int *height = doors[i].height; + boolean right_wing = doors[i].right_wing; + + struct FileInfo *fi = getImageListEntryFromImageID(graphic); + struct GraphicInfo *g = &graphic_info[graphic]; + + if (!fi->redefined) + { + if (*width != -1) + { + // correct start position for right wing of "standard" door graphic + if (right_wing) + g->src_x += g->width - *width; + + g->width = *width; + } + + if (*height != -1) + g->height = *height; + } + } +#endif + #if 0 for (i = 0; i < num_images; i++) { @@ -2396,6 +2421,10 @@ static void ReinitializeGraphics() { print_timestamp_init("ReinitializeGraphics"); +#if NEW_GAME_TILESIZE + InitGfxTileSizeInfo(game.tile_size, TILESIZE); +#endif + InitGraphicInfo(); /* graphic properties mapping */ print_timestamp_time("InitGraphicInfo"); InitElementGraphicInfo(); /* element game graphic mapping */ @@ -2425,6 +2454,8 @@ static void ReinitializeGraphics() print_timestamp_time("InitGadgets"); InitToons(); print_timestamp_time("InitToons"); + InitDoors(); + print_timestamp_time("InitDoors"); print_timestamp_done("ReinitializeGraphics"); } @@ -5027,7 +5058,7 @@ static void InitGlobal() global.fading_type = TYPE_ENTER_MENU; #endif - global.use_envelope_request = FALSE; /* !!! MOVE TO ARTWORK CONFIG !!! */ + global.use_envelope_request = FALSE; } void Execute_Command(char *command) @@ -5201,15 +5232,11 @@ void Execute_Command(char *command) } else if (strPrefix(command, "create images ")) { -#if defined(TARGET_SDL) global.create_images_dir = getStringCopy(&command[14]); if (access(global.create_images_dir, W_OK) != 0) Error(ERR_EXIT, "image target directory '%s' not found or not writable", global.create_images_dir); -#else - Error(ERR_EXIT, "command only available for SDL target"); -#endif } #if DEBUG @@ -5493,11 +5520,16 @@ static void InitMixer() void InitGfxBuffers() { + /* create additional image buffers for double-buffering and cross-fading */ ReCreateBitmap(&bitmap_db_store, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); ReCreateBitmap(&bitmap_db_cross, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); ReCreateBitmap(&bitmap_db_field, FXSIZE, FYSIZE, DEFAULT_DEPTH); ReCreateBitmap(&bitmap_db_panel, DXSIZE, DYSIZE, DEFAULT_DEPTH); +#if 0 ReCreateBitmap(&bitmap_db_door, 3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); +#endif + ReCreateBitmap(&bitmap_db_door_1, 3 * DXSIZE, DYSIZE, DEFAULT_DEPTH); + ReCreateBitmap(&bitmap_db_door_2, 3 * VXSIZE, VYSIZE, DEFAULT_DEPTH); ReCreateBitmap(&bitmap_db_toons, FULL_SXSIZE, FULL_SYSIZE, DEFAULT_DEPTH); /* initialize screen properties */ @@ -5506,6 +5538,7 @@ void InitGfxBuffers() bitmap_db_field); InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE); InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE); + InitGfxDoor3Info(EX, EY, EXSIZE, EYSIZE); InitGfxWindowInfo(WIN_XSIZE, WIN_YSIZE); InitGfxScrollbufferInfo(FXSIZE, FYSIZE); InitGfxClipRegion(FALSE, -1, -1, -1, -1); @@ -5560,27 +5593,7 @@ void InitGfx() if (filename_font_initial == NULL) /* should not happen */ Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_FONT_INITIAL); -#if 1 InitGfxBuffers(); -#else - /* create additional image buffers for double-buffering and cross-fading */ - bitmap_db_store = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); - bitmap_db_cross = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); - bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH); - bitmap_db_panel = CreateBitmap(DXSIZE, DYSIZE, DEFAULT_DEPTH); - bitmap_db_door = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); - bitmap_db_toons = CreateBitmap(FULL_SXSIZE, FULL_SYSIZE, DEFAULT_DEPTH); - - /* initialize screen properties */ - InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE, - REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, - bitmap_db_field); - InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE); - InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE); - InitGfxWindowInfo(WIN_XSIZE, WIN_YSIZE); - InitGfxScrollbufferInfo(FXSIZE, FYSIZE); -#endif - InitGfxCustomArtworkInfo(); bitmap_font_initial = LoadCustomImage(filename_font_initial); @@ -5592,15 +5605,16 @@ void InitGfx() font_height = getFontHeight(FC_RED); -#if 1 - DrawInitText(getWindowTitleString(), 20, FC_YELLOW); +#if 0 + DrawInitTextAlways(getWindowTitleString(), 20, FC_YELLOW); #else - DrawInitText(getProgramInitString(), 20, FC_YELLOW); + DrawInitTextAlways(getProgramInitString(), 20, FC_YELLOW); #endif - DrawInitText(PROGRAM_COPYRIGHT_STRING, 50, FC_RED); - DrawInitText(PROGRAM_WEBSITE_STRING, WIN_YSIZE - 20 - font_height, FC_RED); + DrawInitTextAlways(PROGRAM_COPYRIGHT_STRING, 50, FC_RED); + DrawInitTextAlways(PROGRAM_WEBSITE_STRING, WIN_YSIZE - 20 - font_height, + FC_RED); - DrawInitText("Loading graphics", 120, FC_GREEN); + DrawInitTextAlways("Loading graphics", 120, FC_GREEN); #if 1 #if 1 @@ -6216,6 +6230,8 @@ void ReloadCustomArtwork(int force_reload) #endif print_timestamp_done("ReloadCustomArtwork"); + + LimitScreenUpdates(FALSE); } void KeyboardAutoRepeatOffUnlessAutoplay()