struct VideoSystemInfo video;
struct AudioSystemInfo audio;
struct GfxInfo gfx;
+struct ArtworkInfo artwork;
struct JoystickInfo joystick;
struct SetupInfo setup;
char *window_title, char *icon_title,
char *x11_icon_basename, char *x11_iconmask_basename,
char *msdos_pointer_basename,
- char *cookie_prefix, int program_version)
+ char *cookie_prefix, char *filename_prefix,
+ int program_version)
{
char *x11_icon_filename =
getPath2(options.graphics_directory, x11_icon_basename);
program.x11_icon_filename = x11_icon_filename;
program.x11_iconmask_filename = x11_iconmask_filename;
program.msdos_pointer_filename = msdos_pointer_filename;
+
program.cookie_prefix = cookie_prefix;
+ program.filename_prefix = filename_prefix;
+
program.version_major = VERSION_MAJOR(program_version);
program.version_minor = VERSION_MINOR(program_version);
program.version_patch = VERSION_PATCH(program_version);
XFreeGC(display, bitmap->stored_clip_gc);
#endif
+ if (bitmap->source_filename)
+ free(bitmap->source_filename);
+
free(bitmap);
}
return fullscreen;
}
-Bitmap *LoadImage(char *basename)
+Bitmap *LoadImage(char *filename)
{
Bitmap *new_bitmap;
- char *filename = getPath2(options.graphics_directory, basename);
#if defined(TARGET_SDL)
new_bitmap = SDLLoadImage(filename);
new_bitmap = X11LoadImage(filename);
#endif
- free(filename);
+ return new_bitmap;
+}
+
+Bitmap *LoadCustomImage(char *basename)
+{
+ char *filename = getStringCopy(getCustomImageFilename(basename));
+ Bitmap *new_bitmap;
+
+ if ((new_bitmap = LoadImage(filename)) == NULL)
+ Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
+
+ new_bitmap->source_filename = filename;
return new_bitmap;
}