X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=2ca0021fb6d224ad9bbe5a7466fef9d1304daea2;hp=406a6f364672ec6d241d0259328999d78eccd0a6;hb=4a1cf573aae3a92b4ca910482d425e8b789b32eb;hpb=5bdc30d016416d04eec826a28321325d4ddc66c2 diff --git a/src/libgame/system.h b/src/libgame/system.h index 406a6f36..2ca0021f 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -321,45 +321,20 @@ #define STYLE_NONE 0 #define STYLE_ACCURATE_BORDERS (1 << 0) #define STYLE_INNER_CORNERS (1 << 1) +#define STYLE_REVERSE (1 << 2) #define STYLE_DEFAULT STYLE_NONE +/* values for special global animation events */ #define ANIM_EVENT_NONE 0 -#define ANIM_EVENT_CLICK_ANIM_1 (1 << 0) -#define ANIM_EVENT_CLICK_ANIM_2 (1 << 1) -#define ANIM_EVENT_CLICK_ANIM_3 (1 << 2) -#define ANIM_EVENT_CLICK_ANIM_4 (1 << 3) -#define ANIM_EVENT_CLICK_ANIM_5 (1 << 4) -#define ANIM_EVENT_CLICK_ANIM_6 (1 << 5) -#define ANIM_EVENT_CLICK_ANIM_7 (1 << 6) -#define ANIM_EVENT_CLICK_ANIM_8 (1 << 7) -#define ANIM_EVENT_CLICK_PART_1 (1 << 8) -#define ANIM_EVENT_CLICK_PART_2 (1 << 9) -#define ANIM_EVENT_CLICK_PART_3 (1 << 10) -#define ANIM_EVENT_CLICK_PART_4 (1 << 11) -#define ANIM_EVENT_CLICK_PART_5 (1 << 12) -#define ANIM_EVENT_CLICK_PART_6 (1 << 13) -#define ANIM_EVENT_CLICK_PART_7 (1 << 14) -#define ANIM_EVENT_CLICK_PART_8 (1 << 15) -#define ANIM_EVENT_CLICK_SELF (1 << 16) - -#define ANIM_EVENT_CLICK_ANIM_ALL (ANIM_EVENT_CLICK_ANIM_1 | \ - ANIM_EVENT_CLICK_ANIM_2 | \ - ANIM_EVENT_CLICK_ANIM_3 | \ - ANIM_EVENT_CLICK_ANIM_4 | \ - ANIM_EVENT_CLICK_ANIM_5 | \ - ANIM_EVENT_CLICK_ANIM_6 | \ - ANIM_EVENT_CLICK_ANIM_7 | \ - ANIM_EVENT_CLICK_ANIM_8) - -#define ANIM_EVENT_CLICK_PART_ALL (ANIM_EVENT_CLICK_PART_1 | \ - ANIM_EVENT_CLICK_PART_2 | \ - ANIM_EVENT_CLICK_PART_3 | \ - ANIM_EVENT_CLICK_PART_4 | \ - ANIM_EVENT_CLICK_PART_5 | \ - ANIM_EVENT_CLICK_PART_6 | \ - ANIM_EVENT_CLICK_PART_7 | \ - ANIM_EVENT_CLICK_PART_8) +#define ANIM_EVENT_SELF (1 << 16) +#define ANIM_EVENT_ANY (1 << 17) + +#define ANIM_EVENT_ANIM_BIT 0 +#define ANIM_EVENT_PART_BIT 8 + +#define ANIM_EVENT_ANIM_MASK (0xff << ANIM_EVENT_ANIM_BIT) +#define ANIM_EVENT_PART_MASK (0xff << ANIM_EVENT_PART_BIT) #define ANIM_EVENT_DEFAULT ANIM_EVENT_NONE @@ -396,6 +371,7 @@ #define POS_LOWER 5 #define POS_BOTTOM 6 #define POS_ANY 7 +#define POS_LAST 8 /* values for text alignment */ #define ALIGN_LEFT (1 << 0) @@ -467,6 +443,10 @@ /* maximum number of levels in a level set */ #define MAX_LEVELS 1000 +/* maximum number of global animation and parts */ +#define MAX_GLOBAL_ANIMS 32 +#define MAX_GLOBAL_ANIM_PARTS 32 + /* default name for empty highscore entry */ #define EMPTY_PLAYER_NAME "no name" @@ -519,6 +499,7 @@ #define SCORES_DIRECTORY "scores" #define DOCS_DIRECTORY "docs" #define CACHE_DIRECTORY "cache" +#define CONF_DIRECTORY "conf" #define GFX_CLASSIC_SUBDIR "gfx_classic" #define SND_CLASSIC_SUBDIR "snd_classic" @@ -537,6 +518,7 @@ /* file names and filename extensions */ #define LEVELSETUP_DIRECTORY "levelsetup" #define SETUP_FILENAME "setup.conf" +#define AUTOSETUP_FILENAME "autosetup.conf" #define LEVELSETUP_FILENAME "levelsetup.conf" #define EDITORSETUP_FILENAME "editorsetup.conf" #define EDITORCASCADE_FILENAME "editorcascade.conf" @@ -552,6 +534,8 @@ #define TAPEFILE_EXTENSION "tape" #define SCOREFILE_EXTENSION "score" +#define GAMECONTROLLER_BASENAME "gamecontrollerdb.txt" + #define LOG_OUT_BASENAME "stdout.txt" #define LOG_ERR_BASENAME "stderr.txt" @@ -797,6 +781,8 @@ struct ProgramInfo int version_build; int version_ident; + char *version_string; + char *(*window_title_function)(void); void (*exit_message_function)(char *, va_list); void (*exit_function)(int); @@ -819,6 +805,7 @@ struct OptionInfo char *sounds_directory; char *music_directory; char *docs_directory; + char *conf_directory; char *execute_command; @@ -960,13 +947,14 @@ struct GfxInfo struct OverlayInfo { - boolean active; + boolean enabled; /* overlay generally enabled or disabled */ + boolean active; /* overlay activated (depending on game mode) */ }; struct JoystickInfo { int status; - int fd[MAX_PLAYERS]; /* file descriptor of player's joystick */ + int nr[MAX_PLAYERS]; /* joystick number for each player */ }; struct SetupJoystickInfo @@ -1008,6 +996,10 @@ struct SetupEditorInfo boolean el_supaplex; boolean el_diamond_caves; boolean el_dx_boulderdash; + + boolean el_mirror_magic; + boolean el_deflektor; + boolean el_chars; boolean el_steel_chars; @@ -1026,6 +1018,11 @@ struct SetupEditorInfo boolean use_template_for_new_levels; }; +struct SetupAutoSetupInfo +{ + int editor_zoom_tilesize; +}; + struct SetupEditorCascadeInfo { boolean el_bd; @@ -1036,6 +1033,8 @@ struct SetupEditorCascadeInfo boolean el_sp; boolean el_dc; boolean el_dx; + boolean el_mm; + boolean el_df; boolean el_chars; boolean el_steel_chars; boolean el_ce; @@ -1081,6 +1080,7 @@ struct SetupSystemInfo struct SetupInternalInfo { char *program_title; + char *program_version; char *program_author; char *program_email; char *program_website; @@ -1103,6 +1103,7 @@ struct SetupInternalInfo int default_window_height; boolean choose_from_top_leveldir; + boolean show_scaling_in_title; }; struct SetupDebugInfo @@ -1111,6 +1112,7 @@ struct SetupDebugInfo Key frame_delay_key[10]; boolean frame_delay_use_mod_key; boolean frame_delay_game_only; + boolean show_frames_per_second; }; struct SetupInfo @@ -1160,6 +1162,7 @@ struct SetupInfo int volume_loops; int volume_music; + struct SetupAutoSetupInfo auto_setup; struct SetupEditorInfo editor; struct SetupEditorCascadeInfo editor_cascade; struct SetupShortcutInfo shortcut; @@ -1413,6 +1416,10 @@ struct TextPosInfo boolean draw_player; /* special case for network player buttons */ int sort_priority; /* also used for suffix ".draw_order" */ int id; + + int direction; /* needed for panel time/health graphics */ + int class; /* needed for panel time/health graphics */ + int style; /* needed for panel time/health graphics */ }; struct LevelStats @@ -1463,7 +1470,7 @@ extern int FrameCounter; /* function definitions */ void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *, - int); + char *, int); void InitScoresInfo(); void SetWindowTitle(); @@ -1488,9 +1495,11 @@ void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int)); void InitGfxCustomArtworkInfo(); void InitGfxOtherSettings(); void InitOverlayInfo(); +void SetOverlayEnabled(boolean); void SetOverlayActive(boolean); boolean GetOverlayActive(); void SetDrawDeactivationMask(int); +int GetDrawDeactivationMask(void); void SetDrawBackgroundMask(int); void SetWindowBackgroundBitmap(Bitmap *); void SetMainBackgroundBitmap(Bitmap *); @@ -1514,6 +1523,7 @@ void FillRectangle(Bitmap *, int, int, int, int, Pixel); void ClearRectangle(Bitmap *, int, int, int, int); void ClearRectangleOnBackground(Bitmap *, int, int, int, int); void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int); +boolean DrawingDeactivatedField(void); boolean DrawingDeactivated(int, int, int, int); boolean DrawingOnBackground(int, int); boolean DrawingAreaChanged(); @@ -1553,8 +1563,9 @@ void CloseAudio(void); void SetAudioMode(boolean); boolean PendingEvent(void); -void NextEvent(Event *event); +void WaitEvent(Event *event); void PeekEvent(Event *event); +void CheckQuitEvent(void); Key GetEventKey(KeyEvent *, boolean); KeyMod HandleKeyModState(Key, int); KeyMod GetKeyModState(); @@ -1565,5 +1576,7 @@ boolean CheckCloseWindowEvent(ClientMessageEvent *); void InitJoysticks(); boolean ReadJoystick(int, int *, int *, boolean *, boolean *); +boolean CheckJoystickOpened(int); +void ClearJoystickState(); #endif /* SYSTEM_H */