X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=706c4fda6dfe9c842e84b2aacaf1f7138b868424;hb=57becb68aac2b371506b50cbf8b9b66220003b31;hp=bce82b93821f67623f326e0c96fb33603f0624c2;hpb=f4b305df0ae775ef48daee86020904abb79ebef8;p=rocksndiamonds.git diff --git a/src/libgame/system.h b/src/libgame/system.h index bce82b93..706c4fda 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,14 +32,6 @@ #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" @@ -43,6 +40,11 @@ #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 @@ -66,6 +68,7 @@ #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 @@ -88,6 +91,7 @@ (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 @@ -101,6 +105,17 @@ #define MB_MIDDLEBUTTON 2 #define MB_RIGHTBUTTON 3 + +/* 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_REVERSE (1 << 5) + + /* values for redraw_mask */ #define REDRAW_NONE (0) #define REDRAW_ALL (1 << 0) @@ -126,6 +141,12 @@ #define REDRAW_FPS (1 << 11) #define REDRAWTILES_THRESHOLD (SCR_FIELDX * SCR_FIELDY / 2) + +/* values for mouse cursor */ +#define CURSOR_DEFAULT 0 +#define CURSOR_PLAYFIELD 1 + + /* maximum number of parallel players supported by libgame functions */ #define MAX_PLAYERS 4 @@ -147,6 +168,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)) @@ -169,6 +193,7 @@ #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" @@ -209,9 +234,11 @@ #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 /* type definitions */ @@ -231,7 +258,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 */ @@ -255,6 +282,7 @@ struct OptionInfo char *graphics_directory; char *sounds_directory; char *music_directory; + char *docs_directory; char *execute_command; boolean serveronly; @@ -296,6 +324,8 @@ struct FontBitmapInfo int src_x, src_y; /* start position of animation frames */ int width, height; /* width/height of each animation frame */ int draw_x, draw_y; /* 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 */ @@ -319,13 +349,14 @@ struct GfxInfo int draw_deactivation_mask; int draw_background_mask; + Bitmap *field_save_buffer; + Bitmap *background_bitmap; int background_bitmap_mask; - boolean menu_main_hide_static_text; - int num_fonts; - struct FontBitmapInfo *font; + struct FontBitmapInfo *font_bitmap_info; + int (*select_font_function)(int); int anim_random_frame; }; @@ -383,6 +414,12 @@ struct SetupShortcutInfo Key toggle_pause; }; +struct SetupSystemInfo +{ + char *sdl_audiodriver; + int audio_fragment_size; +}; + struct SetupInfo { char *player_name; @@ -415,6 +452,8 @@ struct SetupInfo struct SetupEditorInfo editor; struct SetupShortcutInfo shortcut; struct SetupInputInfo input[MAX_PLAYERS]; + struct SetupSystemInfo system; + struct OptionInfo options; }; #define TREE_TYPE_GENERIC 0 @@ -493,6 +532,12 @@ struct ArtworkInfo char *mus_current_identifier; }; +struct ValueTextInfo +{ + int value; + char *text; +}; + struct ConfigInfo { char *token; @@ -613,15 +658,14 @@ extern int FrameCounter; /* function definitions */ -void InitCommandName(char *); +void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *, + char *, char *, char *, int); + void InitExitFunction(void (*exit_function)(int)); void InitPlatformDependantStuff(void); void ClosePlatformDependantStuff(void); -void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *, - char *, char *, int); - -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); @@ -637,6 +681,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); @@ -666,6 +711,8 @@ void ReloadCustomImage(Bitmap *, char *); Bitmap *ZoomBitmap(Bitmap *, int, int); void CreateBitmapWithSmallBitmaps(Bitmap *); +void SetMouseCursor(int); + inline void OpenAudio(void); inline void CloseAudio(void); inline void SetAudioMode(boolean);