projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990928-1-src
[rocksndiamonds.git]
/
src
/
msdos.c
diff --git
a/src/msdos.c
b/src/msdos.c
index 598aa5d2c5b3081c39b1cca2bd0514cacb96eb5d..d9dd5e7921a0cda09b312e4f6b5c7de7856a4086 100644
(file)
--- a/
src/msdos.c
+++ b/
src/msdos.c
@@
-294,7
+294,7
@@
Display *XOpenDisplay(char *display_name)
BITMAP *mouse_bitmap = NULL;
char *filename;
BITMAP *mouse_bitmap = NULL;
char *filename;
- filename = getPath3(options.base_directory, GRAPHICS_DIRECTORY,
+ filename = getPath3(options.
ro_
base_directory, GRAPHICS_DIRECTORY,
MOUSE_FILENAME);
mouse_bitmap = Read_PCX_to_AllegroBitmap(filename);
MOUSE_FILENAME);
mouse_bitmap = Read_PCX_to_AllegroBitmap(filename);
@@
-348,6
+348,11
@@
Window XCreateSimpleWindow(Display *display, Window parent, int x, int y,
display->screens[display->default_screen].height = YRES;
set_mouse_sprite(display->mouse_ptr);
display->screens[display->default_screen].height = YRES;
set_mouse_sprite(display->mouse_ptr);
+
+#if 0
+ set_mouse_sprite_focus(1, 1);
+#endif
+
set_mouse_speed(1, 1);
set_mouse_range(display->screens[display->default_screen].x + 1,
display->screens[display->default_screen].y + 1,
set_mouse_speed(1, 1);
set_mouse_range(display->screens[display->default_screen].x + 1,
display->screens[display->default_screen].y + 1,
@@
-511,7
+516,10
@@
static BITMAP *Image_to_AllegroBitmap(Image *image)
/* allocate new allegro bitmap structure */
if ((bitmap = create_bitmap_ex(depth, image->width, image->height)) == NULL)
/* allocate new allegro bitmap structure */
if ((bitmap = create_bitmap_ex(depth, image->width, image->height)) == NULL)
+ {
+ errno_pcx = PCX_NoMemory;
return NULL;
return NULL;
+ }
clear(bitmap);
clear(bitmap);
@@
-594,7
+602,7
@@
int Read_PCX_to_Pixmap(Display *display, Window window, GC gc, char *filename,
BITMAP *bitmap;
if ((bitmap = Read_PCX_to_AllegroBitmap(filename)) == NULL)
BITMAP *bitmap;
if ((bitmap = Read_PCX_to_AllegroBitmap(filename)) == NULL)
- return
PCX_FileInvalid
;
+ return
errno_pcx
;
*pixmap = (Pixmap)bitmap;
*pixmap_mask = (Pixmap)bitmap;
*pixmap = (Pixmap)bitmap;
*pixmap_mask = (Pixmap)bitmap;