#define ANIM_VERTICAL (1 << 11)
#define ANIM_CENTERED (1 << 12)
#define ANIM_STATIC_PANEL (1 << 13)
-#define ANIM_FADE (1 << 14)
-#define ANIM_CROSSFADE (1 << 15)
#define ANIM_DEFAULT ANIM_LOOP
+/* values for fade mode */
+#define FADE_TYPE_NONE 0
+#define FADE_TYPE_FADE_IN (1 << 0)
+#define FADE_TYPE_FADE_OUT (1 << 1)
+#define FADE_TYPE_TRANSFORM (1 << 2)
+#define FADE_TYPE_CROSSFADE (1 << 3)
+#define FADE_TYPE_MELT (1 << 4)
+#define FADE_TYPE_SKIP (1 << 5)
+
+#define FADE_MODE_NONE (FADE_TYPE_NONE)
+#define FADE_MODE_FADE_IN (FADE_TYPE_FADE_IN)
+#define FADE_MODE_FADE_OUT (FADE_TYPE_FADE_OUT)
+#define FADE_MODE_FADE (FADE_TYPE_FADE_IN | FADE_TYPE_FADE_OUT)
+#define FADE_MODE_TRANSFORM (FADE_TYPE_TRANSFORM | FADE_TYPE_FADE_IN)
+#define FADE_MODE_CROSSFADE (FADE_MODE_TRANSFORM | FADE_TYPE_CROSSFADE)
+#define FADE_MODE_MELT (FADE_MODE_TRANSFORM | FADE_TYPE_MELT)
+#define FADE_MODE_SKIP_FADE_IN (FADE_TYPE_SKIP | FADE_TYPE_FADE_IN)
+#define FADE_MODE_SKIP_FADE_OUT (FADE_TYPE_SKIP | FADE_TYPE_FADE_OUT)
+
+#define FADE_MODE_DEFAULT FADE_MODE_FADE
+
/* values for text alignment */
#define ALIGN_LEFT (1 << 0)
#define ALIGN_RIGHT (1 << 1)
#define ALIGN_CENTER (1 << 2)
-
#define ALIGN_DEFAULT ALIGN_LEFT
-#define ALIGNED_XPOS(x,w,a) ((a) == ALIGN_CENTER ? (x) - (w) / 2 : \
- (a) == ALIGN_RIGHT ? (x) - (w) : (x))
-#define ALIGNED_MENU_XPOS(p) ALIGNED_XPOS((p)->x, (p)->width, (p)->align)
-#define ALIGNED_MENU_YPOS(p) ((p)->y)
+#define VALIGN_TOP (1 << 0)
+#define VALIGN_BOTTOM (1 << 1)
+#define VALIGN_MIDDLE (1 << 2)
+#define VALIGN_DEFAULT VALIGN_TOP
+
+#define ALIGNED_XPOS(x,w,a) ((a) == ALIGN_CENTER ? (x) - (w) / 2 : \
+ (a) == ALIGN_RIGHT ? (x) - (w) : (x))
+#define ALIGNED_YPOS(y,h,v) ((v) == VALIGN_MIDDLE ? (y) - (h) / 2 : \
+ (v) == VALIGN_BOTTOM ? (y) - (h) : (y))
+#define ALIGNED_TEXT_XPOS(p) ALIGNED_XPOS((p)->x, (p)->width, (p)->align)
+#define ALIGNED_TEXT_YPOS(p) ALIGNED_YPOS((p)->y, (p)->height, (p)->valign)
/* values for redraw_mask */
#define REDRAW_NONE (0)
#define REDRAW_FPS (1 << 11)
#define REDRAWTILES_THRESHOLD (SCR_FIELDX * SCR_FIELDY / 2)
-#define FADE_MODE_FADE_IN 0
-#define FADE_MODE_FADE_OUT 1
-#define FADE_MODE_CROSSFADE 2
-
#define IN_GFX_SCREEN(x, y) (x >= gfx.sx && x < gfx.sx + gfx.sxsize && \
y >= gfx.sy && y < gfx.sy + gfx.sysize)
#define IN_GFX_DOOR(x, y) (x >= gfx.dx && x < gfx.dx + gfx.dxsize && \
/* values for mouse cursor */
#define CURSOR_DEFAULT 0
-#define CURSOR_PLAYFIELD 1
+#define CURSOR_NONE 1
+#define CURSOR_PLAYFIELD 2
/* fundamental game speed values */
#define ONE_SECOND_DELAY 1000 /* delay value for one second */
#define MUS_CLASSIC_SUBDIR "mus_orig"
#endif
+#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
+#define GFX_DEFAULT_SUBDIR "jue0"
+#define SND_DEFAULT_SUBDIR "jue0"
+#define MUS_DEFAULT_SUBDIR "jue0"
+#else
+#define GFX_DEFAULT_SUBDIR GFX_CLASSIC_SUBDIR
+#define SND_DEFAULT_SUBDIR SND_CLASSIC_SUBDIR
+#define MUS_DEFAULT_SUBDIR MUS_CLASSIC_SUBDIR
+#endif
+
+#if defined(CREATE_SPECIAL_EDITION)
+#define GFX_FALLBACK_FILENAME "fallback.pcx"
+#define SND_FALLBACK_FILENAME "fallback.wav"
+#define MUS_FALLBACK_FILENAME "fallback.wav"
+#endif
+
/* file names and filename extensions */
#if !defined(PLATFORM_MSDOS)
#define LEVELSETUP_DIRECTORY "levelsetup"
(setup).override_level_sounds : \
(setup).override_level_music)
+#define GFX_OVERRIDE_ARTWORK(type) \
+ ((type) == ARTWORK_TYPE_GRAPHICS ? \
+ gfx.override_level_graphics : \
+ (type) == ARTWORK_TYPE_SOUNDS ? \
+ gfx.override_level_sounds : \
+ gfx.override_level_music)
+
#define ARTWORK_FIRST_NODE(artwork, type) \
((type) == ARTWORK_TYPE_GRAPHICS ? \
(artwork).gfx_first : \
(type) == ARTWORK_TYPE_MUSIC ? \
options.music_directory : "")
+#define UPDATE_BUSY_STATE() \
+{ \
+ if (gfx.draw_busy_anim_function != NULL) \
+ gfx.draw_busy_anim_function(); \
+}
+
/* type definitions */
typedef int (*EventFilter)(const Event *);
boolean network;
boolean verbose;
boolean debug;
+ boolean debug_x11_sync;
};
struct ScreenModeInfo
Bitmap *background_bitmap;
int background_bitmap_mask;
+ boolean override_level_graphics;
+ boolean override_level_sounds;
+ boolean override_level_music;
+
+ boolean draw_init_text;
+
int num_fonts;
struct FontBitmapInfo *font_bitmap_info;
int (*select_font_function)(int);
+ int (*get_font_from_token_function)(char *);
int anim_random_frame;
+
+ void (*draw_busy_anim_function)(void);
};
struct JoystickInfo
struct SetupSystemInfo
{
+ char *sdl_videodriver;
char *sdl_audiodriver;
int audio_fragment_size;
};
boolean sound_music;
boolean sound_simple;
boolean toons;
- boolean double_buffering;
- boolean direct_draw; /* !double_buffering (redundant!) */
boolean scroll_delay;
+ boolean scroll_delay_value;
boolean soft_scrolling;
boolean fade_screens;
boolean autorecord;
boolean quick_switch;
boolean input_on_focus;
boolean prefer_aga_graphics;
+ int game_frame_delay;
char *graphics_set;
char *sounds_set;
char *music_set;
- boolean override_level_graphics;
- boolean override_level_sounds;
- boolean override_level_music;
+ int override_level_graphics; /* not boolean -- can also be "AUTO" */
+ int override_level_sounds; /* not boolean -- can also be "AUTO" */
+ int override_level_music; /* not boolean -- can also be "AUTO" */
struct SetupEditorInfo editor;
struct SetupEditorCascadeInfo editor_cascade;
char *name; /* tree info name, as displayed in selection menues */
char *name_sorting; /* optional sorting name for correct name sorting */
char *author; /* level or artwork author name */
+ char *year; /* optional year of creation for levels or artwork */
char *imported_from; /* optional comment for imported levels or artwork */
char *imported_by; /* optional comment for imported levels or artwork */
+ char *tested_by; /* optional comment to name people who tested a set */
char *graphics_set_ecs; /* special EMC custom graphics set (ECS graphics) */
char *graphics_set_aga; /* special EMC custom graphics set (AGA graphics) */
boolean redefined;
boolean fallback_to_default;
+ boolean default_is_cloned;
};
struct SetupFileList
int width, height;
};
-#if 1
struct MenuPosInfo
{
int x, y;
int width, height;
- int align;
+ int align, valign;
};
struct TextPosInfo
{
int x, y;
int width, height;
- int align;
- int chars;
+ int align, valign;
+ int size;
+ int font, font_alt;
+ boolean draw_masked;
+ int sort_priority;
+ int id;
};
-#endif
/* ========================================================================= */
void InitGfxDoor1Info(int, int, int, int);
void InitGfxDoor2Info(int, int, int, int);
void InitGfxScrollbufferInfo(int, int);
+void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void));
+void InitGfxCustomArtworkInfo();
void SetDrawDeactivationMask(int);
void SetDrawBackgroundMask(int);
void SetWindowBackgroundBitmap(Bitmap *);