/* ========================================================================= */
void InitProgramInfo(char *argv0,
- char *userdata_directory, char *program_title,
- char *window_title, char *icon_title,
+ char *userdata_subdir, char *userdata_subdir_unix,
+ char *program_title, char *window_title, char *icon_title,
char *x11_icon_filename, char *x11_iconmask_filename,
char *msdos_cursor_filename,
char *cookie_prefix, char *filename_prefix,
program.command_basepath = getBasePath(argv0);
program.command_basename = getBaseName(argv0);
- program.userdata_directory = userdata_directory;
+ program.userdata_subdir = userdata_subdir;
+ program.userdata_subdir_unix = userdata_subdir_unix;
+ program.userdata_path = getUserGameDataDir();
+
program.program_title = program_title;
program.window_title = window_title;
program.icon_title = icon_title;
+
program.x11_icon_filename = x11_icon_filename;
program.x11_iconmask_filename = x11_iconmask_filename;
program.msdos_cursor_filename = msdos_cursor_filename;
program.version_major = VERSION_MAJOR(program_version);
program.version_minor = VERSION_MINOR(program_version);
program.version_patch = VERSION_PATCH(program_version);
+
+ program.error_filename = getErrorFilename(ERROR_BASENAME);
+ program.error_file = stderr;
}
void InitExitFunction(void (*exit_function)(int))
{
#if defined(PLATFORM_MSDOS)
_fmode = O_BINARY;
- initErrorFile();
+#endif
+
+#if defined(PLATFORM_MACOSX)
+ updateUserGameDataDir();
+#endif
+
+#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX)
+ openErrorFile();
#endif
#if defined(TARGET_SDL)
void ClosePlatformDependentStuff(void)
{
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
+ closeErrorFile();
+#endif
+
#if defined(PLATFORM_MSDOS)
dumpErrorFile();
#endif
video.depth = GetRealDepth(depth);
video.fullscreen_available = FULLSCREEN_STATUS;
video.fullscreen_enabled = FALSE;
+ video.fullscreen_modes = NULL;
#if defined(TARGET_SDL)
SDLInitVideoBuffer(backbuffer, window, fullscreen);
boolean create_small_bitmaps)
{
Bitmap swap_bitmap;
- Bitmap *new_bitmap, *tmp_bitmap_1, *tmp_bitmap_2, *tmp_bitmap_8;
- int width_1, height_1, width_2, height_2, width_8, height_8;
+ Bitmap *new_bitmap, *tmp_bitmap_1, *tmp_bitmap_2, *tmp_bitmap_4,*tmp_bitmap_8;
+ int width_1, height_1, width_2, height_2, width_4, height_4, width_8,height_8;
int new_width, new_height;
/* calculate new image dimensions for normal sized image */
else
tmp_bitmap_1 = old_bitmap;
+ /* this is only needed to make compilers happy */
+ tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = NULL;
+
if (create_small_bitmaps)
{
/* calculate new image dimensions for small images */
width_2 = width_1 / 2;
height_2 = height_1 / 2;
+ width_4 = width_1 / 4;
+ height_4 = height_1 / 4;
width_8 = width_1 / 8;
height_8 = height_1 / 8;
else
tmp_bitmap_2 = old_bitmap;
+ /* get image with 1/4 of normal size (for use in the level editor) */
+ if (zoom_factor != 4)
+ tmp_bitmap_4 = ZoomBitmap(tmp_bitmap_2, width_2 / 2, height_2 / 2);
+ else
+ tmp_bitmap_4 = old_bitmap;
+
/* get image with 1/8 of normal size (for use on the preview screen) */
if (zoom_factor != 8)
- tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_1, width_1 / 8, height_1 / 8);
+ tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_4 / 2, height_4 / 2);
else
tmp_bitmap_8 = old_bitmap;
}
BlitBitmap(tmp_bitmap_1, new_bitmap, 0, 0, width_1, height_1, 0, 0);
BlitBitmap(tmp_bitmap_2, new_bitmap, 0, 0, width_1 / 2, height_1 / 2,
0, height_1);
+ BlitBitmap(tmp_bitmap_4, new_bitmap, 0, 0, width_1 / 4, height_1 / 4,
+ width_1 / 2, height_1);
BlitBitmap(tmp_bitmap_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8,
3 * width_1 / 4, height_1);
}
if (zoom_factor != 2)
FreeBitmap(tmp_bitmap_2);
+ if (zoom_factor != 4)
+ FreeBitmap(tmp_bitmap_4);
+
if (zoom_factor != 8)
FreeBitmap(tmp_bitmap_8);
}
- /* replace image with extended image (containing normal, 1/2 and 1/8 size) */
+ /* replace image with extended image (containing 1/1, 1/2, 1/4, 1/8 size) */
#if defined(TARGET_SDL)
swap_bitmap.surface = old_bitmap->surface;
old_bitmap->surface = new_bitmap->surface;