X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=c1da0145b8d7fd2b58732c8c02aec8e55b1a2d79;hb=cb0ddc73cbd791f57009f4b2e9037069fb6cdff0;hp=7a80e91f0da848da91979a38e772a3ad50fe741d;hpb=b6b9bbe343c4238498a264ec0b3b5327fd3b22fb;p=rocksndiamonds.git diff --git a/src/libgame/system.h b/src/libgame/system.h index 7a80e91f..c1da0145 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -16,9 +16,9 @@ #include "types.h" -#if defined(PLATFORM_MACOSX) +#if defined(PLATFORM_MAC) #include "macosx.h" -#elif defined(PLATFORM_WIN32) +#elif defined(PLATFORM_WINDOWS) #include "windows.h" #elif defined(PLATFORM_ANDROID) #include "android.h" @@ -111,6 +111,7 @@ #define API_SERVER_METHOD "POST" #define API_SERVER_URI_ADD "/api/scores/add" #define API_SERVER_URI_GET "/api/scores/get" +#define API_SERVER_URI_GETTAPE "/api/scores/gettape" #define API_SERVER_URI_RENAME "/api/players/rename" #define API_SERVER_URI_RESETUUID "/api/players/resetuuid" @@ -147,7 +148,7 @@ #define USE_TOUCH_INPUT_OVERLAY #define USE_COMPLETE_DISPLAY #define HAS_SCREEN_KEYBOARD -#define SCREEN_KEYBOARD_POS(h) ((h) / 2) +#define SCREEN_KEYBOARD_POS(h) ((h) * 40 / 100) #endif // values for drag-and-drop support (some parts not added before SDL 2.0.5) @@ -162,7 +163,7 @@ #define DEFAULT_KEY_RIGHT KSYM_Right #define DEFAULT_KEY_UP KSYM_Up #define DEFAULT_KEY_DOWN KSYM_Down -#if defined(PLATFORM_MACOSX) +#if defined(PLATFORM_MAC) #define DEFAULT_KEY_SNAP KSYM_Control_L #define DEFAULT_KEY_DROP KSYM_KP_Enter #else @@ -239,6 +240,7 @@ #define MB_MENU_MARK TRUE #define MB_MENU_INITIALIZE (-1) #define MB_MENU_LEAVE (-2) +#define MB_MENU_CONTINUE (-3) #define MB_LEFTBUTTON 1 #define MB_MIDDLEBUTTON 2 #define MB_RIGHTBUTTON 3 @@ -656,11 +658,12 @@ #define DOCS_DIRECTORY "docs" #define ELEMENTS_DIRECTORY "elements" #define CREDITS_DIRECTORY "credits" -#define INFO_DIRECTORY "info" +#define PROGRAM_INFO_DIRECTORY "program" #define CACHE_DIRECTORY "cache" #define CONF_DIRECTORY "conf" #define NETWORK_DIRECTORY "network" #define USERS_DIRECTORY "users" +#define PERSISTENT_DIRECTORY "/persistent" #define GFX_CLASSIC_SUBDIR "gfx_classic" #define SND_CLASSIC_SUBDIR "snd_classic" @@ -700,6 +703,8 @@ #define GAMECONTROLLER_BASENAME "gamecontrollerdb.txt" +#define FALLBACK_TEXT_FILENAME "fallback.txt" + #define LOG_OUT_BASENAME "stdout.txt" #define LOG_ERR_BASENAME "stderr.txt" @@ -719,7 +724,7 @@ #define STRING_NEWLINE_UNIX "\n" #define STRING_NEWLINE_DOS "\r\n" -#if defined(PLATFORM_WIN32) +#if defined(PLATFORM_WINDOWS) #define CHAR_PATH_SEPARATOR CHAR_PATH_SEPARATOR_DOS #define STRING_PATH_SEPARATOR STRING_PATH_SEPARATOR_DOS #define STRING_NEWLINE STRING_NEWLINE_DOS @@ -816,7 +821,8 @@ #define BACKLINK_TEXT_MAIN ".. (main menu)" #define BACKLINK_TEXT_SETUP ".. (setup menu)" #define BACKLINK_TEXT_PARENT ".. (parent directory)" -#define BACKLINK_TEXT_SCORES "back" +#define BACKLINK_TEXT_BACK "back" +#define BACKLINK_TEXT_NEXT "next" #define TREE_INFOTEXT(t) ((t) == TREE_TYPE_SCORE_ENTRY ? \ INFOTEXT_SCORE_ENTRY : \ @@ -835,7 +841,7 @@ INFOTEXT_UNDEFINED) #define TREE_BACKLINK_TEXT(t) ((t) == TREE_TYPE_SCORE_ENTRY ? \ - BACKLINK_TEXT_SCORES : \ + BACKLINK_TEXT_BACK : \ (t) == TREE_TYPE_LEVEL_DIR ? \ BACKLINK_TEXT_MAIN : \ BACKLINK_TEXT_SETUP) @@ -997,7 +1003,12 @@ #define UPDATE_BUSY_STATE() \ { \ if (gfx.draw_busy_anim_function != NULL) \ - gfx.draw_busy_anim_function(); \ + gfx.draw_busy_anim_function(TRUE); \ +} +#define UPDATE_BUSY_STATE_NOT_LOADING() \ +{ \ + if (gfx.draw_busy_anim_function != NULL) \ + gfx.draw_busy_anim_function(FALSE); \ } @@ -1087,6 +1098,8 @@ struct OptionInfo char *identifier; char *level_nr; + int display_nr; + boolean mytapes; boolean serveronly; boolean network; @@ -1114,14 +1127,12 @@ struct VideoSystemInfo int vsync_mode; unsigned int frame_counter; - unsigned int frame_delay; - unsigned int frame_delay_value; + DelayCounter frame_delay; boolean shifted_up; int shifted_up_pos; int shifted_up_pos_last; - unsigned int shifted_up_delay; - unsigned int shifted_up_delay_value; + DelayCounter shifted_up_delay; boolean initialized; }; @@ -1219,7 +1230,7 @@ struct GfxInfo int anim_random_frame; - void (*draw_busy_anim_function)(void); + void (*draw_busy_anim_function)(boolean); void (*draw_global_anim_function)(int, int); void (*draw_global_border_function)(int); void (*draw_tile_cursor_function)(int); @@ -1298,6 +1309,8 @@ struct SetupTouchInfo boolean draw_pressed; boolean grid_initialized; + + boolean overlay_buttons; }; struct SetupInputInfo @@ -1449,6 +1462,15 @@ struct SetupInternalInfo boolean menu_shortcuts; boolean menu_exit; boolean menu_save_and_exit; + + boolean info_title; + boolean info_elements; + boolean info_music; + boolean info_credits; + boolean info_program; + boolean info_version; + boolean info_levelset; + boolean info_exit; }; struct SetupDebugInfo @@ -1607,6 +1629,9 @@ struct TreeInfo char *special_flags; // flags for special actions performed on level file + char *empty_level_name; // name pattern if level title is "nameless level" + boolean force_level_name; // force also renaming non-nameless level titles + 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) @@ -1622,6 +1647,7 @@ struct TreeInfo 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 time_limit; // level set has no time limit when set to "false" boolean skip_levels; // levels can be skipped when set to "true" boolean use_emc_tiles;// use (swapped) V5/V6 EMC tiles when set to "true" @@ -1878,7 +1904,6 @@ extern struct AudioSystemInfo audio; extern struct GfxInfo gfx; extern struct TileCursorInfo tile_cursor; extern struct OverlayInfo overlay; -extern struct AnimInfo anim; extern struct ArtworkInfo artwork; extern struct JoystickInfo joystick; extern struct SetupInfo setup; @@ -1930,7 +1955,7 @@ void InitGfxDoor3Info(int, int, int, int); void InitGfxWindowInfo(int, int); void InitGfxScrollbufferInfo(int, int); void InitGfxClipRegion(boolean, int, int, int, int); -void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void)); +void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(boolean)); void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int)); void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int)); void InitGfxDrawTileCursorFunction(void (*draw_tile_cursor_function)(int)); @@ -1976,7 +2001,7 @@ 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 DrawingDeactivated(int, int); boolean DrawingOnBackground(int, int); boolean DrawingAreaChanged(void); void BlitBitmapOnBackground(Bitmap *, Bitmap *, int, int, int, int, int, int); @@ -1984,12 +2009,10 @@ void BlitTexture(Bitmap *, int, int, int, int, int, int); void BlitTextureMasked(Bitmap *, int, int, int, int, int, int); void BlitToScreen(Bitmap *, int, int, int, int, int, int); void BlitToScreenMasked(Bitmap *, int, int, int, int, int, int); -void DrawSimpleBlackLine(Bitmap *, int, int, int, int); void DrawSimpleWhiteLine(Bitmap *, int, int, int, int); void DrawLines(Bitmap *, struct XY *, int, Pixel); Pixel GetPixel(Bitmap *, int, int); Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int); -Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int); void KeyboardAutoRepeatOn(void); void KeyboardAutoRepeatOff(void);