projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140103-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
msdos.c
diff --git
a/src/libgame/msdos.c
b/src/libgame/msdos.c
index 02c6a96e34ffd97ea7e88a2a3eb9d25b97fa9764..c4c6ff4f4cceca78a66b418d0a00ed3ba78eff67 100644
(file)
--- a/
src/libgame/msdos.c
+++ b/
src/libgame/msdos.c
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
2
Artsoft Entertainment *
+* (c) 1994-200
6
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-329,8
+329,8
@@
Display *XOpenDisplay(char *display_name)
Window XCreateSimpleWindow(Display *display, Window parent, int x, int y,
unsigned int width, unsigned int height,
Window XCreateSimpleWindow(Display *display, Window parent, int x, int y,
unsigned int width, unsigned int height,
- unsigned int border_width, unsigned
long
border,
- unsigned
long
background)
+ unsigned int border_width, unsigned
int
border,
+ unsigned
int
background)
{
video_bitmap = create_video_bitmap(XRES, YRES);
clear_to_color(video_bitmap, background);
{
video_bitmap = create_video_bitmap(XRES, YRES);
clear_to_color(video_bitmap, background);
@@
-378,11
+378,10
@@
Status XStringListToTextProperty(char **list, int count,
void XFree(void *data)
{
void XFree(void *data)
{
- if (data)
- free(data);
+ checked_free(data);
}
}
-GC XCreateGC(Display *display, Drawable d, unsigned
long
value_mask,
+GC XCreateGC(Display *display, Drawable d, unsigned
int
value_mask,
XGCValues *values)
{
XGCValues *gcv;
XGCValues *values)
{
XGCValues *gcv;
@@
-441,7
+440,7
@@
Pixmap XCreatePixmap(Display *display, Drawable d, unsigned int width,
BITMAP *bitmap = NULL;
if (gfx_capabilities & GFX_HW_VRAM_BLIT &&
BITMAP *bitmap = NULL;
if (gfx_capabilities & GFX_HW_VRAM_BLIT &&
- width
== gfx.scrollbuffer_width && height == gfx.scrollbuffer_height)
+ width == gfx.scrollbuffer_width && height == gfx.scrollbuffer_height)
bitmap = create_video_bitmap(width, height);
if (bitmap == NULL)
bitmap = create_video_bitmap(width, height);
if (bitmap == NULL)
@@
-598,11
+597,9
@@
void XFreePixmap(Display *display, Pixmap pixmap)
void XFreeGC(Display *display, GC gc)
{
void XFreeGC(Display *display, GC gc)
{
- XGCValues *gcv;
+ XGCValues *gcv
= (XGCValues *)gc
;
- gcv = (XGCValues *)gc;
- if (gcv)
- free(gcv);
+ checked_free(gcv);
}
void XUnmapWindow(Display *display, Window window)
}
void XUnmapWindow(Display *display, Window window)
@@
-616,11
+613,8
@@
void XCloseDisplay(Display *display)
if (is_screen_bitmap(bitmap))
destroy_bitmap(bitmap);
if (is_screen_bitmap(bitmap))
destroy_bitmap(bitmap);
- if (display->screens)
- free(display->screens);
-
- if (display)
- free(display);
+ checked_free(display->screens);
+ checked_free(display);
/* return to text mode (or DOS box on Windows screen) */
set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
/* return to text mode (or DOS box on Windows screen) */
set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
@@
-817,7
+811,7
@@
int XLookupString(XKeyEvent *key_event, char *buffer, int buffer_size,
return 0;
}
return 0;
}
-void XSetForeground(Display *display, GC gc, unsigned
long
pixel)
+void XSetForeground(Display *display, GC gc, unsigned
int
pixel)
{
XGCValues *gcv = (XGCValues *)gc;
{
XGCValues *gcv = (XGCValues *)gc;