X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=a77779d9e8f9f99a8a98ef609bc55c9fdc16350e;hb=14089dac2cbe56e563863e1e5adb8847944fd262;hp=255cbc63f5863de2b48257d5e4eca50423946bbb;hpb=fa2a77aa4b53bb786e67f35d6c46f759ebe7823d;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 255cbc63..a77779d9 100644 --- a/src/init.c +++ b/src/init.c @@ -124,10 +124,11 @@ 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) { @@ -218,6 +219,11 @@ static void ReinitializeGraphics() new_graphic_info[IMG_MENU_FONT_MEDIUM].bitmap, new_graphic_info[IMG_MENU_FONT_SMALL].bitmap, new_graphic_info[IMG_MENU_FONT_EM].bitmap); + + SetBackgroundBitmap(NULL); + + InitGadgets(); + InitToons(); } static void InitImages() @@ -477,7 +483,7 @@ void InitGfxBackground() fieldbuffer = bitmap_db_field; SetDrawtoField(DRAW_BACKBUFFER); - BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer, + BlitBitmap(new_graphic_info[IMG_MENU_FRAME].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); @@ -582,6 +588,10 @@ void ReloadCustomArtwork() } #endif +#if 0 + SyncDisplay(); +#endif + ReinitializeGraphics(); FreeTileClipmasks(); @@ -647,13 +657,29 @@ 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() @@ -677,9 +703,9 @@ void InitElementInfo() element_info[i].graphic[GFX_ACTION_DEFAULT] = IMG_CHAR_START + (i - EL_CHAR_START); - for (i=EL_GENERIC_START; i<=EL_GENERIC_END; i++) + for (i=EL_CUSTOM_START; i<=EL_CUSTOM_END; i++) element_info[i].graphic[GFX_ACTION_DEFAULT] = - IMG_GENERIC_START + (i - EL_GENERIC_START); + IMG_CUSTOM_START + (i - EL_CUSTOM_START); i = 0; while (element_to_graphic[i].element > -1) @@ -748,11 +774,18 @@ void InitElementInfo() static void InitGraphicInfo() { + static boolean clipmasks_initialized = FALSE; static int gfx_action[NUM_IMAGE_FILES]; Bitmap *src_bitmap; int src_x, src_y; int first_frame, last_frame; int i; +#if defined(TARGET_X11_NATIVE) + Pixmap src_pixmap; + XGCValues clip_gc_values; + unsigned long clip_gc_valuemask; + GC copy_clipmask_gc = None; +#endif image_files = getCurrentImageList(); @@ -775,6 +808,22 @@ static void InitGraphicInfo() i++; } +#if defined(TARGET_X11_NATIVE) + if (clipmasks_initialized) + { + for (i=0; i src_bitmap->width || src_y + TILEY > src_bitmap->height) - Error(ERR_EXIT, "InitGraphicInfo: first frame of graphic animation object %d outside of image bitmap file '%s'", i, src_bitmap->source_filename); + { + 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 < 0 || src_y < 0 || src_x + TILEX > src_bitmap->width || src_y + TILEY > src_bitmap->height) - Error(ERR_EXIT, "InitGraphicInfo: last frame of graphic animation object %d outside of image bitmap file '%s'", i, src_bitmap->source_filename); + { + 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 out of bounds (%d,%d)", + src_x, src_y); + } + +#if defined(TARGET_X11_NATIVE) + /* currently we need only a tile clip mask from the first frame */ + getGraphicSource(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); + } + + new_graphic_info[i].clip_mask = + XCreatePixmap(display, window->drawable, TILEX, TILEY, 1); + + 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); + + 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 defined(TARGET_X11_NATIVE) + if (copy_clipmask_gc) + XFreeGC(display, copy_clipmask_gc); +#endif + + clipmasks_initialized = TRUE; } static void InitSoundInfo()