#include <signal.h>
+#include "libgame/libgame.h"
+
#include "init.h"
#include "events.h"
-#include "misc.h"
-#include "sound.h"
#include "screens.h"
#include "editor.h"
#include "game.h"
#include "tools.h"
#include "files.h"
#include "joystick.h"
-#include "image.h"
-#include "pcx.h"
#include "network.h"
#include "netserv.h"
boolean picture_with_mask;
};
-#if 0
-struct IconFileInfo
-{
- char *picture_filename;
- char *picturemask_filename;
-};
-#endif
-
-#ifndef USE_SDL_LIBRARY
-static int sound_process_id = 0;
-#endif
-
static void InitPlayerInfo(void);
static void InitLevelInfo(void);
static void InitNetworkServer(void);
-#if 0
-static void InitDisplay(void);
-#endif
static void InitSound(void);
static void InitSoundServer(void);
-#if 0
-static void InitWindow(int, char **);
-#endif
+static void InitDisplay(void);
static void InitGfx(void);
static void InitGfxBackground(void);
static void LoadGfx(int, struct PictureFileInfo *);
static void InitGadgets(void);
static void InitElementProperties(void);
-void OpenAll(int argc, char *argv[])
+void OpenAll(void)
{
-#if defined(MSDOS) || defined(WIN32)
+#if !defined(PLATFORM_UNIX)
initErrorFile();
#endif
if (options.serveronly)
{
-#ifdef WIN32
- Error(ERR_WARN, "networking not supported in Windows version");
-#else
+#if defined(PLATFORM_UNIX)
NetworkServer(options.server_port, options.serveronly);
+#else
+ Error(ERR_WARN, "networking not supported in Windows version");
#endif
/* never reached */
exit(0);
}
+ InitProgramInfo(UNIX_USERDATA_DIRECTORY,
+ PROGRAM_TITLE_STRING, WINDOW_TITLE_STRING,
+ ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
+ MSDOS_POINTER_FILENAME);
+
InitPlayerInfo();
InitCounter();
signal(SIGINT, CloseAllAndExit);
signal(SIGTERM, CloseAllAndExit);
-
- InitBufferedDisplay(&backbuffer, &window);
- InitEventFilter(FilterMouseMotionEvents);
-
-
-
-#if 0
-
InitDisplay();
- InitWindow(argc, argv);
-
-#if 0
-#ifndef USE_SDL_LIBRARY
- XMapWindow(display, window);
- FlushDisplay();
-#endif
-#endif
-
-#endif
-
-
+ InitEventFilter(FilterMouseMotionEvents);
InitGfx();
InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
void InitNetworkServer()
{
-#if !defined(MSDOS) && !defined(WIN32)
+#if defined(PLATFORM_UNIX)
int nr_wanted;
#endif
if (!options.network)
return;
-#if !defined(MSDOS) && !defined(WIN32)
+#if defined(PLATFORM_UNIX)
nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
if (!ConnectToServer(options.server_host, options.server_port))
{
int i;
- if (sound_status == SOUND_OFF)
- return;
-
-#ifdef USE_SDL_LIBRARY
- /* initialize SDL audio */
-
- if (SDL_Init(SDL_INIT_AUDIO) < 0)
- {
- Error(ERR_WARN, "SDL_Init() failed: %s", SDL_GetError());
- sound_status = SOUND_OFF;
- return;
- }
-
- if (Mix_OpenAudio(22050, AUDIO_S16, 2, 512) < 0)
- {
- Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError());
- sound_status = SOUND_OFF;
- return;
- }
-
- Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4);
- Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4);
-
- sound_status = SOUND_AVAILABLE;
- sound_loops_allowed = TRUE;
-
-#else /* !USE_SDL_LIBRARY */
-
-#if !defined(MSDOS) && !defined(WIN32)
- if (access(sound_device_name, W_OK) != 0)
- {
- Error(ERR_WARN, "cannot access sound device - no sounds");
- sound_status = SOUND_OFF;
- return;
- }
-
- if ((sound_device = OpenAudio(sound_device_name)) < 0)
- {
- Error(ERR_WARN, "cannot open sound device - no sounds");
- sound_status = SOUND_OFF;
- return;
- }
-
- close(sound_device);
- sound_status = SOUND_AVAILABLE;
-
-#ifdef VOXWARE
- sound_loops_allowed = TRUE;
-
- /*
- setup.sound_loops_on = TRUE;
- */
-
-#endif
-#else /* MSDOS || WIN32 */
- sound_loops_allowed = TRUE;
-
- /*
- setup.sound_loops_on = TRUE;
- */
-
-#endif /* MSDOS || WIN32 */
-#endif /* !USE_SDL_LIBRARY */
+ OpenAudio(&audio);
for(i=0; i<NUM_SOUNDS; i++)
{
if (!LoadSound(&Sound[i]))
{
- sound_status = SOUND_OFF;
- sound_loops_allowed = FALSE;
+ audio.sound_available = FALSE;
+ audio.loops_available = FALSE;
return;
}
}
-
-#if 0
- sound_status = SOUND_OFF;
-#endif
-
}
void InitSoundServer()
{
- if (sound_status == SOUND_OFF)
+ if (!audio.sound_available)
return;
-#ifndef USE_SDL_LIBRARY
+#if !defined(TARGET_SDL)
+#if defined(PLATFORM_UNIX)
-#if !defined(MSDOS) && !defined(WIN32)
-
- if (pipe(sound_pipe)<0)
+ if (pipe(audio.soundserver_pipe) < 0)
{
Error(ERR_WARN, "cannot create pipe - no sounds");
- sound_status = SOUND_OFF;
+ audio.sound_available = FALSE;
return;
}
- if ((sound_process_id = fork()) < 0)
+ if ((audio.soundserver_pid = fork()) < 0)
{
Error(ERR_WARN, "cannot create sound server process - no sounds");
- sound_status = SOUND_OFF;
+ audio.sound_available = FALSE;
return;
}
- if (!sound_process_id) /* we are child */
+ if (audio.soundserver_pid == 0) /* we are child */
{
SoundServer();
/* never reached */
exit(0);
}
- else /* we are parent */
- close(sound_pipe[0]); /* no reading from pipe needed */
+ else /* we are parent */
+ close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
-#else /* MSDOS || WIN32 */
+#else /* !PLATFORM_UNIX */
SoundServer();
-#endif /* MSDOS */
-
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !PLATFORM_UNIX */
+#endif /* !TARGET_SDL */
}
void InitJoysticks()
{
-#ifdef USE_SDL_JOYSTICK
+#if defined(TARGET_SDL)
static boolean sdl_joystick_subsystem_initialized = FALSE;
#endif
joystick_status = JOYSTICK_OFF;
-#ifdef USE_SDL_JOYSTICK
+#if defined(TARGET_SDL)
if (!sdl_joystick_subsystem_initialized)
{
joystick_status = JOYSTICK_AVAILABLE;
}
-#else /* !USE_SDL_JOYSTICK */
+#else /* !TARGET_SDL */
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
for (i=0; i<MAX_PLAYERS; i++)
{
char *device_name = setup.input[i].joy.device_name;
joystick_status = JOYSTICK_AVAILABLE;
}
-#else /* MSDOS */
+#else /* !PLATFORM_UNIX */
/* try to access two joysticks; if that fails, try to access just one */
if (install_joystick(JOY_TYPE_2PADS) == 0 ||
}
#endif
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !TARGET_SDL */
}
-
-
-#if 0
-
void InitDisplay()
{
-#ifdef USE_SDL_LIBRARY
- /* initialize SDL video */
- if (SDL_Init(SDL_INIT_VIDEO) < 0)
- Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
-
- /* automatically cleanup SDL stuff after exit() */
- atexit(SDL_Quit);
-
-#else /* !USE_SDL_LIBRARY */
-
-#ifndef MSDOS
- XVisualInfo vinfo_template, *vinfo;
- int num_visuals;
-#endif
- unsigned int depth;
-
- /* connect to X server */
- if (!(display = XOpenDisplay(options.display_name)))
- Error(ERR_EXIT, "cannot connect to X server %s",
- XDisplayName(options.display_name));
-
- screen = DefaultScreen(display);
- visual = DefaultVisual(display, screen);
- depth = DefaultDepth(display, screen);
- cmap = DefaultColormap(display, screen);
-
-#ifndef MSDOS
- /* look for good enough visual */
- vinfo_template.screen = screen;
- vinfo_template.class = (depth == 8 ? PseudoColor : TrueColor);
- vinfo_template.depth = depth;
- if ((vinfo = XGetVisualInfo(display, VisualScreenMask | VisualClassMask |
- VisualDepthMask, &vinfo_template, &num_visuals)))
- {
- visual = vinfo->visual;
- XFree((void *)vinfo);
- }
-
- /* got appropriate visual? */
- if (depth < 8)
- {
- printf("Sorry, displays with less than 8 bits per pixel not supported.\n");
- exit(-1);
- }
- else if ((depth ==8 && visual->class != PseudoColor) ||
- (depth > 8 && visual->class != TrueColor &&
- visual->class != DirectColor))
- {
- printf("Sorry, cannot get appropriate visual.\n");
- exit(-1);
- }
-#endif /* !MSDOS */
-#endif /* !USE_SDL_LIBRARY */
+ InitVideoDisplay();
+ InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
+ setup.fullscreen);
}
-void InitWindow(int argc, char *argv[])
-{
-#ifdef USE_SDL_LIBRARY
- /* open SDL video output device (window or fullscreen mode) */
-#if 0
- if ((backbuffer = SDL_SetVideoMode(WIN_XSIZE, WIN_YSIZE, WIN_SDL_DEPTH,
- SDL_HWSURFACE))
- == NULL)
- Error(ERR_EXIT, "SDL_SetVideoMode() failed: %s", SDL_GetError());
-#else
- if (!SetVideoMode())
- Error(ERR_EXIT, "setting video mode failed");
-#endif
-
- /* set window and icon title */
- SDL_WM_SetCaption(WINDOW_TITLE_STRING, WINDOW_TITLE_STRING);
-
- /* set event filter to filter out certain mouse motion events */
- SDL_SetEventFilter(EventFilter);
-
-#else /* !USE_SDL_LIBRARY */
-
- unsigned int border_width = 4;
- XGCValues gc_values;
- unsigned long gc_valuemask;
-#ifndef MSDOS
- XTextProperty windowName, iconName;
- Pixmap icon_pixmap, iconmask_pixmap;
- unsigned int icon_width, icon_height;
- int icon_hot_x, icon_hot_y;
- char icon_filename[256];
- XSizeHints size_hints;
- XWMHints wm_hints;
- XClassHint class_hints;
- char *window_name = WINDOW_TITLE_STRING;
- char *icon_name = WINDOW_TITLE_STRING;
- long window_event_mask;
- Atom proto_atom = None, delete_atom = None;
-#endif
- int screen_width, screen_height;
- int win_xpos = WIN_XPOS, win_ypos = WIN_YPOS;
- unsigned long pen_fg = WhitePixel(display,screen);
- unsigned long pen_bg = BlackPixel(display,screen);
- const int width = WIN_XSIZE, height = WIN_YSIZE;
-
-#ifndef MSDOS
- static struct IconFileInfo icon_pic =
- {
- "rocks_icon.xbm",
- "rocks_iconmask.xbm"
- };
-#endif
-
- screen_width = XDisplayWidth(display, screen);
- screen_height = XDisplayHeight(display, screen);
-
- win_xpos = (screen_width - width) / 2;
- win_ypos = (screen_height - height) / 2;
-
- window = XCreateSimpleWindow(display, RootWindow(display, screen),
- win_xpos, win_ypos, width, height, border_width,
- pen_fg, pen_bg);
-
-#ifndef MSDOS
- proto_atom = XInternAtom(display, "WM_PROTOCOLS", FALSE);
- delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", FALSE);
- if ((proto_atom != None) && (delete_atom != None))
- XChangeProperty(display, window, proto_atom, XA_ATOM, 32,
- PropModePrepend, (unsigned char *) &delete_atom, 1);
-
- sprintf(icon_filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY,
- icon_pic.picture_filename);
- XReadBitmapFile(display,window,icon_filename,
- &icon_width,&icon_height,
- &icon_pixmap,&icon_hot_x,&icon_hot_y);
- if (!icon_pixmap)
- Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
- sprintf(icon_filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY,
- icon_pic.picturemask_filename);
- XReadBitmapFile(display,window,icon_filename,
- &icon_width,&icon_height,
- &iconmask_pixmap,&icon_hot_x,&icon_hot_y);
- if (!iconmask_pixmap)
- Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
-
- size_hints.width = size_hints.min_width = size_hints.max_width = width;
- size_hints.height = size_hints.min_height = size_hints.max_height = height;
- size_hints.flags = PSize | PMinSize | PMaxSize;
-
- if (win_xpos || win_ypos)
- {
- size_hints.x = win_xpos;
- size_hints.y = win_ypos;
- size_hints.flags |= PPosition;
- }
-
- if (!XStringListToTextProperty(&window_name, 1, &windowName))
- Error(ERR_EXIT, "structure allocation for windowName failed");
-
- if (!XStringListToTextProperty(&icon_name, 1, &iconName))
- Error(ERR_EXIT, "structure allocation for iconName failed");
-
- wm_hints.initial_state = NormalState;
- wm_hints.input = True;
- wm_hints.icon_pixmap = icon_pixmap;
- wm_hints.icon_mask = iconmask_pixmap;
- wm_hints.flags = StateHint | IconPixmapHint | IconMaskHint | InputHint;
-
- class_hints.res_name = program_name;
- class_hints.res_class = "Rocks'n'Diamonds";
-
- XSetWMProperties(display, window, &windowName, &iconName,
- argv, argc, &size_hints, &wm_hints,
- &class_hints);
-
- XFree(windowName.value);
- XFree(iconName.value);
-
- /* Select event types wanted */
- window_event_mask =
- ExposureMask | StructureNotifyMask | FocusChangeMask |
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
- PointerMotionHintMask | KeyPressMask | KeyReleaseMask;
-
- XSelectInput(display, window, window_event_mask);
-#endif
-
- /* create GC for drawing with window depth and background color (black) */
- gc_values.graphics_exposures = False;
- gc_values.foreground = pen_bg;
- gc_values.background = pen_bg;
- gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground;
- gc = XCreateGC(display, window, gc_valuemask, &gc_values);
-#endif /* !USE_SDL_LIBRARY */
-}
-
-#endif
-
-
-
void InitGfx()
{
- int i, j;
+ int i;
-#ifdef USE_SDL_LIBRARY
- SDL_Surface *sdl_image_tmp;
-#else
+#if defined(TARGET_X11)
GC copy_clipmask_gc;
XGCValues clip_gc_values;
unsigned long clip_gc_valuemask;
#endif
-#ifdef MSDOS
- static struct PictureFileInfo pic[NUM_PICTURES] =
- {
- { "Screen", TRUE },
- { "Door", TRUE },
- { "Heroes", TRUE },
- { "Toons", TRUE },
- { "SP", TRUE },
- { "DC", TRUE },
- { "More", TRUE },
- { "Font", FALSE },
- { "Font2", FALSE },
- { "Font3", FALSE }
- };
-#else
+#if !defined(PLATFORM_MSDOS)
static struct PictureFileInfo pic[NUM_PICTURES] =
{
{ "RocksScreen", TRUE },
{ "RocksFont2", FALSE },
{ "RocksFont3", FALSE }
};
-#endif
-
-#ifdef DEBUG
-#if 0
- static struct PictureFileInfo test_pic1 =
- {
- "RocksFont2",
- FALSE
- };
- static struct PictureFileInfo test_pic2 =
+#else
+ static struct PictureFileInfo pic[NUM_PICTURES] =
{
- "mouse",
- FALSE
- };
-#endif
+ { "Screen", TRUE },
+ { "Door", TRUE },
+ { "Heroes", TRUE },
+ { "Toons", TRUE },
+ { "SP", TRUE },
+ { "DC", TRUE },
+ { "More", TRUE },
+ { "Font", FALSE },
+ { "Font2", FALSE },
+ { "Font3", FALSE }
+ };
#endif
+#ifdef TARGET_X11
static struct
{
int start;
{ GFX2_SHIELD_ACTIVE, 3 },
{ -1, 0 }
};
-
- /* create additional image buffers for double-buffering */
-
-#if 0
- pix[PIX_DB_BACK] = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
-#endif
- pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
- pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
-
-
-
-#if 0
-
-#ifdef USE_SDL_LIBRARY
-
- /* SDL cannot directly draw to the visible video framebuffer like X11,
- but always uses a backbuffer, which is then blitted to the visible
- video framebuffer with 'SDL_UpdateRect' (or replaced with the current
- visible video framebuffer with 'SDL_Flip', if the hardware supports
- this). Therefore do not use an additional backbuffer for drawing, but
- use a symbolic buffer (distinguishable from the SDL backbuffer) called
- 'window', which indicates that the SDL backbuffer should be updated to
- the visible video framebuffer when attempting to blit to it.
-
- For convenience, it seems to be a good idea to create this symbolic
- buffer 'window' at the same size as the SDL backbuffer. Although it
- should never be drawn to directly, it would do no harm nevertheless. */
-
- window = pix[PIX_DB_BACK]; /* 'window' is only symbolic buffer */
- pix[PIX_DB_BACK] = backbuffer; /* 'backbuffer' is SDL screen buffer */
-
-#endif /* !USE_SDL_LIBRARY */
-
#endif
+ /* initialize some global variables */
+ global.frames_per_second = 0;
+ global.fps_slowdown = FALSE;
+ global.fps_slowdown_factor = 1;
+ /* initialize screen properties */
+ InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
+ REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+ InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
+ InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
+ InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
-#if DEBUG_TIMING
- debug_print_timestamp(0, NULL); /* initialize timestamp function */
-#endif
-
-#ifdef DEBUG
-#if 0
- printf("Test: Loading RocksFont2.pcx ...\n");
- LoadGfx(PIX_SMALLFONT,&test_pic1);
- printf("Test: Done.\n");
- printf("Test: Loading mouse.pcx ...\n");
- LoadGfx(PIX_SMALLFONT,&test_pic2);
- printf("Test: Done.\n");
-#endif
-#endif
+ /* create additional image buffers for double-buffering */
+ pix[PIX_DB_DOOR] = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH);
+ pix[PIX_DB_FIELD] = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH);
LoadGfx(PIX_SMALLFONT, &pic[PIX_SMALLFONT]);
+ InitFontInfo(NULL, NULL, pix[PIX_SMALLFONT]);
+
DrawInitText(WINDOW_TITLE_STRING, 20, FC_YELLOW);
DrawInitText(WINDOW_SUBTITLE_STRING, 50, FC_RED);
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
DrawInitText(PROGRAM_DOS_PORT_STRING, 210, FC_BLUE);
rest(200);
-#endif /* MSDOS */
+#endif
DrawInitText("Loading graphics:",120,FC_GREEN);
for(i=0; i<NUM_PICTURES; i++)
if (i != PIX_SMALLFONT)
LoadGfx(i,&pic[i]);
-#if DEBUG_TIMING
- debug_print_timestamp(0, "SUMMARY LOADING ALL GRAPHICS:");
-#endif
+ InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
/* create additional image buffers for masking of graphics */
-#ifdef USE_SDL_LIBRARY
+#if defined(TARGET_SDL)
+#if 0
/* initialize surface array to 'NULL' */
for(i=0; i<NUM_TILES; i++)
tile_masked[i] = NULL;
{
for(j=0; j<tile_needs_clipping[i].count; j++)
{
+ SDL_Surface *sdl_image_tmp;
int tile = tile_needs_clipping[i].start + j;
int graphic = tile;
int src_x, src_y;
Bitmap src_bitmap;
getGraphicSource(graphic, &bitmap_nr, &src_x, &src_y);
- src_bitmap = pix_masked[bitmap_nr];
+ src_bitmap = pix[bitmap_nr];
/* create surface for masked tile graphic */
if ((sdl_image_tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, TILEX, TILEY,
BlitBitmap(src_bitmap, tile_masked[tile], src_x,src_y, TILEX,TILEY, 0,0);
}
}
+#endif
-#else /* !USE_SDL_LIBRARY */
+#else /* !TARGET_SDL */
/* create graphic context structures needed for clipping */
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
copy_clipmask_gc =
- XCreateGC(display, clipmask[PIX_BACK], clip_gc_valuemask, &clip_gc_values);
+ XCreateGC(display, pix[PIX_BACK]->clip_mask,
+ clip_gc_valuemask, &clip_gc_values);
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
tile_clip_gc =
- XCreateGC(display, window, clip_gc_valuemask, &clip_gc_values);
+ XCreateGC(display, window->drawable, clip_gc_valuemask, &clip_gc_values);
for(i=0; i<NUM_BITMAPS; i++)
{
- if (clipmask[i])
+ if (pix[i]->clip_mask)
{
clip_gc_values.graphics_exposures = False;
- clip_gc_values.clip_mask = clipmask[i];
+ clip_gc_values.clip_mask = pix[i]->clip_mask;
clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
- clip_gc[i] = XCreateGC(display,window,clip_gc_valuemask,&clip_gc_values);
+ pix[i]->stored_clip_gc = XCreateGC(display, window->drawable,
+ clip_gc_valuemask,&clip_gc_values);
}
}
/* create only those clipping Pixmaps we really need */
for(i=0; tile_needs_clipping[i].start>=0; i++)
{
+ int j;
+
for(j=0; j<tile_needs_clipping[i].count; j++)
{
int tile = tile_needs_clipping[i].start + j;
Pixmap src_pixmap;
getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
- src_pixmap = clipmask[pixmap_nr];
+ src_pixmap = pix[pixmap_nr]->clip_mask;
- tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
+ tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
+ TILEX, TILEY, 1);
- XCopyArea(display,src_pixmap,tile_clipmask[tile],copy_clipmask_gc,
- src_x,src_y, TILEX,TILEY, 0,0);
+ XCopyArea(display, src_pixmap, tile_clipmask[tile], copy_clipmask_gc,
+ src_x, src_y, TILEX, TILEY, 0, 0);
}
}
-#endif /* !USE_SDL_LIBRARY */
+#endif /* !TARGET_SDL */
}
void InitGfxBackground()
{
int x, y;
- drawto = backbuffer = pix[PIX_DB_BACK];
+ drawto = backbuffer;
fieldbuffer = pix[PIX_DB_FIELD];
SetDrawtoField(DRAW_BACKBUFFER);
char basefilename[256];
char filename[256];
-#ifdef USE_XPM_LIBRARY
- int xpm_err, xbm_err;
- unsigned int width,height;
- int hot_x,hot_y;
- Pixmap shapemask;
- char *picture_ext = ".xpm";
- char *picturemask_ext = "Mask.xbm";
-#else
-
-#ifdef USE_SDL_LIBRARY
+#if defined(TARGET_SDL)
SDL_Surface *sdl_image_tmp;
-#else /* !USE_SDL_LIBRARY */
+#else
int pcx_err;
-#endif /* !USE_SDL_LIBRARY */
+#endif
char *picture_ext = ".pcx";
-#endif /* !USE_XPM_LIBRARY */
-
/* Grafik laden */
if (pic->picture_filename)
{
sprintf(filename, "%s/%s/%s",
options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
rest(100);
-#endif /* MSDOS */
-
-#if DEBUG_TIMING
- debug_print_timestamp(1, NULL); /* initialize timestamp function */
#endif
-#ifdef USE_SDL_LIBRARY
+ pix[pos] = CreateBitmapStruct();
+
+#if defined(TARGET_SDL)
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
/* create native non-transparent surface for current image */
- if ((pix[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ if ((pix[pos]->surface = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
/* create native transparent surface for current image */
SDL_SetColorKey(sdl_image_tmp, SDL_SRCCOLORKEY,
SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
- if ((pix_masked[pos] = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
+ if ((pix[pos]->surface_masked = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
/* free temporary surface */
SDL_FreeSurface(sdl_image_tmp);
-#else /* !USE_SDL_LIBRARY */
-
-#ifdef USE_XPM_LIBRARY
-
- xpm_att[pos].valuemask = XpmCloseness;
- xpm_att[pos].closeness = 20000;
- xpm_err = XpmReadFileToPixmap(display,window,filename,
- &pix[pos],&shapemask,&xpm_att[pos]);
- switch(xpm_err)
- {
- case XpmOpenFailed:
- Error(ERR_EXIT, "cannot open XPM file '%s'", filename);
- case XpmFileInvalid:
- Error(ERR_EXIT, "invalid XPM file '%s'", filename);
- case XpmNoMemory:
- Error(ERR_EXIT, "not enough memory for XPM file '%s'", filename);
- case XpmColorFailed:
- Error(ERR_EXIT, "cannot get colors for XPM file '%s'", filename);
- default:
- break;
- }
+#else /* !TARGET_SDL */
-#if DEBUG_TIMING
- printf("LOADING XPM FILE %s:", filename);
- debug_print_timestamp(1, "");
-#endif
-
-#else /* !USE_XPM_LIBRARY */
-
- pcx_err = Read_PCX_to_Pixmap(display, window, gc, filename,
- &pix[pos], &clipmask[pos]);
+ pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc,
+ filename,
+ &pix[pos]->drawable, &pix[pos]->clip_mask);
switch(pcx_err)
{
case PCX_Success:
break;
}
-#if DEBUG_TIMING
- printf("SUMMARY LOADING PCX FILE %s:", filename);
- debug_print_timestamp(1, "");
-#endif
-
-#endif /* !USE_XPM_LIBRARY */
-
- if (!pix[pos])
+ if (!pix[pos]->drawable)
Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename);
+#if 0
/* setting pix_masked[] to pix[] allows BlitBitmapMasked() to always
use pix_masked[], although they are the same when not using SDL */
pix_masked[pos] = pix[pos];
-
-#endif /* !USE_SDL_LIBRARY */
- }
-
-#ifndef USE_SDL_LIBRARY
- /* zugehörige Maske laden (wenn vorhanden) */
- if (pic->picture_with_mask)
- {
-#ifdef USE_XPM_LIBRARY
-
- sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext);
- DrawInitText(basefilename, 150, FC_YELLOW);
- sprintf(filename, "%s/%s/%s",
- options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
-
-#if DEBUG_TIMING
- debug_print_timestamp(1, NULL); /* initialize timestamp function */
#endif
- xbm_err = XReadBitmapFile(display,window,filename,
- &width,&height,&clipmask[pos],&hot_x,&hot_y);
- switch(xbm_err)
- {
- case BitmapSuccess:
- break;
- case BitmapOpenFailed:
- Error(ERR_EXIT, "cannot open XBM file '%s'", filename);
- case BitmapFileInvalid:
- Error(ERR_EXIT, "invalid XBM file '%s'", filename);
- case BitmapNoMemory:
- Error(ERR_EXIT, "not enough memory for XBM file '%s'", filename);
- break;
- default:
- break;
- }
+#endif /* !TARGET_SDL */
+ }
-#if DEBUG_TIMING
- printf("LOADING XBM FILE %s:", filename);
- debug_print_timestamp(1, "");
+#if defined(TARGET_X11)
+ /* check if clip mask was correctly created */
+ if (pic->picture_with_mask && !pix[pos]->clip_mask)
+ Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
#endif
-
-#endif /* USE_XPM_LIBRARY */
-
- if (!clipmask[pos])
- Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
- }
-#endif /* !USE_SDL_LIBRARY */
}
void InitGadgets()
{
int i;
-#ifdef USE_SDL_LIBRARY
+#if defined(TARGET_SDL)
StopSounds();
FreeSounds(NUM_SOUNDS);
#else
- if (sound_process_id)
+ if (audio.soundserver_pid)
{
StopSounds();
- kill(sound_process_id, SIGTERM);
+ kill(audio.soundserver_pid, SIGTERM);
FreeSounds(NUM_SOUNDS);
}
#endif
for(i=0; i<NUM_BITMAPS; i++)
- {
- if (pix[i])
- {
-#ifdef USE_XPM_LIBRARY
- if (i < NUM_PICTURES) /* XPM pictures */
- {
- XFreeColors(display,DefaultColormap(display,screen),
- xpm_att[i].pixels,xpm_att[i].npixels,0);
- XpmFreeAttributes(&xpm_att[i]);
- }
-#endif
-
-#ifdef USE_SDL_LIBRARY
- SDL_FreeSurface(pix[i]);
-#else
- XFreePixmap(display,pix[i]);
-#endif
- }
+ FreeBitmap(pix[i]);
-#ifdef USE_SDL_LIBRARY
- SDL_FreeSurface(pix_masked[i]);
-#else
- if (clipmask[i])
- XFreePixmap(display,clipmask[i]);
- if (clip_gc[i])
- XFreeGC(display, clip_gc[i]);
-#endif
- }
-
-#ifdef USE_SDL_LIBRARY
+#if defined(TARGET_SDL)
KeyboardAutoRepeatOn();
#else
+
+#if 0
if (gc)
XFreeGC(display, gc);
+#endif
if (display)
{
}
#endif
-#if defined(MSDOS) || defined(WIN32)
+#if !defined(PLATFORM_UNIX)
dumpErrorFile();
#endif