projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020402-3-src
[rocksndiamonds.git]
/
src
/
libgame
/
x11.c
diff --git
a/src/libgame/x11.c
b/src/libgame/x11.c
index d8356fbb63b658031f46a5a97032cea6e06c33f1..fd1d8b80c7f44b15e5af4f56c6e65af627edaeb3 100644
(file)
--- a/
src/libgame/x11.c
+++ b/
src/libgame/x11.c
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
0
Artsoft Entertainment *
+* (c) 1994-200
1
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-73,17
+73,11
@@
static void X11InitDisplay()
/* got appropriate visual? */
if (depth < 8)
/* got appropriate visual? */
if (depth < 8)
- {
- printf("Sorry, displays with less than 8 bits per pixel not supported.\n");
- exit(-1);
- }
+ Error(ERR_EXIT, "X11 display not supported (less than 8 bits per pixel)");
else if ((depth ==8 && visual->class != PseudoColor) ||
(depth > 8 && visual->class != TrueColor &&
visual->class != DirectColor))
else if ((depth ==8 && visual->class != PseudoColor) ||
(depth > 8 && visual->class != TrueColor &&
visual->class != DirectColor))
- {
- printf("Sorry, cannot get appropriate visual.\n");
- exit(-1);
- }
+ Error(ERR_EXIT, "X11 display not supported (inappropriate visual)");
#endif /* !PLATFORM_MSDOS */
}
#endif /* !PLATFORM_MSDOS */
}
@@
-146,8
+140,7
@@
static DrawWindow *X11InitWindow()
PropModePrepend, (unsigned char *) &delete_atom, 1);
#if 0
PropModePrepend, (unsigned char *) &delete_atom, 1);
#if 0
- sprintf(icon_filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY,
+ sprintf(icon_filename, "%s/%s", options.graphics_directory,
icon_pic.picture_filename);
#endif
if (XReadBitmapFile(display, new_window->drawable,
icon_pic.picture_filename);
#endif
if (XReadBitmapFile(display, new_window->drawable,
@@
-158,8
+151,7
@@
static DrawWindow *X11InitWindow()
program.x11_icon_filename);
#if 0
program.x11_icon_filename);
#if 0
- sprintf(icon_filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY,
+ sprintf(icon_filename, "%s/%s", options.graphics_directory,
icon_pic.picturemask_filename);
#endif
if (XReadBitmapFile(display, new_window->drawable,
icon_pic.picturemask_filename);
#endif
if (XReadBitmapFile(display, new_window->drawable,
@@
-242,6
+234,7
@@
static DrawWindow *X11InitWindow()
Bitmap *X11LoadImage(char *filename)
{
Bitmap *new_bitmap = CreateBitmapStruct();
Bitmap *X11LoadImage(char *filename)
{
Bitmap *new_bitmap = CreateBitmapStruct();
+ char *error = "Read_PCX_to_Pixmap(): %s '%s'";
int pcx_err;
#if defined(PLATFORM_MSDOS)
int pcx_err;
#if defined(PLATFORM_MSDOS)
@@
-255,24
+248,39
@@
Bitmap *X11LoadImage(char *filename)
case PCX_Success:
break;
case PCX_OpenFailed:
case PCX_Success:
break;
case PCX_OpenFailed:
- Error(ERR_EXIT, "cannot open PCX file '%s'", filename);
+ SetError(error, "cannot open PCX file", filename);
+ return NULL;
case PCX_ReadFailed:
case PCX_ReadFailed:
- Error(ERR_EXIT, "cannot read PCX file '%s'", filename);
+ SetError(error, "cannot read PCX file", filename);
+ return NULL;
case PCX_FileInvalid:
case PCX_FileInvalid:
- Error(ERR_EXIT, "invalid PCX file '%s'", filename);
+ SetError(error, "invalid PCX file", filename);
+ return NULL;
case PCX_NoMemory:
case PCX_NoMemory:
- Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename);
+ SetError(error, "not enough memory for PCX file", filename);
+ return NULL;
case PCX_ColorFailed:
case PCX_ColorFailed:
- Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename);
+ SetError(error, "cannot get colors for PCX file", filename);
+ return NULL;
+ case PCX_OtherError:
+ /* this should already have called SetError() */
+ return NULL;
default:
default:
- break;
+ SetError(error, "unknown error reading PCX file", filename);
+ return NULL;
}
if (!new_bitmap->drawable)
}
if (!new_bitmap->drawable)
- Error(ERR_EXIT, "cannot get graphics for '%s'", filename);
+ {
+ SetError("X11LoadImage(): cannot get graphics for '%s'", filename);
+ return NULL;
+ }
if (!new_bitmap->clip_mask)
if (!new_bitmap->clip_mask)
- Error(ERR_EXIT, "cannot get clipmask for '%s'", filename);
+ {
+ SetError("X11LoadImage(): cannot get clipmask for '%s'", filename);
+ return NULL;
+ }
/* set GraphicContext inheritated from Window */
new_bitmap->gc = window->gc;
/* set GraphicContext inheritated from Window */
new_bitmap->gc = window->gc;