X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=8eb5d9ab99e8eceb795a11521214400540a9e044;hb=479bba3c31872d0bf11756a6380988bf787ce5ef;hp=b932605be9231608c91c29988182081c232b1645;hpb=3683bbbe90156d2a9ab32de08099e094a446e5f8;p=rocksndiamonds.git diff --git a/src/libgame/system.h b/src/libgame/system.h index b932605b..8eb5d9ab 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -17,7 +17,12 @@ #include "platform.h" #include "types.h" -#if defined(PLATFORM_MSDOS) + +#if defined(PLATFORM_MACOSX) +#include "macosx.h" +#elif defined(PLATFORM_WIN32) +#include "windows.h" +#elif defined(PLATFORM_MSDOS) #include "msdos.h" #endif @@ -27,79 +32,160 @@ #include "x11.h" #endif -#if defined(PLATFORM_MACOSX) -/* some symbols are already defined on Mac OS X */ -#define Delay Delay_internal -#define DrawLine DrawLine_internal -#define DrawText DrawText_internal -#define GetPixel GetPixel_internal -#endif - /* the additional 'b' is needed for Win32 to open files in binary mode */ -#define MODE_READ "rb" -#define MODE_WRITE "wb" -#define MODE_APPEND "ab" +#define MODE_READ "rb" +#define MODE_WRITE "wb" +#define MODE_APPEND "ab" + +#define DEFAULT_DEPTH 0 -#define DEFAULT_DEPTH 0 +#define BLIT_OPAQUE 0 +#define BLIT_MASKED 1 +#define BLIT_INVERSE 2 +#define BLIT_ON_BACKGROUND 3 -#define FULLSCREEN_NOT_AVAILABLE FALSE -#define FULLSCREEN_AVAILABLE TRUE +#define FULLSCREEN_NOT_AVAILABLE FALSE +#define FULLSCREEN_AVAILABLE TRUE /* default input keys */ -#define DEFAULT_KEY_LEFT KSYM_Left -#define DEFAULT_KEY_RIGHT KSYM_Right -#define DEFAULT_KEY_UP KSYM_Up -#define DEFAULT_KEY_DOWN KSYM_Down +#define DEFAULT_KEY_LEFT KSYM_Left +#define DEFAULT_KEY_RIGHT KSYM_Right +#define DEFAULT_KEY_UP KSYM_Up +#define DEFAULT_KEY_DOWN KSYM_Down #if defined(PLATFORM_MACOSX) -#define DEFAULT_KEY_SNAP KSYM_Control_L -#define DEFAULT_KEY_BOMB KSYM_KP_Enter +#define DEFAULT_KEY_SNAP KSYM_Control_L +#define DEFAULT_KEY_DROP KSYM_KP_Enter #else -#define DEFAULT_KEY_SNAP KSYM_Shift_L -#define DEFAULT_KEY_BOMB KSYM_Shift_R +#define DEFAULT_KEY_SNAP KSYM_Control_L +#define DEFAULT_KEY_DROP KSYM_Control_R #endif -#define DEFAULT_KEY_OKAY KSYM_Return -#define DEFAULT_KEY_CANCEL KSYM_Escape +#define DEFAULT_KEY_OKAY KSYM_Return +#define DEFAULT_KEY_CANCEL KSYM_Escape /* default shortcut keys */ -#define DEFAULT_KEY_SAVE_GAME KSYM_F1 -#define DEFAULT_KEY_LOAD_GAME KSYM_F2 -#define DEFAULT_KEY_TOGGLE_PAUSE KSYM_space - -/* values for move directions and special "button" keys */ -#define MV_BIT_LEFT 0 -#define MV_BIT_RIGHT 1 -#define MV_BIT_UP 2 -#define MV_BIT_DOWN 3 -#define NUM_DIRECTIONS 4 - -#define MV_NO_MOVING 0 +#define DEFAULT_KEY_SAVE_GAME KSYM_F1 +#define DEFAULT_KEY_LOAD_GAME KSYM_F2 +#define DEFAULT_KEY_TOGGLE_PAUSE KSYM_space +#define DEFAULT_KEY_FOCUS_PLAYER_1 KSYM_F5 +#define DEFAULT_KEY_FOCUS_PLAYER_2 KSYM_F6 +#define DEFAULT_KEY_FOCUS_PLAYER_3 KSYM_F7 +#define DEFAULT_KEY_FOCUS_PLAYER_4 KSYM_F8 +#define DEFAULT_KEY_FOCUS_PLAYER_ALL KSYM_F9 + +/* values for key_status */ +#define KEY_NOT_PRESSED FALSE +#define KEY_RELEASED FALSE +#define KEY_PRESSED TRUE + +/* values for button status */ +#define MB_NOT_PRESSED FALSE +#define MB_NOT_RELEASED TRUE +#define MB_RELEASED FALSE +#define MB_PRESSED TRUE +#define MB_MENU_CHOICE FALSE +#define MB_MENU_MARK TRUE +#define MB_MENU_INITIALIZE (-1) +#define MB_MENU_LEAVE (-2) +#define MB_LEFTBUTTON 1 +#define MB_MIDDLEBUTTON 2 +#define MB_RIGHTBUTTON 3 + + +/* values for move directions */ +#define MV_BIT_LEFT 0 +#define MV_BIT_RIGHT 1 +#define MV_BIT_UP 2 +#define MV_BIT_DOWN 3 + +#define NUM_DIRECTIONS 4 + +/* diagonal movement directions are used in a different contect than buttons */ +#define MV_BIT_UPLEFT 4 +#define MV_BIT_UPRIGHT 5 +#define MV_BIT_DOWNLEFT 6 +#define MV_BIT_DOWNRIGHT 7 + +#define NUM_DIRECTIONS_FULL 8 + +/* values for special "button" bitmasks */ +#define BUTTON_1 4 +#define BUTTON_2 5 + +/* values for special "focus player" bitmasks */ +#define BIT_SET_FOCUS 6 + +/* values for move directions and special "button" key bitmasks */ +#define MV_NONE 0 #define MV_LEFT (1 << MV_BIT_LEFT) #define MV_RIGHT (1 << MV_BIT_RIGHT) #define MV_UP (1 << MV_BIT_UP) #define MV_DOWN (1 << MV_BIT_DOWN) -#define KEY_BUTTON_1 (1 << 4) -#define KEY_BUTTON_2 (1 << 5) + +#define MV_UPLEFT (MV_UP | MV_LEFT) +#define MV_UPRIGHT (MV_UP | MV_RIGHT) +#define MV_DOWNLEFT (MV_DOWN | MV_LEFT) +#define MV_DOWNRIGHT (MV_DOWN | MV_RIGHT) + +#define MV_HORIZONTAL (MV_LEFT | MV_RIGHT) +#define MV_VERTICAL (MV_UP | MV_DOWN) +#define MV_ALL_DIRECTIONS (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN) +#define MV_ANY_DIRECTION (MV_ALL_DIRECTIONS) +#define MV_NO_DIRECTION (MV_NONE) + +#define KEY_BUTTON_1 (1 << BUTTON_1) +#define KEY_BUTTON_2 (1 << BUTTON_2) #define KEY_MOTION (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN) #define KEY_BUTTON (KEY_BUTTON_1 | KEY_BUTTON_2) #define KEY_ACTION (KEY_MOTION | KEY_BUTTON) -#define MV_DIR_BIT(x) ((x) == MV_LEFT ? MV_BIT_LEFT : \ - (x) == MV_RIGHT ? MV_BIT_RIGHT : \ - (x) == MV_UP ? MV_BIT_UP : MV_BIT_DOWN) - -/* values for button status */ -#define MB_NOT_PRESSED FALSE -#define MB_NOT_RELEASED TRUE -#define MB_RELEASED FALSE -#define MB_PRESSED TRUE -#define MB_MENU_CHOICE FALSE -#define MB_MENU_MARK TRUE -#define MB_MENU_INITIALIZE (-1) -#define MB_MENU_LEAVE (-2) -#define MB_LEFTBUTTON 1 -#define MB_MIDDLEBUTTON 2 -#define MB_RIGHTBUTTON 3 +#define KEY_SET_FOCUS (1 << BIT_SET_FOCUS) + +#define MV_DIR_FROM_BIT(x) ((x) < NUM_DIRECTIONS ? 1 << (x) : \ + (x) == MV_BIT_UPLEFT ? MV_UPLEFT : \ + (x) == MV_BIT_UPRIGHT ? MV_UPRIGHT : \ + (x) == MV_BIT_DOWNLEFT ? MV_DOWNLEFT : \ + (x) == MV_BIT_DOWNRIGHT ? MV_DOWNRIGHT : \ + MV_NONE) + +#define MV_DIR_TO_BIT(x) ((x) == MV_LEFT ? MV_BIT_LEFT : \ + (x) == MV_RIGHT ? MV_BIT_RIGHT : \ + (x) == MV_UP ? MV_BIT_UP : \ + (x) == MV_DOWN ? MV_BIT_DOWN : \ + (x) == MV_UPLEFT ? MV_BIT_UPLEFT : \ + (x) == MV_UPRIGHT ? MV_BIT_UPRIGHT : \ + (x) == MV_DOWNLEFT ? MV_BIT_DOWNLEFT : \ + (x) == MV_DOWNRIGHT ? MV_BIT_DOWNRIGHT : \ + MV_BIT_DOWN) + +#define MV_DIR_OPPOSITE(x) ((x) == MV_LEFT ? MV_RIGHT : \ + (x) == MV_RIGHT ? MV_LEFT : \ + (x) == MV_UP ? MV_DOWN : \ + (x) == MV_DOWN ? MV_UP : \ + (x) == MV_UPLEFT ? MV_DOWNRIGHT : \ + (x) == MV_UPRIGHT ? MV_DOWNLEFT : \ + (x) == MV_DOWNLEFT ? MV_UPRIGHT : \ + (x) == MV_DOWNRIGHT ? MV_UPLEFT : \ + MV_NONE) + +/* values for animation mode (frame order and direction) */ +#define ANIM_NONE 0 +#define ANIM_LOOP (1 << 0) +#define ANIM_LINEAR (1 << 1) +#define ANIM_PINGPONG (1 << 2) +#define ANIM_PINGPONG2 (1 << 3) +#define ANIM_RANDOM (1 << 4) +#define ANIM_CE_VALUE (1 << 5) +#define ANIM_CE_SCORE (1 << 6) +#define ANIM_REVERSE (1 << 7) +#define ANIM_OPAQUE_PLAYER (1 << 8) + +/* values for special (non game element) animation modes */ +#define ANIM_HORIZONTAL (1 << 9) +#define ANIM_VERTICAL (1 << 10) +#define ANIM_STATIC_PANEL (1 << 11) + +#define ANIM_DEFAULT ANIM_LOOP /* values for redraw_mask */ #define REDRAW_NONE (0) @@ -126,6 +212,27 @@ #define REDRAW_FPS (1 << 11) #define REDRAWTILES_THRESHOLD (SCR_FIELDX * SCR_FIELDY / 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 && \ + y >= gfx.dy && y < gfx.dy + gfx.dysize) +#define IN_GFX_VIDEO(x, y) (x >= gfx.vx && x < gfx.vx + gfx.vxsize && \ + y >= gfx.vy && y < gfx.vy + gfx.vysize) + +/* values for mouse cursor */ +#define CURSOR_DEFAULT 0 +#define CURSOR_PLAYFIELD 1 + +/* fundamental game speed values */ +#define ONE_SECOND_DELAY 1000 /* delay value for one second */ +#define GAME_FRAME_DELAY 20 /* frame delay in milliseconds */ +#define FFWD_FRAME_DELAY 10 /* 200% speed for fast forward */ +#define FRAMES_PER_SECOND (ONE_SECOND_DELAY / GAME_FRAME_DELAY) + +/* maximum playfield size supported by libgame functions */ +#define MAX_PLAYFIELD_WIDTH 128 +#define MAX_PLAYFIELD_HEIGHT 128 + /* maximum number of parallel players supported by libgame functions */ #define MAX_PLAYERS 4 @@ -138,6 +245,9 @@ /* default name for unknown player names */ #define ANONYMOUS_NAME "anonymous" +/* default for other unknown names */ +#define UNKNOWN_NAME "unknown" + /* default name for new levels */ #define NAMELESS_LEVEL_NAME "nameless level" @@ -147,6 +257,9 @@ /* default value for undefined filename */ #define UNDEFINED_FILENAME "[NONE]" +/* default value for undefined parameter */ +#define ARG_DEFAULT "[DEFAULT]" + /* default values for undefined configuration file parameters */ #define ARG_UNDEFINED "-1000000" #define ARG_UNDEFINED_VALUE (atoi(ARG_UNDEFINED)) @@ -163,23 +276,59 @@ #define RO_BASE_PATH RO_GAME_DIR #define RW_BASE_PATH RW_GAME_DIR +/* directory names */ #define GRAPHICS_DIRECTORY "graphics" #define SOUNDS_DIRECTORY "sounds" #define MUSIC_DIRECTORY "music" #define LEVELS_DIRECTORY "levels" #define TAPES_DIRECTORY "tapes" #define SCORES_DIRECTORY "scores" +#define DOCS_DIRECTORY "docs" #if !defined(PLATFORM_MSDOS) -#define GRAPHICS_SUBDIR "gfx_classic" -#define SOUNDS_SUBDIR "snd_classic" -#define MUSIC_SUBDIR "mus_classic" +#define GFX_CLASSIC_SUBDIR "gfx_classic" +#define SND_CLASSIC_SUBDIR "snd_classic" +#define MUS_CLASSIC_SUBDIR "mus_classic" #else -#define GRAPHICS_SUBDIR "gfx_orig" -#define SOUNDS_SUBDIR "snd_orig" -#define MUSIC_SUBDIR "mus_orig" +#define GFX_CLASSIC_SUBDIR "gfx_orig" +#define SND_CLASSIC_SUBDIR "snd_orig" +#define MUS_CLASSIC_SUBDIR "mus_orig" #endif +/* file names and filename extensions */ +#if !defined(PLATFORM_MSDOS) +#define LEVELSETUP_DIRECTORY "levelsetup" +#define SETUP_FILENAME "setup.conf" +#define LEVELSETUP_FILENAME "levelsetup.conf" +#define EDITORSETUP_FILENAME "editorsetup.conf" +#define EDITORCASCADE_FILENAME "editorcascade.conf" +#define HELPANIM_FILENAME "helpanim.conf" +#define HELPTEXT_FILENAME "helptext.conf" +#define LEVELINFO_FILENAME "levelinfo.conf" +#define GRAPHICSINFO_FILENAME "graphicsinfo.conf" +#define SOUNDSINFO_FILENAME "soundsinfo.conf" +#define MUSICINFO_FILENAME "musicinfo.conf" +#define LEVELFILE_EXTENSION "level" +#define TAPEFILE_EXTENSION "tape" +#define SCOREFILE_EXTENSION "score" +#else +#define LEVELSETUP_DIRECTORY "lvlsetup" +#define SETUP_FILENAME "setup.cnf" +#define LEVELSETUP_FILENAME "lvlsetup.cnf" +#define EDITORSETUP_FILENAME "edsetup.cnf" +#define EDITORCASCADE_FILENAME "edcascad.conf" +#define HELPANIM_FILENAME "helpanim.cnf" +#define HELPTEXT_FILENAME "helptext.cnf" +#define LEVELINFO_FILENAME "lvlinfo.cnf" +#define GRAPHICSINFO_FILENAME "gfxinfo.cnf" +#define SOUNDSINFO_FILENAME "sndinfo.cnf" +#define MUSICINFO_FILENAME "musinfo.cnf" +#define LEVELFILE_EXTENSION "lvl" +#define TAPEFILE_EXTENSION "tap" +#define SCOREFILE_EXTENSION "sco" +#endif + + /* areas in bitmap PIX_DOOR */ /* meaning in PIX_DB_DOOR: (3 PAGEs) PAGEX1: 1. buffer for DOOR_1 @@ -187,7 +336,11 @@ PAGEX3: buffer for animations */ -#define DOOR_GFX_PAGESIZE (gfx.dxsize) +/* these values are hard-coded to be able to use them in initialization */ +#define DOOR_GFX_PAGE_WIDTH 100 /* should be set to "gfx.dxsize" */ +#define DOOR_GFX_PAGE_HEIGHT 280 /* should be set to "gfx.dysize" */ + +#define DOOR_GFX_PAGESIZE (DOOR_GFX_PAGE_WIDTH) #define DOOR_GFX_PAGEX1 (0 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEX2 (1 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEX3 (2 * DOOR_GFX_PAGESIZE) @@ -197,17 +350,134 @@ #define DOOR_GFX_PAGEX7 (6 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEX8 (7 * DOOR_GFX_PAGESIZE) #define DOOR_GFX_PAGEY1 (0) -#define DOOR_GFX_PAGEY2 (gfx.dysize) +#define DOOR_GFX_PAGEY2 (DOOR_GFX_PAGE_HEIGHT) -/* functions for version handling */ -#define VERSION_IDENT(x,y,z) ((x) * 10000 + (y) * 100 + (z)) -#define VERSION_MAJOR(x) ((x) / 10000) -#define VERSION_MINOR(x) (((x) % 10000) / 100) -#define VERSION_PATCH(x) ((x) % 100) -/* functions for parent/child process identification */ -#define IS_PARENT_PROCESS(pid) ((pid) > 0 || (pid) == -1) -#define IS_CHILD_PROCESS(pid) ((pid) == 0) +/* macros for version handling */ +#define VERSION_MAJOR(x) ((x) / 1000000) +#define VERSION_MINOR(x) (((x) % 1000000) / 10000) +#define VERSION_PATCH(x) (((x) % 10000) / 100) +#define VERSION_BUILD(x) ((x) % 100) +#define VERSION_IDENT(a,b,c,d) ((a) * 1000000 + (b) * 10000 + (c) * 100 + (d)) + + +/* macros for parent/child process identification */ +#if defined(PLATFORM_UNIX) +#define IS_PARENT_PROCESS() (audio.mixer_pid != getpid()) +#define IS_CHILD_PROCESS() (audio.mixer_pid == getpid()) +#define HAS_CHILD_PROCESS() (audio.mixer_pid > 0) +#else +#define IS_PARENT_PROCESS() TRUE +#define IS_CHILD_PROCESS() FALSE +#define HAS_CHILD_PROCESS() FALSE +#endif + + +/* values for artwork type */ +#define ARTWORK_TYPE_GRAPHICS 0 +#define ARTWORK_TYPE_SOUNDS 1 +#define ARTWORK_TYPE_MUSIC 2 + +#define NUM_ARTWORK_TYPES 3 + + +/* values for tree type (chosen to match artwork type) */ +#define TREE_TYPE_UNDEFINED -1 +#define TREE_TYPE_GRAPHICS_DIR ARTWORK_TYPE_GRAPHICS +#define TREE_TYPE_SOUNDS_DIR ARTWORK_TYPE_SOUNDS +#define TREE_TYPE_MUSIC_DIR ARTWORK_TYPE_MUSIC +#define TREE_TYPE_LEVEL_DIR 3 + +#define NUM_TREE_TYPES 4 + + +/* values for artwork handling */ +#define LEVELDIR_ARTWORK_SET_PTR(leveldir, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + &(leveldir)->graphics_set : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + &(leveldir)->sounds_set : \ + &(leveldir)->music_set) + +#define LEVELDIR_ARTWORK_SET(leveldir, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + (leveldir)->graphics_set : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + (leveldir)->sounds_set : \ + (leveldir)->music_set) + +#define LEVELDIR_ARTWORK_PATH_PTR(leveldir, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + &(leveldir)->graphics_path : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + &(leveldir)->sounds_path : \ + &(leveldir)->music_path) + +#define LEVELDIR_ARTWORK_PATH(leveldir, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + (leveldir)->graphics_path : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + (leveldir)->sounds_path : \ + (leveldir)->music_path) + +#define SETUP_ARTWORK_SET(setup, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + (setup).graphics_set : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + (setup).sounds_set : \ + (setup).music_set) + +#define SETUP_OVERRIDE_ARTWORK(setup, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + (setup).override_level_graphics : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + (setup).override_level_sounds : \ + (setup).override_level_music) + +#define ARTWORK_FIRST_NODE(artwork, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + (artwork).gfx_first : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + (artwork).snd_first : \ + (artwork).mus_first) + +#define ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + &(artwork).gfx_current_identifier : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + &(artwork).snd_current_identifier : \ + &(artwork).mus_current_identifier) + +#define ARTWORK_CURRENT_IDENTIFIER(artwork, type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + (artwork).gfx_current_identifier : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + (artwork).snd_current_identifier : \ + (artwork).mus_current_identifier) + +#define ARTWORKINFO_FILENAME(type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + GRAPHICSINFO_FILENAME : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + SOUNDSINFO_FILENAME : \ + (type) == ARTWORK_TYPE_MUSIC ? \ + MUSICINFO_FILENAME : "") + +#define ARTWORK_DIRECTORY(type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + GRAPHICS_DIRECTORY : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + SOUNDS_DIRECTORY : \ + (type) == ARTWORK_TYPE_MUSIC ? \ + MUSIC_DIRECTORY : "") + +#define OPTIONS_ARTWORK_DIRECTORY(type) \ + ((type) == ARTWORK_TYPE_GRAPHICS ? \ + options.graphics_directory : \ + (type) == ARTWORK_TYPE_SOUNDS ? \ + options.sounds_directory : \ + (type) == ARTWORK_TYPE_MUSIC ? \ + options.music_directory : "") /* type definitions */ @@ -218,8 +488,9 @@ typedef int (*EventFilter)(const Event *); struct ProgramInfo { - char *command_basename; - char *userdata_directory; + char *command_basepath; /* directory that contains the program */ + char *command_basename; /* base filename of the program binary */ + char *userdata_directory; /* personal user data directory */ char *program_title; char *window_title; @@ -227,7 +498,7 @@ struct ProgramInfo char *x11_icon_filename; char *x11_iconmask_filename; - char *msdos_pointer_filename; + char *msdos_cursor_filename; char *cookie_prefix; char *filename_prefix; /* prefix to cut off from DOS filenames */ @@ -251,6 +522,7 @@ struct OptionInfo char *graphics_directory; char *sounds_directory; char *music_directory; + char *docs_directory; char *execute_command; boolean serveronly; @@ -286,6 +558,24 @@ struct AudioSystemInfo int first_sound_channel; }; +struct FontBitmapInfo +{ + Bitmap *bitmap; + + int src_x, src_y; /* start position of animation frames */ + int width, height; /* width/height of each animation frame */ + + int draw_xoffset; /* offset for drawing font characters */ + int draw_yoffset; /* offset for drawing font characters */ + + int num_chars; + int num_chars_per_line; + +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + Pixmap *clip_mask; /* single-char-only clip mask array for X11 */ +#endif +}; + struct GfxInfo { int sx, sy; @@ -303,17 +593,16 @@ struct GfxInfo int draw_deactivation_mask; int draw_background_mask; + Bitmap *field_save_buffer; + Bitmap *background_bitmap; int background_bitmap_mask; -}; -struct FontInfo -{ - Bitmap *bitmap_initial; - Bitmap *bitmap_big; - Bitmap *bitmap_medium; - Bitmap *bitmap_small; - Bitmap *bitmap_tile; + int num_fonts; + struct FontBitmapInfo *font_bitmap_info; + int (*select_font_function)(int); + + int anim_random_frame; }; struct JoystickInfo @@ -328,18 +617,13 @@ struct SetupJoystickInfo int xleft, xmiddle, xright; int yupper, ymiddle, ylower; - int snap; - int bomb; + int snap, drop; }; struct SetupKeyboardInfo { - Key left; - Key right; - Key up; - Key down; - Key snap; - Key bomb; + Key left, right, up, down; + Key snap, drop; }; struct SetupInputInfo @@ -353,6 +637,7 @@ struct SetupEditorInfo { boolean el_boulderdash; boolean el_emerald_mine; + boolean el_emerald_mine_club; boolean el_more; boolean el_sokoban; boolean el_supaplex; @@ -360,6 +645,27 @@ struct SetupEditorInfo boolean el_dx_boulderdash; boolean el_chars; boolean el_custom; + boolean el_user_defined; + boolean el_dynamic; + + boolean el_headlines; +}; + +struct SetupEditorCascadeInfo +{ + boolean el_bd; + boolean el_em; + boolean el_emc; + boolean el_rnd; + boolean el_sb; + boolean el_sp; + boolean el_dc; + boolean el_dx; + boolean el_chars; + boolean el_ce; + boolean el_ge; + boolean el_user; + boolean el_dynamic; }; struct SetupShortcutInfo @@ -367,6 +673,15 @@ struct SetupShortcutInfo Key save_game; Key load_game; Key toggle_pause; + + Key focus_player[MAX_PLAYERS]; + Key focus_player_all; +}; + +struct SetupSystemInfo +{ + char *sdl_audiodriver; + int audio_fragment_size; }; struct SetupInfo @@ -387,9 +702,14 @@ struct SetupInfo boolean quick_doors; boolean team_mode; boolean handicap; + boolean skip_levels; boolean time_limit; boolean fullscreen; boolean ask_on_escape; + boolean ask_on_escape_editor; + boolean quick_switch; + boolean input_on_focus; + boolean prefer_aga_graphics; char *graphics_set; char *sounds_set; @@ -399,20 +719,13 @@ struct SetupInfo boolean override_level_music; struct SetupEditorInfo editor; + struct SetupEditorCascadeInfo editor_cascade; struct SetupShortcutInfo shortcut; struct SetupInputInfo input[MAX_PLAYERS]; + struct SetupSystemInfo system; + struct OptionInfo options; }; -#define TREE_TYPE_GENERIC 0 -#define TREE_TYPE_GRAPHICS_DIR 1 -#define TREE_TYPE_SOUNDS_DIR 2 -#define TREE_TYPE_MUSIC_DIR 3 -#define TREE_TYPE_LEVEL_DIR 4 - -#define ARTWORK_TYPE_GRAPHICS TREE_TYPE_GRAPHICS_DIR -#define ARTWORK_TYPE_SOUNDS TREE_TYPE_SOUNDS_DIR -#define ARTWORK_TYPE_MUSIC TREE_TYPE_MUSIC_DIR - struct TreeInfo { struct TreeInfo **node_top; /* topmost node in tree */ @@ -427,7 +740,7 @@ struct TreeInfo /* fields for "type == TREE_TYPE_LEVEL_DIR" */ - char *filename; /* tree info sub-directory basename (may be ".") */ + char *subdir; /* tree info sub-directory basename (may be ".") */ char *fullpath; /* complete path relative to tree base directory */ char *basepath; /* absolute base path of tree base directory */ char *identifier; /* identifier string for configuration files */ @@ -435,7 +748,10 @@ struct TreeInfo char *name_sorting; /* optional sorting name for correct name sorting */ char *author; /* level or artwork author name */ char *imported_from; /* optional comment for imported levels or artwork */ + char *imported_by; /* optional comment for imported levels or artwork */ + char *graphics_set_ecs; /* special EMC custom graphics set (ECS graphics) */ + char *graphics_set_aga; /* special EMC custom graphics set (AGA graphics) */ char *graphics_set; /* optional custom graphics set (level tree only) */ char *sounds_set; /* optional custom sounds set (level tree only) */ char *music_set; /* optional custom music set (level tree only) */ @@ -443,15 +759,23 @@ struct TreeInfo char *sounds_path; /* path to optional custom sounds set (level only) */ char *music_path; /* path to optional custom music set (level only) */ + char *level_filename; /* filename of level file (for packed level file) */ + char *level_filetype; /* type of levels in level directory or level file */ + int levels; /* number of levels in level series */ int first_level; /* first level number (to allow start with 0 or 1) */ int last_level; /* last level number (automatically calculated) */ int sort_priority; /* sort levels by 'sort_priority' and then by name */ + boolean latest_engine;/* force level set to use the latest game engine */ + boolean level_group; /* directory contains more level series directories */ boolean parent_link; /* entry links back to parent directory */ - boolean user_defined; /* user defined levels are stored in home directory */ + boolean in_user_dir; /* user defined levels are stored in home directory */ + boolean user_defined; /* levels in user directory and marked as "private" */ boolean readonly; /* readonly levels can not be changed with editor */ + boolean handicap; /* level set has no handicap when set to "false" */ + boolean skip_levels; /* levels can be skipped when set to "true" */ int color; /* color to use on selection screen for this level */ char *class_desc; /* description of level series class */ @@ -479,13 +803,31 @@ struct ArtworkInfo char *mus_current_identifier; }; +struct ValueTextInfo +{ + int value; + char *text; +}; + struct ConfigInfo +{ + char *token; + char *value; +}; + +struct ConfigTypeInfo { char *token; char *value; int type; }; +struct TokenIntPtrInfo +{ + char *token; + int *value; +}; + struct FileInfo { char *token; @@ -493,8 +835,11 @@ struct FileInfo char *default_filename; char *filename; - int *default_parameter; /* array of file parameters */ - int *parameter; /* array of file parameters */ + char **default_parameter; /* array of file parameters */ + char **parameter; /* array of file parameters */ + + boolean redefined; + boolean fallback_to_default; }; struct SetupFileList @@ -511,27 +856,42 @@ struct ListNodeInfo int num_references; }; +struct PropertyMapping +{ + int base_index; + int ext1_index; + int ext2_index; + int ext3_index; + + int artwork_index; +}; + struct ArtworkListInfo { int type; /* type of artwork */ int num_file_list_entries; int num_dynamic_file_list_entries; - - int num_suffix_list_entries; - struct FileInfo *file_list; /* static artwork file array */ struct FileInfo *dynamic_file_list; /* dynamic artwrk file array */ - struct ConfigInfo *suffix_list; /* parameter suffixes array */ + int num_suffix_list_entries; + struct ConfigTypeInfo *suffix_list; /* parameter suffixes array */ int num_base_prefixes; int num_ext1_suffixes; int num_ext2_suffixes; - + int num_ext3_suffixes; char **base_prefixes; /* base token prefixes array */ char **ext1_suffixes; /* property suffixes array 1 */ char **ext2_suffixes; /* property suffixes array 2 */ + char **ext3_suffixes; /* property suffixes array 3 */ + + int num_ignore_tokens; + char **ignore_tokens; /* file tokens to be ignored */ + + int num_property_mapping_entries; + struct PropertyMapping *property_mapping; /* mapping token -> artwork */ int sizeof_artwork_list_entry; @@ -553,11 +913,12 @@ extern struct OptionInfo options; extern struct VideoSystemInfo video; extern struct AudioSystemInfo audio; extern struct GfxInfo gfx; -extern struct FontInfo font; +extern struct AnimInfo anim; extern struct ArtworkInfo artwork; extern struct JoystickInfo joystick; extern struct SetupInfo setup; +extern LevelDirTree *leveldir_first_all; extern LevelDirTree *leveldir_first; extern LevelDirTree *leveldir_current; extern int level_nr; @@ -582,15 +943,14 @@ extern int FrameCounter; /* function definitions */ -void InitCommandName(char *); -void InitExitFunction(void (*exit_function)(int)); -void InitPlatformDependantStuff(void); -void ClosePlatformDependantStuff(void); - void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *, - char *, char *, int); + char *, char *, char *, int); + +void InitExitFunction(void (*exit_function)(int)); +void InitPlatformDependentStuff(void); +void ClosePlatformDependentStuff(void); -void InitGfxFieldInfo(int, int, int, int, int, int, int, int); +void InitGfxFieldInfo(int, int, int, int, int, int, int, int, Bitmap *); void InitGfxDoor1Info(int, int, int, int); void InitGfxDoor2Info(int, int, int, int); void InitGfxScrollbufferInfo(int, int); @@ -606,6 +966,7 @@ inline Bitmap *CreateBitmapStruct(void); inline Bitmap *CreateBitmap(int, int, int); inline void FreeBitmap(Bitmap *); inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int); +inline void FillRectangle(Bitmap *, int, int, int, int, Pixel); inline void ClearRectangle(Bitmap *, int, int, int, int); inline void ClearRectangleOnBackground(Bitmap *, int, int, int, int); inline void SetClipMask(Bitmap *, GC, Pixmap); @@ -614,6 +975,7 @@ inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int); inline boolean DrawingOnBackground(int, int); inline void BlitBitmapOnBackground(Bitmap *, Bitmap *, int, int, int, int, int, int); +inline void DrawSimpleBlackLine(Bitmap *, int, int, int, int); inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int); inline void DrawLines(Bitmap *, struct XY *, int, Pixel); inline Pixel GetPixel(Bitmap *, int, int); @@ -632,6 +994,11 @@ Bitmap *LoadImage(char *); Bitmap *LoadCustomImage(char *); void ReloadCustomImage(Bitmap *, char *); +Bitmap *ZoomBitmap(Bitmap *, int, int); +void CreateBitmapWithSmallBitmaps(Bitmap *, int); + +void SetMouseCursor(int); + inline void OpenAudio(void); inline void CloseAudio(void); inline void SetAudioMode(boolean); @@ -639,7 +1006,10 @@ inline void SetAudioMode(boolean); inline void InitEventFilter(EventFilter); inline boolean PendingEvent(void); inline void NextEvent(Event *event); +inline void PeekEvent(Event *event); inline Key GetEventKey(KeyEvent *, boolean); +inline KeyMod HandleKeyModState(Key, int); +inline KeyMod GetKeyModState(); inline boolean CheckCloseWindowEvent(ClientMessageEvent *); inline void InitJoysticks();