X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=85339702a27243982d20cfaeeed5811d4f3f6b09;hb=20e58eb6573a45a41c25958e17e8d9c20f738edc;hp=6935fc82d99c1a058fefa609ea009469a217618d;hpb=84c20a81b20d9a4017f7691dda78fc3b6f2dedf5;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 6935fc82..85339702 100644 --- a/src/init.c +++ b/src/init.c @@ -628,45 +628,12 @@ void InitGfx() int tile = tile_needs_clipping[i].start + j; int graphic = tile; int src_x, src_y; - Pixmap src_pixmap; - -#if 0 - if (graphic >= GFX_START_ROCKSSCREEN && - graphic <= GFX_END_ROCKSSCREEN) - { - src_pixmap = clipmask[PIX_BACK]; - graphic -= GFX_START_ROCKSSCREEN; - src_x = SX + (graphic % GFX_PER_LINE) * TILEX; - src_y = SY + (graphic / GFX_PER_LINE) * TILEY; - } - else if (graphic >= GFX_START_ROCKSHEROES && - graphic <= GFX_END_ROCKSHEROES) - { - src_pixmap = clipmask[PIX_HEROES]; - graphic -= GFX_START_ROCKSHEROES; - src_x = (graphic % HEROES_PER_LINE) * TILEX; - src_y = (graphic / HEROES_PER_LINE) * TILEY; - } - else if (graphic >= GFX_START_ROCKSFONT && - graphic <= GFX_END_ROCKSFONT) - { - src_pixmap = clipmask[PIX_BIGFONT]; - graphic -= GFX_START_ROCKSFONT; - src_x = (graphic % FONT_CHARS_PER_LINE) * TILEX; - src_y = (graphic / FONT_CHARS_PER_LINE) * TILEY + - FC_SPECIAL1 * FONT_LINES_PER_FONT * TILEY; - } - else - break; -#else - int pixmap_nr; + Pixmap src_pixmap; getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y); src_pixmap = clipmask[pixmap_nr]; -#endif - tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1); XCopyArea(display,src_pixmap,tile_clipmask[tile],copy_clipmask_gc,