#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"
static void InitNetworkServer(void);
static void InitSound(void);
static void InitSoundServer(void);
+static void InitDisplay(void);
static void InitGfx(void);
static void InitGfxBackground(void);
static void LoadGfx(int, struct PictureFileInfo *);
signal(SIGINT, CloseAllAndExit);
signal(SIGTERM, CloseAllAndExit);
- InitBufferedDisplay(&backbuffer, &window);
+ InitDisplay();
InitEventFilter(FilterMouseMotionEvents);
InitGfx();
{
int i;
- /* REMOVE THIS! (gone to system.c:InitAudio) */
- if (!sysinfo.audio_available)
- return;
-
-#if defined(TARGET_SDL)
- if (InitAudio())
- {
- sysinfo.audio_available = TRUE;
- sysinfo.audio_loops_available = TRUE;
- }
- else
- {
- sysinfo.audio_available = FALSE;
- }
-#else /* !TARGET_SDL */
-
-#if defined(PLATFORM_UNIX)
- if (!(sysinfo.audio_available = CheckAudio(sound_device_name)))
- return;
-
-#ifdef VOXWARE
- sysinfo.audio_loops_available = TRUE;
-#endif
-
-#else /* !PLATFORM_UNIX */
- sysinfo.audio_loops_available = TRUE;
-
-#endif /* !PLATFORM_UNIX */
-#endif /* !TARGET_SDL */
+ OpenAudio(&audio);
for(i=0; i<NUM_SOUNDS; i++)
{
if (!LoadSound(&Sound[i]))
{
- sysinfo.audio_available = FALSE;
- sysinfo.audio_loops_available = FALSE;
+ audio.sound_available = FALSE;
+ audio.loops_available = FALSE;
return;
}
}
void InitSoundServer()
{
- if (!sysinfo.audio_available)
+ if (!audio.sound_available)
return;
#if !defined(TARGET_SDL)
#if defined(PLATFORM_UNIX)
- if (pipe(sysinfo.audio_process_pipe) < 0)
+ if (pipe(audio.soundserver_pipe) < 0)
{
Error(ERR_WARN, "cannot create pipe - no sounds");
- sysinfo.audio_available = FALSE;
+ audio.sound_available = FALSE;
return;
}
- if ((sysinfo.audio_process_id = fork()) < 0)
+ if ((audio.soundserver_pid = fork()) < 0)
{
Error(ERR_WARN, "cannot create sound server process - no sounds");
- sysinfo.audio_available = FALSE;
+ audio.sound_available = FALSE;
return;
}
- if (!sysinfo.audio_process_id) /* we are child */
+ if (audio.soundserver_pid == 0) /* we are child */
{
SoundServer();
exit(0);
}
else /* we are parent */
- close(sysinfo.audio_process_pipe[0]); /* no reading from pipe needed */
+ close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
#else /* !PLATFORM_UNIX */
#endif /* !TARGET_SDL */
}
+void InitDisplay()
+{
+ char *gfx_dir = getPath2(options.ro_base_directory, GRAPHICS_DIRECTORY);
+ char *x11_icon_filename = getPath2(gfx_dir, X11_ICON_FILENAME);
+ char *x11_iconmask_filename = getPath2(gfx_dir, X11_ICONMASK_FILENAME);
+ char *msdos_pointer_filename = getPath2(gfx_dir, MSDOS_POINTER_FILENAME);
+
+ free(gfx_dir);
+
+ InitProgramInfo(program_name, PROGRAM_TITLE_STRING, WINDOW_TITLE_STRING,
+ ICON_TITLE_STRING, x11_icon_filename, x11_iconmask_filename,
+ msdos_pointer_filename);
+
+ InitVideoDisplay();
+ InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH,
+ setup.fullscreen);
+}
+
void InitGfx()
{
int i, j;
{ -1, 0 }
};
+ /* initialize playfield properties */
+
+ InitPlayfieldInfo(SX, SY, SXSIZE, SYSIZE,
+ REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+ InitDoor1Info(DX, DY, DXSIZE, DYSIZE);
+ InitDoor2Info(VX, VY, VXSIZE, VYSIZE);
+ InitScrollbufferInfo(FXSIZE, FYSIZE);
+
/* 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);
#if defined(PLATFORM_MSDOS)
if (i != PIX_SMALLFONT)
LoadGfx(i,&pic[i]);
+ InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]);
+
/* create additional image buffers for masking of graphics */
#if defined(TARGET_SDL)
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);
}
}
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);
}
}
{
int x, y;
- drawto = backbuffer = pix[PIX_DB_BACK];
+ drawto = backbuffer;
fieldbuffer = pix[PIX_DB_FIELD];
SetDrawtoField(DRAW_BACKBUFFER);
rest(100);
#endif
+ pix[pos] = CreateBitmapStruct();
+
#if defined(TARGET_SDL)
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
#else /* !TARGET_SDL */
- 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 (!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
#endif /* !TARGET_SDL */
}
#if defined(TARGET_X11)
/* check if clip mask was correctly created */
- if (pic->picture_with_mask && !clipmask[pos])
+ if (pic->picture_with_mask && !pix[pos]->clip_mask)
Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename);
#endif
}
StopSounds();
FreeSounds(NUM_SOUNDS);
#else
- if (sysinfo.audio_process_id)
+ if (audio.soundserver_pid)
{
StopSounds();
- kill(sysinfo.audio_process_id, SIGTERM);
+ kill(audio.soundserver_pid, SIGTERM);
FreeSounds(NUM_SOUNDS);
}
#endif
for(i=0; i<NUM_BITMAPS; i++)
- {
- if (pix[i])
- FreeBitmap(pix[i]);
-
-#if defined(TARGET_SDL)
- FreeBitmap(pix_masked[i]);
-#else
- if (clipmask[i])
- FreeBitmap(clipmask[i]);
- if (clip_gc[i])
- XFreeGC(display, clip_gc[i]);
-#endif
- }
+ FreeBitmap(pix[i]);
#if defined(TARGET_SDL)
KeyboardAutoRepeatOn();
#else
+
+#if 0
if (gc)
XFreeGC(display, gc);
+#endif
if (display)
{