X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=30aaa1bcbaf7b11688459b853ea333b4f6b935b8;hp=f03e961cd8c461e1d1abf5368ee5139ca24a9909;hb=ee749a764df3dfa944c1f9de740ccbeb1cfdef40;hpb=9b360b977c0c1988c9a9bd63bb6d3f3991d1a650 diff --git a/src/libgame/x11.c b/src/libgame/x11.c index f03e961c..30aaa1bc 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -93,9 +93,6 @@ static DrawWindow *X11InitWindow() Pixmap icon_pixmap, iconmask_pixmap; unsigned int icon_width, icon_height; int icon_hot_x, icon_hot_y; -#if 0 - char icon_filename[256]; -#endif XSizeHints size_hints; XWMHints wm_hints; XClassHint class_hints; @@ -111,16 +108,6 @@ static DrawWindow *X11InitWindow() const int width = video.width, height = video.height; int i; -#if 0 -#if !defined(PLATFORM_MSDOS) - static struct IconFileInfo icon_pic = - { - "rocks_icon.xbm", - "rocks_iconmask.xbm" - }; -#endif -#endif - screen_width = XDisplayWidth(display, screen); screen_height = XDisplayHeight(display, screen); @@ -140,10 +127,6 @@ static DrawWindow *X11InitWindow() XChangeProperty(display, new_window->drawable, proto_atom, XA_ATOM, 32, PropModePrepend, (unsigned char *) &delete_atom, 1); -#if 0 - sprintf(icon_filename, "%s/%s", options.graphics_directory, - icon_pic.picture_filename); -#endif if (XReadBitmapFile(display, new_window->drawable, getCustomImageFilename(program.x11_icon_filename), &icon_width, &icon_height, &icon_pixmap, @@ -151,10 +134,6 @@ static DrawWindow *X11InitWindow() Error(ERR_EXIT, "cannot read icon bitmap file '%s'", program.x11_icon_filename); -#if 0 - sprintf(icon_filename, "%s/%s", options.graphics_directory, - icon_pic.picturemask_filename); -#endif if (XReadBitmapFile(display, new_window->drawable, getCustomImageFilename(program.x11_iconmask_filename), &icon_width, &icon_height, &iconmask_pixmap,