rnd-20020803-1-src

[rocksndiamonds.git] / src / libgame / x11.c

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index cfa0ce78857abc3ee46afc846e42bd63b201cf45..4ef1bd16f258cbb3c6eb3cb206cdf98bdd870410 100644 (file)
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment                      *
+* (c) 1994-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -234,12 +234,19 @@ static DrawWindow *X11InitWindow()
 
 static void SetImageDimensions(Bitmap *bitmap)
 {
+#if defined(TARGET_ALLEGRO)
+  BITMAP *allegro_bitmap = (BITMAP *)(bitmap->drawable);
+
+  bitmap->width  = allegro_bitmap->w;
+  bitmap->height = allegro_bitmap->h;
+#else
   Window root;
   int x, y;
   unsigned int border_width, depth;
 
   XGetGeometry(display, bitmap->drawable, &root, &x, &y,
               &bitmap->width, &bitmap->height, &border_width, &depth);
+#endif
 }
 
 Bitmap *X11LoadImage(char *filename)
@@ -248,10 +255,6 @@ Bitmap *X11LoadImage(char *filename)
   char *error = "Read_PCX_to_Pixmap(): %s '%s'";
   int pcx_err;
 
-#if defined(PLATFORM_MSDOS)
-  rest(100);
-#endif
-
   pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc, filename,
                               &new_bitmap->drawable, &new_bitmap->clip_mask);
   switch(pcx_err)