boolean picture_with_mask;
};
-struct IconFileInfo
-{
- char *picture_filename;
- char *picturemask_filename;
-};
-
-#ifndef USE_SDL_LIBRARY
+#ifndef TARGET_SDL
static int sound_process_id = 0;
#endif
static void InitPlayerInfo(void);
static void InitLevelInfo(void);
static void InitNetworkServer(void);
-static void InitDisplay(void);
static void InitSound(void);
static void InitSoundServer(void);
-static void InitWindow(int, char **);
static void InitGfx(void);
+static void InitGfxBackground(void);
static void LoadGfx(int, struct PictureFileInfo *);
static void InitGadgets(void);
static void InitElementProperties(void);
signal(SIGINT, CloseAllAndExit);
signal(SIGTERM, CloseAllAndExit);
- InitDisplay();
- InitWindow(argc, argv);
-
-#ifndef USE_SDL_LIBRARY
- XMapWindow(display, window);
- FlushDisplay();
-#endif
+ InitBufferedDisplay(&backbuffer, &window);
+ InitEventFilter(FilterMouseMotionEvents);
InitGfx();
InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
InitLevelInfo();
InitGadgets(); /* needs to know number of level series */
+ InitGfxBackground();
DrawMainMenu();
InitNetworkServer();
if (sound_status == SOUND_OFF)
return;
-#ifdef USE_SDL_LIBRARY
- /* initialize SDL audio */
-
- if (SDL_Init(SDL_INIT_AUDIO) < 0)
+#ifdef TARGET_SDL
+ if (InitAudio())
{
- Error(ERR_WARN, "SDL_Init() failed: %s", SDL_GetError());
- sound_status = SOUND_OFF;
- return;
+ sound_status = SOUND_AVAILABLE;
+ sound_loops_allowed = TRUE;
}
-
- if (Mix_OpenAudio(22050, AUDIO_S16, 2, 512) < 0)
+ else
{
- Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError());
sound_status = SOUND_OFF;
- return;
}
-
- Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4);
- Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4);
-
- sound_status = SOUND_AVAILABLE;
- sound_loops_allowed = TRUE;
-
-#else /* !USE_SDL_LIBRARY */
+#else /* !TARGET_SDL */
#if !defined(MSDOS) && !defined(WIN32)
- if (access(sound_device_name, W_OK) != 0)
- {
- Error(ERR_WARN, "cannot access sound device - no sounds");
- sound_status = SOUND_OFF;
- return;
- }
-
- if ((sound_device = open(sound_device_name,O_WRONLY))<0)
- {
- Error(ERR_WARN, "cannot open sound device - no sounds");
- sound_status = SOUND_OFF;
+ if ((sound_status = CheckAudio(sound_device_name)) == SOUND_OFF)
return;
- }
-
- close(sound_device);
- sound_status = SOUND_AVAILABLE;
#ifdef VOXWARE
sound_loops_allowed = TRUE;
-
- /*
- setup.sound_loops_on = TRUE;
- */
-
#endif
+
#else /* MSDOS || WIN32 */
sound_loops_allowed = TRUE;
- /*
- setup.sound_loops_on = TRUE;
- */
-
#endif /* MSDOS || WIN32 */
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !TARGET_SDL */
for(i=0; i<NUM_SOUNDS; i++)
{
return;
}
}
-
-#if 0
- sound_status = SOUND_OFF;
-#endif
-
}
void InitSoundServer()
if (sound_status == SOUND_OFF)
return;
-#ifndef USE_SDL_LIBRARY
+#ifndef TARGET_SDL
#if !defined(MSDOS) && !defined(WIN32)
#endif /* MSDOS */
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !TARGET_SDL */
}
void InitJoysticks()
}
#endif
-#endif /* !USE_SDL_LIBRARY */
-}
-
-void InitDisplay()
-{
-#ifdef USE_SDL_LIBRARY
- /* initialize SDL video */
- if (SDL_Init(SDL_INIT_VIDEO) < 0)
- Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
-
- /* automatically cleanup SDL stuff after exit() */
- atexit(SDL_Quit);
-
-#else /* !USE_SDL_LIBRARY */
-
-#ifndef MSDOS
- XVisualInfo vinfo_template, *vinfo;
- int num_visuals;
-#endif
- unsigned int depth;
-
- /* connect to X server */
- if (!(display = XOpenDisplay(options.display_name)))
- Error(ERR_EXIT, "cannot connect to X server %s",
- XDisplayName(options.display_name));
-
- screen = DefaultScreen(display);
- visual = DefaultVisual(display, screen);
- depth = DefaultDepth(display, screen);
- cmap = DefaultColormap(display, screen);
-
-#ifndef MSDOS
- /* look for good enough visual */
- vinfo_template.screen = screen;
- vinfo_template.class = (depth == 8 ? PseudoColor : TrueColor);
- vinfo_template.depth = depth;
- if ((vinfo = XGetVisualInfo(display, VisualScreenMask | VisualClassMask |
- VisualDepthMask, &vinfo_template, &num_visuals)))
- {
- visual = vinfo->visual;
- XFree((void *)vinfo);
- }
-
- /* got appropriate visual? */
- if (depth < 8)
- {
- printf("Sorry, displays with less than 8 bits per pixel not supported.\n");
- exit(-1);
- }
- else if ((depth ==8 && visual->class != PseudoColor) ||
- (depth > 8 && visual->class != TrueColor &&
- visual->class != DirectColor))
- {
- printf("Sorry, cannot get appropriate visual.\n");
- exit(-1);
- }
-#endif /* !MSDOS */
-#endif /* !USE_SDL_LIBRARY */
-}
-
-void InitWindow(int argc, char *argv[])
-{
-#ifdef USE_SDL_LIBRARY
- /* open SDL video output device (window or fullscreen mode) */
-#if 0
- if ((window = SDL_SetVideoMode(WIN_XSIZE, WIN_YSIZE, WIN_SDL_DEPTH,
- SDL_HWSURFACE))
- == NULL)
- Error(ERR_EXIT, "SDL_SetVideoMode() failed: %s", SDL_GetError());
-#else
- if (!SetVideoMode())
- Error(ERR_EXIT, "setting video mode failed");
-#endif
-
- /* set window and icon title */
- SDL_WM_SetCaption(WINDOW_TITLE_STRING, WINDOW_TITLE_STRING);
-
- /* set event filter to filter out certain mouse motion events */
- SDL_SetEventFilter(EventFilter);
-
-#else /* !USE_SDL_LIBRARY */
-
- unsigned int border_width = 4;
- XGCValues gc_values;
- unsigned long gc_valuemask;
-#ifndef MSDOS
- XTextProperty windowName, iconName;
- Pixmap icon_pixmap, iconmask_pixmap;
- unsigned int icon_width, icon_height;
- int icon_hot_x, icon_hot_y;
- char icon_filename[256];
- XSizeHints size_hints;
- XWMHints wm_hints;
- XClassHint class_hints;
- char *window_name = WINDOW_TITLE_STRING;
- char *icon_name = WINDOW_TITLE_STRING;
- long window_event_mask;
- Atom proto_atom = None, delete_atom = None;
-#endif
- int screen_width, screen_height;
- int win_xpos = WIN_XPOS, win_ypos = WIN_YPOS;
- unsigned long pen_fg = WhitePixel(display,screen);
- unsigned long pen_bg = BlackPixel(display,screen);
- const int width = WIN_XSIZE, height = WIN_YSIZE;
-
-#ifndef MSDOS
- static struct IconFileInfo icon_pic =
- {
- "rocks_icon.xbm",
- "rocks_iconmask.xbm"
- };
-#endif
-
- screen_width = XDisplayWidth(display, screen);
- screen_height = XDisplayHeight(display, screen);
-
- win_xpos = (screen_width - width) / 2;
- win_ypos = (screen_height - height) / 2;
-
- window = XCreateSimpleWindow(display, RootWindow(display, screen),
- win_xpos, win_ypos, width, height, border_width,
- pen_fg, pen_bg);
-
-#ifndef MSDOS
- proto_atom = XInternAtom(display, "WM_PROTOCOLS", FALSE);
- delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", FALSE);
- if ((proto_atom != None) && (delete_atom != None))
- XChangeProperty(display, window, proto_atom, XA_ATOM, 32,
- PropModePrepend, (unsigned char *) &delete_atom, 1);
-
- sprintf(icon_filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY,
- icon_pic.picture_filename);
- XReadBitmapFile(display,window,icon_filename,
- &icon_width,&icon_height,
- &icon_pixmap,&icon_hot_x,&icon_hot_y);
- if (!icon_pixmap)
- Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
- sprintf(icon_filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY,
- icon_pic.picturemask_filename);
- XReadBitmapFile(display,window,icon_filename,
- &icon_width,&icon_height,
- &iconmask_pixmap,&icon_hot_x,&icon_hot_y);
- if (!iconmask_pixmap)
- Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
- size_hints.width = size_hints.min_width = size_hints.max_width = width;
- size_hints.height = size_hints.min_height = size_hints.max_height = height;
- size_hints.flags = PSize | PMinSize | PMaxSize;
-
- if (win_xpos || win_ypos)
- {
- size_hints.x = win_xpos;
- size_hints.y = win_ypos;
- size_hints.flags |= PPosition;
- }
-
- if (!XStringListToTextProperty(&window_name, 1, &windowName))
- Error(ERR_EXIT, "structure allocation for windowName failed");
-
- if (!XStringListToTextProperty(&icon_name, 1, &iconName))
- Error(ERR_EXIT, "structure allocation for iconName failed");
-
- wm_hints.initial_state = NormalState;
- wm_hints.input = True;
- wm_hints.icon_pixmap = icon_pixmap;
- wm_hints.icon_mask = iconmask_pixmap;
- wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint;
-
- class_hints.res_name = program_name;
- class_hints.res_class = "Rocks'n'Diamonds";
-
- XSetWMProperties(display, window, &windowName, &iconName,
- argv, argc, &size_hints, &wm_hints,
- &class_hints);
-
- XFree(windowName.value);
- XFree(iconName.value);
-
- /* Select event types wanted */
- window_event_mask =
- ExposureMask | StructureNotifyMask | FocusChangeMask |
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
- PointerMotionHintMask | KeyPressMask | KeyReleaseMask;
-
- XSelectInput(display, window, window_event_mask);
-#endif
-
- /* create GC for drawing with window depth and background color (black) */
- gc_values.graphics_exposures = False;
- gc_values.foreground = pen_bg;
- gc_values.background = pen_bg;
- gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground;
- gc = XCreateGC(display, window, gc_valuemask, &gc_values);
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !TARGET_SDL */
}
void InitGfx()
{
- int i,j;
+ int i, j;
-#ifdef USE_SDL_LIBRARY
+#ifdef TARGET_SDL
SDL_Surface *sdl_image_tmp;
#else
GC copy_clipmask_gc;
};
#endif
-#ifdef DEBUG
-#if 0
- static struct PictureFileInfo test_pic1 =
- {
- "RocksFont2",
- FALSE
- };
- static struct PictureFileInfo test_pic2 =
- {
- "mouse",
- FALSE
- };
-#endif
-#endif
-
static struct
{
int start;
{ -1, 0 }
};
-#if DEBUG_TIMING
- debug_print_timestamp(0, NULL); /* initialize timestamp function */
-#endif
+ /* create additional image buffers for double-buffering */
-#ifdef DEBUG
-#if 0
- printf("Test: Loading RocksFont2.pcx ...\n");
- LoadGfx(PIX_SMALLFONT,&test_pic1);
- printf("Test: Done.\n");
- printf("Test: Loading mouse.pcx ...\n");
- LoadGfx(PIX_SMALLFONT,&test_pic2);
- printf("Test: Done.\n");
-#endif
-#endif
+ pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
+ pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
LoadGfx(PIX_SMALLFONT, &pic[PIX_SMALLFONT]);
DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
if (i != PIX_SMALLFONT)
LoadGfx(i,&pic[i]);
-#if DEBUG_TIMING
- debug_print_timestamp(0, "SUMMARY LOADING ALL GRAPHICS:");
-#endif
-
-#ifdef USE_SDL_LIBRARY
- /* create some native image surfaces for double-buffer purposes */
-
- /* create double-buffer surface for background image */
- if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE,
- WIN_XSIZE, WIN_YSIZE,
- WIN_SDL_DEPTH, 0, 0, 0, 0))
- == NULL)
- Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
-
- if ((pix[PIX_DB_BACK] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
-
- SDL_FreeSurface(sdl_image_tmp);
-
- /* create double-buffer surface for door image */
- if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE,
- 3 * DXSIZE, DYSIZE + VYSIZE,
- WIN_SDL_DEPTH, 0, 0, 0, 0))
- == NULL)
- Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
-
- if ((pix[PIX_DB_DOOR] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+ /* create additional image buffers for masking of graphics */
- SDL_FreeSurface(sdl_image_tmp);
-
- /* create double-buffer surface for field image */
- if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE,
- FXSIZE, FYSIZE,
- WIN_SDL_DEPTH, 0, 0, 0, 0))
- == NULL)
- Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
-
- if ((pix[PIX_DB_FIELD] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
-
- SDL_FreeSurface(sdl_image_tmp);
+#ifdef TARGET_SDL
/* initialize surface array to 'NULL' */
for(i=0; i<NUM_TILES; i++)
}
}
-#else /* !USE_SDL_LIBRARY */
-
- pix[PIX_DB_BACK] = XCreatePixmap(display, window,
- WIN_XSIZE,WIN_YSIZE,
- XDefaultDepth(display,screen));
- pix[PIX_DB_DOOR] = XCreatePixmap(display, window,
- 3*DXSIZE,DYSIZE+VYSIZE,
- XDefaultDepth(display,screen));
- pix[PIX_DB_FIELD] = XCreatePixmap(display, window,
- FXSIZE,FYSIZE,
- XDefaultDepth(display,screen));
+#else /* !TARGET_SDL */
+ /* create graphic context structures needed for clipping */
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
copy_clipmask_gc =
- XCreateGC(display,clipmask[PIX_BACK],clip_gc_valuemask,&clip_gc_values);
+ XCreateGC(display, clipmask[PIX_BACK], clip_gc_valuemask, &clip_gc_values);
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
tile_clip_gc =
- XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
+ XCreateGC(display, window, clip_gc_valuemask, &clip_gc_values);
+
+ for(i=0; i<NUM_BITMAPS; i++)
+ {
+ if (clipmask[i])
+ {
+ clip_gc_values.graphics_exposures = False;
+ clip_gc_values.clip_mask = clipmask[i];
+ clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+ clip_gc[i] = XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
+ }
+ }
/* initialize pixmap array to Pixmap 'None' */
for(i=0; i<NUM_TILES; i++)
}
}
- if (!pix[PIX_DB_BACK] || !pix[PIX_DB_DOOR])
- Error(ERR_EXIT, "cannot create additional pixmaps");
-
- for(i=0; i<NUM_BITMAPS; i++)
- {
- if (clipmask[i])
- {
- clip_gc_values.graphics_exposures = False;
- clip_gc_values.clip_mask = clipmask[i];
- clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
- clip_gc[i] = XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
- }
- }
+#endif /* !TARGET_SDL */
+}
-#endif /* !USE_SDL_LIBRARY */
+void InitGfxBackground()
+{
+ int x, y;
drawto = backbuffer = pix[PIX_DB_BACK];
fieldbuffer = pix[PIX_DB_FIELD];
SetDrawtoField(DRAW_BACKBUFFER);
BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
- ClearRectangle(pix[PIX_DB_BACK], REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
+ ClearRectangle(backbuffer, REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
ClearRectangle(pix[PIX_DB_DOOR], 0,0, 3*DXSIZE,DYSIZE+VYSIZE);
- for(i=0; i<MAX_BUF_XSIZE; i++)
- for(j=0; j<MAX_BUF_YSIZE; j++)
- redraw[i][j] = 0;
+ for(x=0; x<MAX_BUF_XSIZE; x++)
+ for(y=0; y<MAX_BUF_YSIZE; y++)
+ redraw[x][y] = 0;
redraw_tiles = 0;
redraw_mask = REDRAW_ALL;
}
char basefilename[256];
char filename[256];
-#ifdef USE_XPM_LIBRARY
- int xpm_err, xbm_err;
- unsigned int width,height;
- int hot_x,hot_y;
- Pixmap shapemask;
- char *picture_ext = ".xpm";
- char *picturemask_ext = "Mask.xbm";
-#else
-
-#ifdef USE_SDL_LIBRARY
+#ifdef TARGET_SDL
SDL_Surface *sdl_image_tmp;
-#else /* !USE_SDL_LIBRARY */
+#else /* !TARGET_SDL */
int pcx_err;
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !TARGET_SDL */
char *picture_ext = ".pcx";
-#endif /* !USE_XPM_LIBRARY */
-
/* Grafik laden */
if (pic->picture_filename)
{
rest(100);
#endif /* MSDOS */
-#if DEBUG_TIMING
- debug_print_timestamp(1, NULL); /* initialize timestamp function */
-#endif
-
-#ifdef USE_SDL_LIBRARY
+#ifdef TARGET_SDL
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
/* free temporary surface */
SDL_FreeSurface(sdl_image_tmp);
-#else /* !USE_SDL_LIBRARY */
-
-#ifdef USE_XPM_LIBRARY
-
- xpm_att[pos].valuemask = XpmCloseness;
- xpm_att[pos].closeness = 20000;
- xpm_err = XpmReadFileToPixmap(display,window,filename,
- &pix[pos],&shapemask,&xpm_att[pos]);
- switch(xpm_err)
- {
- case XpmOpenFailed:
- Error(ERR_EXIT, "cannot open XPM file '%s'", filename);
- case XpmFileInvalid:
- Error(ERR_EXIT, "invalid XPM file '%s'", filename);
- case XpmNoMemory:
- Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename);
- case XpmColorFailed:
- Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename);
- default:
- break;
- }
-
-#if DEBUG_TIMING
- printf("LOADING XPM FILE %s:", filename);
- debug_print_timestamp(1, "");
-#endif
-
-#else /* !USE_XPM_LIBRARY */
+#else /* !TARGET_SDL */
pcx_err = Read_PCX_to_Pixmap(display, window, gc, filename,
&pix[pos], &clipmask[pos]);
break;
}
-#if DEBUG_TIMING
- printf("SUMMARY LOADING PCX FILE %s:", filename);
- debug_print_timestamp(1, "");
-#endif
-
-#endif /* !USE_XPM_LIBRARY */
-
if (!pix[pos])
Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
use pix_masked[], although they are the same when not using SDL */
pix_masked[pos] = pix[pos];
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !TARGET_SDL */
}
-#ifndef USE_SDL_LIBRARY
+#ifndef TARGET_SDL
/* zugehörige Maske laden (wenn vorhanden) */
- if (pic->picture_with_mask)
- {
-#ifdef USE_XPM_LIBRARY
-
- sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext);
- DrawInitText(basefilename, 150, FC_YELLOW);
- sprintf(filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
-
-#if DEBUG_TIMING
- debug_print_timestamp(1, NULL); /* initialize timestamp function */
-#endif
-
- xbm_err = XReadBitmapFile(display,window,filename,
- &width,&height,&clipmask[pos],&hot_x,&hot_y);
- switch(xbm_err)
- {
- case BitmapSuccess:
- break;
- case BitmapOpenFailed:
- Error(ERR_EXIT, "cannot open XBM file '%s'", filename);
- case BitmapFileInvalid:
- Error(ERR_EXIT, "invalid XBM file '%s'", filename);
- case BitmapNoMemory:
- Error(ERR_EXIT, "not enough memory for XBM file '%s'", filename);
- break;
- default:
- break;
- }
-
-#if DEBUG_TIMING
- printf("LOADING XBM FILE %s:", filename);
- debug_print_timestamp(1, "");
-#endif
-
-#endif /* USE_XPM_LIBRARY */
-
- if (!clipmask[pos])
- Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
- }
-#endif /* !USE_SDL_LIBRARY */
+ if (pic->picture_with_mask && !clipmask[pos])
+ Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
+#endif /* !TARGET_SDL */
}
void InitGadgets()
{
int i;
-#ifdef USE_SDL_LIBRARY
+#ifdef TARGET_SDL
StopSounds();
FreeSounds(NUM_SOUNDS);
#else
for(i=0; i<NUM_BITMAPS; i++)
{
if (pix[i])
- {
-#ifdef USE_XPM_LIBRARY
- if (i < NUM_PICTURES) /* XPM pictures */
- {
- XFreeColors(display,DefaultColormap(display,screen),
- xpm_att[i].pixels,xpm_att[i].npixels,0);
- XpmFreeAttributes(&xpm_att[i]);
- }
-#endif
-
-#ifdef USE_SDL_LIBRARY
- SDL_FreeSurface(pix[i]);
-#else
- XFreePixmap(display,pix[i]);
-#endif
- }
+ FreeBitmap(pix[i]);
-#ifdef USE_SDL_LIBRARY
- SDL_FreeSurface(pix_masked[i]);
+#ifdef TARGET_SDL
+ FreeBitmap(pix_masked[i]);
#else
if (clipmask[i])
- XFreePixmap(display,clipmask[i]);
+ FreeBitmap(clipmask[i]);
if (clip_gc[i])
XFreeGC(display, clip_gc[i]);
#endif
}
-#ifdef USE_SDL_LIBRARY
+#ifdef TARGET_SDL
KeyboardAutoRepeatOn();
#else
if (gc)
projects / rocksndiamonds.git / blobdiff