X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=e5105b44a9b7627f6ac1e9c2b7c7a517b28f8020;hp=9ac05663bfc373f59d4dd6d73756d65663a2a67c;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=273ed881a8affb54ee8e2bd7489eb3d898e11c23

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 9ac05663..e5105b44 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -1,25 +1,19 @@
-/***********************************************************
-* Artsoft Retro-Game Library                               *
-*----------------------------------------------------------*
-* (c) 1994-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* system.c                                                 *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// system.c
+// ============================================================================
 
 #include <string.h>
 #include <signal.h>
 
 #include "platform.h"
 
-#if defined(PLATFORM_MSDOS)
-#include <fcntl.h>
-#endif
-
 #include "system.h"
 #include "image.h"
 #include "sound.h"
@@ -75,10 +69,8 @@ int			FrameCounter = 0;
 
 void InitProgramInfo(char *argv0,
 		     char *userdata_subdir, char *userdata_subdir_unix,
-		     char *program_title, char *window_title, char *icon_title,
-		     char *x11_icon_filename, char *x11_iconmask_filename,
-		     char *sdl_icon_filename, char *msdos_cursor_filename,
-		     char *cookie_prefix, char *filename_prefix,
+		     char *program_title, char *icon_title,
+		     char *sdl_icon_filename, char *cookie_prefix,
 		     int program_version)
 {
   program.command_basepath = getBasePath(argv0);
@@ -89,25 +81,37 @@ void InitProgramInfo(char *argv0,
   program.userdata_path = getUserGameDataDir();
 
   program.program_title = program_title;
-  program.window_title = window_title;
+  program.window_title = "(undefined)";
   program.icon_title = icon_title;
 
-  program.x11_icon_filename = x11_icon_filename;
-  program.x11_iconmask_filename = x11_iconmask_filename;
   program.sdl_icon_filename = sdl_icon_filename;
-  program.msdos_cursor_filename = msdos_cursor_filename;
 
   program.cookie_prefix = cookie_prefix;
-  program.filename_prefix = filename_prefix;
 
   program.version_major = VERSION_MAJOR(program_version);
   program.version_minor = VERSION_MINOR(program_version);
   program.version_patch = VERSION_PATCH(program_version);
+  program.version_build = VERSION_BUILD(program_version);
+  program.version_ident = program_version;
 
   program.error_filename = getErrorFilename(ERROR_BASENAME);
   program.error_file = stderr;
 }
 
+void SetWindowTitle()
+{
+  program.window_title = program.window_title_function();
+
+#if defined(TARGET_SDL)
+  SDLSetWindowTitle();
+#endif
+}
+
+void InitWindowTitleFunction(char *(*window_title_function)(void))
+{
+  program.window_title_function = window_title_function;
+}
+
 void InitExitMessageFunction(void (*exit_message_function)(char *, va_list))
 {
   program.exit_message_function = exit_message_function;
@@ -132,10 +136,6 @@ void InitPlatformDependentStuff(void)
   // this is initialized in GetOptions(), but may already be used before
   options.verbose = TRUE;
 
-#if defined(PLATFORM_MSDOS)
-  _fmode = O_BINARY;
-#endif
-
 #if defined(PLATFORM_MACOSX)
   updateUserGameDataDir();
 #endif
@@ -164,13 +164,9 @@ void InitPlatformDependentStuff(void)
 
 void ClosePlatformDependentStuff(void)
 {
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
+#if defined(PLATFORM_WIN32)
   closeErrorFile();
 #endif
-
-#if defined(PLATFORM_MSDOS)
-  dumpErrorFile();
-#endif
 }
 
 void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
@@ -198,6 +194,12 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
   SetDrawBackgroundMask(REDRAW_NONE);		/* deactivate masked drawing */
 }
 
+void InitGfxTileSizeInfo(int game_tile_size, int standard_tile_size)
+{
+  gfx.game_tile_size = game_tile_size;
+  gfx.standard_tile_size = standard_tile_size;
+}
+
 void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize)
 {
   gfx.dx = dx;
@@ -214,6 +216,14 @@ void InitGfxDoor2Info(int vx, int vy, int vxsize, int vysize)
   gfx.vysize = vysize;
 }
 
+void InitGfxDoor3Info(int ex, int ey, int exsize, int eysize)
+{
+  gfx.ex = ex;
+  gfx.ey = ey;
+  gfx.exsize = exsize;
+  gfx.eysize = eysize;
+}
+
 void InitGfxWindowInfo(int win_xsize, int win_ysize)
 {
   gfx.win_xsize = win_xsize;
@@ -391,24 +401,15 @@ inline static int GetRealDepth(int depth)
 inline static void sysFillRectangle(Bitmap *bitmap, int x, int y,
 			       int width, int height, Pixel color)
 {
-#if defined(TARGET_SDL)
   SDLFillRectangle(bitmap, x, y, width, height, color);
-#else
-  X11FillRectangle(bitmap, x, y, width, height, color);
-#endif
 }
 
 inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 			       int src_x, int src_y, int width, int height,
 			       int dst_x, int dst_y, int mask_mode)
 {
-#if defined(TARGET_SDL)
   SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
 	      dst_x, dst_y, mask_mode);
-#else
-  X11CopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
-	      dst_x, dst_y, mask_mode);
-#endif
 }
 
 void LimitScreenUpdates(boolean enable)
@@ -420,11 +421,7 @@ void LimitScreenUpdates(boolean enable)
 
 void InitVideoDisplay(void)
 {
-#if defined(TARGET_SDL)
   SDLInitVideoDisplay();
-#else
-  X11InitVideoDisplay();
-#endif
 }
 
 void CloseVideoDisplay(void)
@@ -459,11 +456,7 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
 
   video.window_scaling_available = WINDOW_SCALING_STATUS;
 
-#if defined(TARGET_SDL)
   SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
-#else
-  X11InitVideoBuffer(&backbuffer, &window);
-#endif
 
   drawto = backbuffer;
 }
@@ -473,11 +466,7 @@ inline static void FreeBitmapPointers(Bitmap *bitmap)
   if (bitmap == NULL)
     return;
 
-#if defined(TARGET_SDL)
   SDLFreeBitmapPointers(bitmap);
-#else
-  X11FreeBitmapPointers(bitmap);
-#endif
 
   checked_free(bitmap->source_filename);
   bitmap->source_filename = NULL;
@@ -506,11 +495,7 @@ void FreeBitmap(Bitmap *bitmap)
 
 Bitmap *CreateBitmapStruct(void)
 {
-#if defined(TARGET_SDL)
   return checked_calloc(sizeof(struct SDLSurfaceInfo));
-#else
-  return checked_calloc(sizeof(struct X11DrawableInfo));
-#endif
 }
 
 Bitmap *CreateBitmap(int width, int height, int depth)
@@ -520,11 +505,7 @@ Bitmap *CreateBitmap(int width, int height, int depth)
   int real_height = MAX(1, height);	/* prevent zero bitmap height */
   int real_depth  = GetRealDepth(depth);
 
-#if defined(TARGET_SDL)
   SDLCreateBitmapContent(new_bitmap, real_width, real_height, real_depth);
-#else
-  X11CreateBitmapContent(new_bitmap, real_width, real_height, real_depth);
-#endif
 
   new_bitmap->width  = real_width;
   new_bitmap->height = real_height;
@@ -549,9 +530,6 @@ void ReCreateBitmap(Bitmap **bitmap, int width, int height, int depth)
 
 void CloseWindow(DrawWindow *window)
 {
-#if defined(TARGET_X11)
-  X11CloseWindow(window);
-#endif
 }
 
 inline static boolean CheckDrawingArea(int x, int y, int width, int height,
@@ -563,6 +541,19 @@ inline static boolean CheckDrawingArea(int x, int y, int width, int height,
   if (draw_mask & REDRAW_ALL)
     return TRUE;
 
+#if 1
+  if ((draw_mask & REDRAW_FIELD) && IN_GFX_FIELD_FULL(x, y))
+    return TRUE;
+
+  if ((draw_mask & REDRAW_DOOR_1) && IN_GFX_DOOR_1(x, y))
+    return TRUE;
+
+  if ((draw_mask & REDRAW_DOOR_2) && IN_GFX_DOOR_2(x, y))
+    return TRUE;
+
+  if ((draw_mask & REDRAW_DOOR_3) && IN_GFX_DOOR_3(x, y))
+    return TRUE;
+#else
   if ((draw_mask & REDRAW_FIELD) &&
       x >= gfx.real_sx && x < gfx.real_sx + gfx.full_sxsize)
     return TRUE;
@@ -574,6 +565,7 @@ inline static boolean CheckDrawingArea(int x, int y, int width, int height,
   if ((draw_mask & REDRAW_DOOR_2) &&
       x >= gfx.dx && y >= gfx.vy)
     return TRUE;
+#endif
 
   return FALSE;
 }
@@ -823,13 +815,8 @@ void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
     return;
 #endif
 
-#if defined(TARGET_SDL)
   SDLFadeRectangle(bitmap_cross, x, y, width, height,
 		   fade_mode, fade_delay, post_delay, draw_border_function);
-#else
-  X11FadeRectangle(bitmap_cross, x, y, width, height,
-		   fade_mode, fade_delay, post_delay, draw_border_function);
-#endif
 }
 
 void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height,
@@ -873,24 +860,10 @@ void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y,
 
 void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
 {
-#if defined(TARGET_X11)
-  if (clip_gc)
-  {
-    bitmap->clip_gc = clip_gc;
-    XSetClipMask(display, bitmap->clip_gc, clip_pixmap);
-  }
-#endif
 }
 
 void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
 {
-#if defined(TARGET_X11)
-  if (clip_gc)
-  {
-    bitmap->clip_gc = clip_gc;
-    XSetClipOrigin(display, bitmap->clip_gc, clip_x, clip_y);
-  }
-#endif
 }
 
 void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
@@ -928,24 +901,15 @@ void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 void DrawSimpleBlackLine(Bitmap *bitmap, int from_x, int from_y,
 			 int to_x, int to_y)
 {
-#if defined(TARGET_SDL)
   SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, BLACK_PIXEL);
-#else
-  X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, BLACK_PIXEL);
-#endif
 }
 
 void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
 			 int to_x, int to_y)
 {
-#if defined(TARGET_SDL)
   SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
-#else
-  X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
-#endif
 }
 
-#if !defined(TARGET_X11_NATIVE)
 void DrawLine(Bitmap *bitmap, int from_x, int from_y,
 	      int to_x, int to_y, Pixel pixel, int line_width)
 {
@@ -964,21 +928,14 @@ void DrawLine(Bitmap *bitmap, int from_x, int from_y,
 	  (x == line_width - 1 && y == line_width - 1))
 	continue;
 
-#if defined(TARGET_SDL)
       SDLDrawLine(bitmap,
 		  from_x + dx, from_y + dy, to_x + dx, to_y + dy, pixel);
-#elif defined(TARGET_ALLEGRO)
-      AllegroDrawLine(bitmap->drawable, from_x + dx, from_y + dy,
-		      to_x + dx, to_y + dy, pixel);
-#endif
     }
   }
 }
-#endif
 
 void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, Pixel pixel)
 {
-#if !defined(TARGET_X11_NATIVE)
   int line_width = 4;
   int i;
 
@@ -989,11 +946,6 @@ void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, Pixel pixel)
   /*
   SDLDrawLines(bitmap->surface, points, num_points, pixel);
   */
-#else
-  XSetForeground(display, bitmap->line_gc[1], pixel);
-  XDrawLines(display, bitmap->drawable, bitmap->line_gc[1],
-	     (XPoint *)points, num_points, CoordModeOrigin);
-#endif
 }
 
 Pixel GetPixel(Bitmap *bitmap, int x, int y)
@@ -1002,25 +954,13 @@ Pixel GetPixel(Bitmap *bitmap, int x, int y)
       y < 0 || y >= bitmap->height)
     return BLACK_PIXEL;
 
-#if defined(TARGET_SDL)
   return SDLGetPixel(bitmap, x, y);
-#elif defined(TARGET_ALLEGRO)
-  return AllegroGetPixel(bitmap->drawable, x, y);
-#else
-  return X11GetPixel(bitmap, x, y);
-#endif
 }
 
 Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
 		      unsigned int color_g, unsigned int color_b)
 {
-#if defined(TARGET_SDL)
   return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b);
-#elif defined(TARGET_ALLEGRO)
-  return AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8);
-#else
-  return X11GetPixelFromRGB(color_r, color_g, color_b);
-#endif
 }
 
 Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
@@ -1035,17 +975,11 @@ Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
 /* execute all pending screen drawing operations */
 void FlushDisplay(void)
 {
-#if !defined(TARGET_SDL)
-  XFlush(display);
-#endif
 }
 
 /* execute and wait for all pending screen drawing operations */
 void SyncDisplay(void)
 {
-#if !defined(TARGET_SDL)
-  XSync(display, FALSE);
-#endif
 }
 
 void KeyboardAutoRepeatOn(void)
@@ -1098,23 +1032,7 @@ boolean PointerInWindow(DrawWindow *window)
 
 boolean SetVideoMode(boolean fullscreen)
 {
-#if defined(TARGET_SDL)
   return SDLSetVideoMode(&backbuffer, fullscreen);
-#else
-  boolean success = TRUE;
-
-  if (fullscreen && video.fullscreen_available)
-  {
-    Error(ERR_WARN, "fullscreen not available in X11 version");
-
-    /* display error message only once */
-    video.fullscreen_available = FALSE;
-
-    success = FALSE;
-  }
-
-  return success;
-#endif
 }
 
 boolean ChangeVideoModeIfNeeded(boolean fullscreen)
@@ -1132,11 +1050,7 @@ Bitmap *LoadImage(char *filename)
 {
   Bitmap *new_bitmap;
 
-#if defined(TARGET_SDL)
   new_bitmap = SDLLoadImage(filename);
-#else
-  new_bitmap = X11LoadImage(filename);
-#endif
 
   if (new_bitmap)
     new_bitmap->source_filename = getStringCopy(filename);
@@ -1199,54 +1113,148 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
 
 Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
 {
+#if 0
+  // !!! TEST ONLY !!!
+
   Bitmap *dst_bitmap = CreateBitmap(zoom_width, zoom_height, DEFAULT_DEPTH);
+  print_timestamp_time("CreateBitmap");
+
+  SDL_Rect src_rect, dst_rect;
+
+  src_rect.x = 0;
+  src_rect.y = 0;
+  src_rect.w = src_bitmap->width - 0;
+  src_rect.h = src_bitmap->height;
+
+  dst_rect.x = 0;
+  dst_rect.y = 0;
+  dst_rect.w = dst_bitmap->width;
+  dst_rect.h = dst_bitmap->height;
+
+  SDL_BlitScaled(src_bitmap->surface, &src_rect,
+		 dst_bitmap->surface, &dst_rect);
+  print_timestamp_time("SDL_BlitScaled");
 
-#if defined(TARGET_SDL)
-  SDLZoomBitmap(src_bitmap, dst_bitmap);
 #else
-  X11ZoomBitmap(src_bitmap, dst_bitmap);
+
+  Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
 #endif
 
   return dst_bitmap;
 }
 
 static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
-				boolean create_small_bitmaps)
+				int tile_size, boolean create_small_bitmaps)
 {
   Bitmap swap_bitmap;
   Bitmap *new_bitmap;
-  Bitmap *tmp_bitmap_1;
-  Bitmap *tmp_bitmap_2;
-  Bitmap *tmp_bitmap_4;
-  Bitmap *tmp_bitmap_8;
-  Bitmap *tmp_bitmap_16;
-  Bitmap *tmp_bitmap_32;
+  Bitmap *tmp_bitmap_final = NULL;
+  Bitmap *tmp_bitmap_0 = NULL;
+  Bitmap *tmp_bitmap_1 = NULL;
+  Bitmap *tmp_bitmap_2 = NULL;
+  Bitmap *tmp_bitmap_4 = NULL;
+  Bitmap *tmp_bitmap_8 = NULL;
+  Bitmap *tmp_bitmap_16 = NULL;
+  Bitmap *tmp_bitmap_32 = NULL;
+  int width_final, height_final;
+  int width_0, height_0;
   int width_1, height_1;
   int width_2, height_2;
   int width_4, height_4;
   int width_8, height_8;
   int width_16, height_16;
-#if 0
+#if 1
   int width_32, height_32;
 #endif
+  int old_width, old_height;
   int new_width, new_height;
 
-  /* calculate new image dimensions for normal sized image */
-  width_1  = old_bitmap->width  * zoom_factor;
-  height_1 = old_bitmap->height * zoom_factor;
+  print_timestamp_init("CreateScaledBitmaps");
+
+  old_width  = old_bitmap->width;
+  old_height = old_bitmap->height;
+
+#if 1
+  /* calculate new image dimensions for final image size */
+  width_final  = old_width  * zoom_factor;
+  height_final = old_height * zoom_factor;
 
-  /* get image with normal size (this might require scaling up) */
+  /* get image with final size (this might require scaling up) */
+  /* ("final" size may result in non-standard tile size image) */
+  if (zoom_factor != 1)
+    tmp_bitmap_final = ZoomBitmap(old_bitmap, width_final, height_final);
+  else
+    tmp_bitmap_final = old_bitmap;
+
+#else
+
+  /* calculate new image dimensions for final image size */
+  width_1  = old_width  * zoom_factor;
+  height_1 = old_height * zoom_factor;
+
+  /* get image with final size (this might require scaling up) */
+  /* ("final" size may result in non-standard tile size image) */
   if (zoom_factor != 1)
     tmp_bitmap_1 = ZoomBitmap(old_bitmap, width_1, height_1);
   else
     tmp_bitmap_1 = old_bitmap;
+#endif
+
+  UPDATE_BUSY_STATE();
+
+  width_0  = width_1  = width_final;
+  height_0 = height_1 = height_final;
+
+  tmp_bitmap_0 = tmp_bitmap_1 = tmp_bitmap_final;
+
+#if 1
+  if (create_small_bitmaps)
+  {
+    /* check if we have a non-gameplay tile size image */
+    if (tile_size != gfx.game_tile_size)
+    {
+      /* get image with gameplay tile size */
+      width_0  = width_final  * gfx.game_tile_size / tile_size;
+      height_0 = height_final * gfx.game_tile_size / tile_size;
+
+      if (width_0 == old_width)
+	tmp_bitmap_0 = old_bitmap;
+      else if (width_0 == width_final)
+	tmp_bitmap_0 = tmp_bitmap_final;
+      else
+      {
+#if 0
+	if (old_width != width_0)
+	  printf("::: %d, %d -> %d, %d\n",
+		 old_width, old_height, width_0, height_0);
+#endif
+
+	tmp_bitmap_0 = ZoomBitmap(old_bitmap, width_0, height_0);
+      }
+
+      UPDATE_BUSY_STATE();
+    }
 
-  /* this is only needed to make compilers happy */
-  tmp_bitmap_2 = NULL;
-  tmp_bitmap_4 = NULL;
-  tmp_bitmap_8 = NULL;
-  tmp_bitmap_16 = NULL;
-  tmp_bitmap_32 = NULL;
+    /* check if we have a non-standard tile size image */
+    if (tile_size != gfx.standard_tile_size)
+    {
+      /* get image with standard tile size */
+      width_1  = width_final  * gfx.standard_tile_size / tile_size;
+      height_1 = height_final * gfx.standard_tile_size / tile_size;
+
+      if (width_1 == old_width)
+	tmp_bitmap_1 = old_bitmap;
+      else if (width_1 == width_final)
+	tmp_bitmap_1 = tmp_bitmap_final;
+      else if (width_1 == width_0)
+	tmp_bitmap_1 = tmp_bitmap_0;
+      else
+	tmp_bitmap_1 = ZoomBitmap(old_bitmap, width_1, height_1);
+
+      UPDATE_BUSY_STATE();
+    }
+  }
+#endif
 
   if (create_small_bitmaps)
   {
@@ -1259,13 +1267,54 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
     height_8 = height_1 / 8;
     width_16  = width_1  / 16;
     height_16 = height_1 / 16;
-#if 0
+#if 1
     width_32  = width_1  / 32;
     height_32 = height_1 / 32;
 #endif
 
+#if 1
+    /* get image with 1/2 of normal size (for use in the level editor) */
+    if (width_2 == old_width)
+      tmp_bitmap_2 = old_bitmap;
+    else
+      tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_2, height_2);
+
+    UPDATE_BUSY_STATE();
+
+    /* get image with 1/4 of normal size (for use in the level editor) */
+    if (width_4 == old_width)
+      tmp_bitmap_4 = old_bitmap;
+    else
+      tmp_bitmap_4 = ZoomBitmap(tmp_bitmap_2, width_4, height_4);
+
     UPDATE_BUSY_STATE();
 
+    /* get image with 1/8 of normal size (for use on the preview screen) */
+    if (width_8 == old_width)
+      tmp_bitmap_8 = old_bitmap;
+    else
+      tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_8, height_8);
+
+    UPDATE_BUSY_STATE();
+
+    /* get image with 1/16 of normal size (for use on the preview screen) */
+    if (width_16 == old_width)
+      tmp_bitmap_16 = old_bitmap;
+    else
+      tmp_bitmap_16 = ZoomBitmap(tmp_bitmap_8, width_16, height_16);
+
+    UPDATE_BUSY_STATE();
+
+    /* get image with 1/32 of normal size (for use on the preview screen) */
+    if (width_32 == old_width)
+      tmp_bitmap_32 = old_bitmap;
+    else
+      tmp_bitmap_32 = ZoomBitmap(tmp_bitmap_16, width_32, height_32);
+
+    UPDATE_BUSY_STATE();
+
+#else
+
     /* get image with 1/2 of normal size (for use in the level editor) */
     if (zoom_factor != 2)
       tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_1 / 2, height_1 / 2);
@@ -1305,21 +1354,13 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
       tmp_bitmap_32 = old_bitmap;
 
     UPDATE_BUSY_STATE();
+#endif
   }
 
 #if 0
   /* if image was scaled up, create new clipmask for normal size image */
   if (zoom_factor != 1)
   {
-#if defined(TARGET_X11)
-    if (old_bitmap->clip_mask)
-      XFreePixmap(display, old_bitmap->clip_mask);
-
-    old_bitmap->clip_mask =
-      Pixmap_to_Mask(tmp_bitmap_1->drawable, width_1, height_1);
-
-    XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask);
-#else
     SDL_Surface *tmp_surface_1 = tmp_bitmap_1->surface;
 
     if (old_bitmap->surface_masked)
@@ -1330,7 +1371,6 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
     if ((old_bitmap->surface_masked = SDL_DisplayFormat(tmp_surface_1)) ==NULL)
       Error(ERR_EXIT, "SDL_DisplayFormat() failed");
     SDL_SetColorKey(tmp_surface_1, UNSET_TRANSPARENT_PIXEL, 0);
-#endif
   }
 #endif
 
@@ -1339,8 +1379,21 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
     new_width  = width_1;
     new_height = height_1 + (height_1 + 1) / 2;     /* prevent odd height */
 
+#if 1
+    if (width_0 != width_1)
+    {
+      new_width += width_0;
+      new_height = MAX(new_height, height_0);
+    }
+#endif
+
     new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH);
 
+#if 1
+    if (width_0 != width_1)
+      BlitBitmap(tmp_bitmap_0, new_bitmap, 0, 0, width_0, height_0, width_1, 0);
+#endif
+
     BlitBitmap(tmp_bitmap_1, new_bitmap, 0, 0, width_1, height_1, 0, 0);
     BlitBitmap(tmp_bitmap_2, new_bitmap, 0, 0, width_1 / 2, height_1 / 2,
 	       0, height_1);
@@ -1366,6 +1419,37 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
   if (create_small_bitmaps)
   {
     /* if no small bitmaps created, tmp_bitmap_1 is used as new bitmap now */
+
+#if 1
+    if (tmp_bitmap_final != old_bitmap)
+      FreeBitmap(tmp_bitmap_final);
+
+    if (tmp_bitmap_0 != old_bitmap &&
+	tmp_bitmap_0 != tmp_bitmap_final)
+      FreeBitmap(tmp_bitmap_0);
+
+    if (tmp_bitmap_1 != old_bitmap &&
+	tmp_bitmap_1 != tmp_bitmap_final &&
+	tmp_bitmap_1 != tmp_bitmap_0)
+      FreeBitmap(tmp_bitmap_1);
+
+    if (tmp_bitmap_2 != old_bitmap)
+      FreeBitmap(tmp_bitmap_2);
+
+    if (tmp_bitmap_4 != old_bitmap)
+      FreeBitmap(tmp_bitmap_4);
+
+    if (tmp_bitmap_8 != old_bitmap)
+      FreeBitmap(tmp_bitmap_8);
+
+    if (tmp_bitmap_16 != old_bitmap)
+      FreeBitmap(tmp_bitmap_16);
+
+    if (tmp_bitmap_32 != old_bitmap)
+      FreeBitmap(tmp_bitmap_32);
+
+#else
+
     if (zoom_factor != 1)
       FreeBitmap(tmp_bitmap_1);
 
@@ -1383,6 +1467,7 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
 
     if (zoom_factor != 32)
       FreeBitmap(tmp_bitmap_32);
+#endif
   }
 
   /* replace image with extended image (containing 1/1, 1/2, 1/4, 1/8 size) */
@@ -1402,15 +1487,6 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
 #if 1
   /* this replaces all blit masks created when loading -- maybe optimize this */
   {
-#if defined(TARGET_X11)
-    if (old_bitmap->clip_mask)
-      XFreePixmap(display, old_bitmap->clip_mask);
-
-    old_bitmap->clip_mask =
-      Pixmap_to_Mask(old_bitmap->drawable, new_width, new_height);
-
-    XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask);
-#else
     SDL_Surface *old_surface = old_bitmap->surface;
 
     if (old_bitmap->surface_masked)
@@ -1418,26 +1494,35 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
 
     SDL_SetColorKey(old_surface, SET_TRANSPARENT_PIXEL,
 		    SDL_MapRGB(old_surface->format, 0x00, 0x00, 0x00));
-    if ((old_bitmap->surface_masked = SDL_DisplayFormat(old_surface)) ==NULL)
+
+#if 1
+    if ((old_bitmap->surface_masked = SDLGetNativeSurface(old_surface)) == NULL)
+      Error(ERR_EXIT, "SDL_DisplayFormat() failed");
+#else
+    if ((old_bitmap->surface_masked = SDL_DisplayFormat(old_surface)) == NULL)
       Error(ERR_EXIT, "SDL_DisplayFormat() failed");
-    SDL_SetColorKey(old_surface, UNSET_TRANSPARENT_PIXEL, 0);
 #endif
+
+    SDL_SetColorKey(old_surface, UNSET_TRANSPARENT_PIXEL, 0);
   }
 #endif
 
   UPDATE_BUSY_STATE();
 
   FreeBitmap(new_bitmap);	/* this actually frees the _old_ bitmap now */
+
+  print_timestamp_done("CreateScaledBitmaps");
 }
 
-void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor)
+void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor,
+				  int tile_size)
 {
-  CreateScaledBitmaps(old_bitmap, zoom_factor, TRUE);
+  CreateScaledBitmaps(old_bitmap, zoom_factor, tile_size, TRUE);
 }
 
 void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
 {
-  CreateScaledBitmaps(old_bitmap, zoom_factor, FALSE);
+  CreateScaledBitmaps(old_bitmap, zoom_factor, 0, FALSE);
 }
 
 
@@ -1445,8 +1530,8 @@ void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
 /* mouse pointer functions                                                   */
 /* ------------------------------------------------------------------------- */
 
-#if !defined(PLATFORM_MSDOS)
 #define USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER		0
+
 /* XPM image definitions */
 static const char *cursor_image_none[] =
 {
@@ -1479,6 +1564,7 @@ static const char *cursor_image_none[] =
   /* hot spot */
   "0,0"
 };
+
 #if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER
 static const char *cursor_image_dot[] =
 {
@@ -1518,11 +1604,7 @@ static const char **cursor_image_playfield = cursor_image_dot;
 static const char **cursor_image_playfield = cursor_image_none;
 #endif
 
-#if defined(TARGET_SDL)
 static const int cursor_bit_order = BIT_ORDER_MSB;
-#elif defined(TARGET_X11_NATIVE)
-static const int cursor_bit_order = BIT_ORDER_LSB;
-#endif
 
 static struct MouseCursorInfo *get_cursor_from_image(const char **image)
 {
@@ -1570,11 +1652,9 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image)
 
   return cursor;
 }
-#endif	/* !PLATFORM_MSDOS */
 
 void SetMouseCursor(int mode)
 {
-#if !defined(PLATFORM_MSDOS)
   static struct MouseCursorInfo *cursor_none = NULL;
   static struct MouseCursorInfo *cursor_playfield = NULL;
   struct MouseCursorInfo *cursor_new;
@@ -1589,12 +1669,7 @@ void SetMouseCursor(int mode)
 		mode == CURSOR_NONE      ? cursor_none :
 		mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
 
-#if defined(TARGET_SDL)
   SDLSetMouseCursor(cursor_new);
-#elif defined(TARGET_X11_NATIVE)
-  X11SetMouseCursor(cursor_new);
-#endif
-#endif
 }
 
 
@@ -1623,10 +1698,6 @@ void OpenAudio(void)
 
 #if defined(TARGET_SDL)
   SDLOpenAudio();
-#elif defined(PLATFORM_UNIX)
-  UnixOpenAudio();
-#elif defined(PLATFORM_MSDOS)
-  MSDOSOpenAudio();
 #endif
 }
 
@@ -1634,10 +1705,6 @@ void CloseAudio(void)
 {
 #if defined(TARGET_SDL)
   SDLCloseAudio();
-#elif defined(PLATFORM_UNIX)
-  UnixCloseAudio();
-#elif defined(PLATFORM_MSDOS)
-  MSDOSCloseAudio();
 #endif
 
   audio.sound_enabled = FALSE;
@@ -1811,10 +1878,6 @@ boolean CheckCloseWindowEvent(ClientMessageEvent *event)
 
 #if defined(TARGET_SDL)
   return TRUE;		/* the only possible message here is SDL_QUIT */
-#elif defined(PLATFORM_UNIX)
-  if ((event->window == window->drawable) &&
-      (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
-    return TRUE;
 #endif
 
   return FALSE;
@@ -1840,10 +1903,6 @@ void InitJoysticks()
 
 #if defined(TARGET_SDL)
   SDLInitJoysticks();
-#elif defined(PLATFORM_UNIX)
-  UnixInitJoysticks();
-#elif defined(PLATFORM_MSDOS)
-  MSDOSInitJoysticks();
 #endif
 
 #if 0
@@ -1856,9 +1915,5 @@ boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
 {
 #if defined(TARGET_SDL)
   return SDLReadJoystick(nr, x, y, b1, b2);
-#elif defined(PLATFORM_UNIX)
-  return UnixReadJoystick(nr, x, y, b1, b2);
-#elif defined(PLATFORM_MSDOS)
-  return MSDOSReadJoystick(nr, x, y, b1, b2);
 #endif
 }