X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=f1b3f1ac08f62ccfa300ddb11d895e3719c11831;hb=c87fc56ebe59b3d5158e7e6f01d7aa9bf667737e;hp=4d5709842623d27b31c902971fbaf9cc48b2c57e;hpb=d781e40cf5aade94d6f4e80b98b0bf04cc880766;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 4d570984..f1b3f1ac 100644 --- a/src/main.h +++ b/src/main.h @@ -118,80 +118,81 @@ // values for pre-defined properties // (from here on, values can be changed by inserting new values) -#define EP_PLAYER 32 -#define EP_CAN_PASS_MAGIC_WALL 33 -#define EP_CAN_PASS_DC_MAGIC_WALL 34 -#define EP_SWITCHABLE 35 -#define EP_BD_ELEMENT 36 -#define EP_SP_ELEMENT 37 -#define EP_SB_ELEMENT 38 -#define EP_GEM 39 -#define EP_FOOD_DARK_YAMYAM 40 -#define EP_FOOD_PENGUIN 41 -#define EP_FOOD_PIG 42 -#define EP_HISTORIC_WALL 43 -#define EP_HISTORIC_SOLID 44 -#define EP_CLASSIC_ENEMY 45 -#define EP_BELT 46 -#define EP_BELT_ACTIVE 47 -#define EP_BELT_SWITCH 48 -#define EP_TUBE 49 -#define EP_ACID_POOL 50 -#define EP_KEYGATE 51 -#define EP_AMOEBOID 52 -#define EP_AMOEBALIVE 53 -#define EP_HAS_EDITOR_CONTENT 54 -#define EP_CAN_TURN_EACH_MOVE 55 -#define EP_CAN_GROW 56 -#define EP_ACTIVE_BOMB 57 -#define EP_INACTIVE 58 +#define EP_EMPTY_SPACE 32 +#define EP_PLAYER 33 +#define EP_CAN_PASS_MAGIC_WALL 34 +#define EP_CAN_PASS_DC_MAGIC_WALL 35 +#define EP_SWITCHABLE 36 +#define EP_BD_ELEMENT 37 +#define EP_SP_ELEMENT 38 +#define EP_SB_ELEMENT 39 +#define EP_GEM 40 +#define EP_FOOD_DARK_YAMYAM 41 +#define EP_FOOD_PENGUIN 42 +#define EP_FOOD_PIG 43 +#define EP_HISTORIC_WALL 44 +#define EP_HISTORIC_SOLID 45 +#define EP_CLASSIC_ENEMY 46 +#define EP_BELT 47 +#define EP_BELT_ACTIVE 48 +#define EP_BELT_SWITCH 49 +#define EP_TUBE 50 +#define EP_ACID_POOL 51 +#define EP_KEYGATE 52 +#define EP_AMOEBOID 53 +#define EP_AMOEBALIVE 54 +#define EP_HAS_EDITOR_CONTENT 55 +#define EP_CAN_TURN_EACH_MOVE 56 +#define EP_CAN_GROW 57 +#define EP_ACTIVE_BOMB 58 +#define EP_INACTIVE 59 // values for special configurable properties (depending on level settings) -#define EP_EM_SLIPPERY_WALL 59 +#define EP_EM_SLIPPERY_WALL 60 // values for special graphics properties (no effect on game engine) -#define EP_GFX_CRUMBLED 60 +#define EP_GFX_CRUMBLED 61 // values for derived properties (determined from properties above) -#define EP_ACCESSIBLE_OVER 61 -#define EP_ACCESSIBLE_INSIDE 62 -#define EP_ACCESSIBLE_UNDER 63 -#define EP_WALKABLE 64 -#define EP_PASSABLE 65 -#define EP_ACCESSIBLE 66 -#define EP_COLLECTIBLE 67 -#define EP_SNAPPABLE 68 -#define EP_WALL 69 -#define EP_SOLID_FOR_PUSHING 70 -#define EP_DRAGONFIRE_PROOF 71 -#define EP_EXPLOSION_PROOF 72 -#define EP_CAN_SMASH 73 -#define EP_EXPLODES_3X3_OLD 74 -#define EP_CAN_EXPLODE_BY_FIRE 75 -#define EP_CAN_EXPLODE_SMASHED 76 -#define EP_CAN_EXPLODE_IMPACT 77 -#define EP_SP_PORT 78 -#define EP_CAN_EXPLODE_BY_DRAGONFIRE 79 -#define EP_CAN_EXPLODE_BY_EXPLOSION 80 -#define EP_COULD_MOVE_INTO_ACID 81 -#define EP_MAYBE_DONT_COLLIDE_WITH 82 -#define EP_CAN_BE_CLONED_BY_ANDROID 83 +#define EP_ACCESSIBLE_OVER 62 +#define EP_ACCESSIBLE_INSIDE 63 +#define EP_ACCESSIBLE_UNDER 64 +#define EP_WALKABLE 65 +#define EP_PASSABLE 66 +#define EP_ACCESSIBLE 67 +#define EP_COLLECTIBLE 68 +#define EP_SNAPPABLE 69 +#define EP_WALL 70 +#define EP_SOLID_FOR_PUSHING 71 +#define EP_DRAGONFIRE_PROOF 72 +#define EP_EXPLOSION_PROOF 73 +#define EP_CAN_SMASH 74 +#define EP_EXPLODES_3X3_OLD 75 +#define EP_CAN_EXPLODE_BY_FIRE 76 +#define EP_CAN_EXPLODE_SMASHED 77 +#define EP_CAN_EXPLODE_IMPACT 78 +#define EP_SP_PORT 79 +#define EP_CAN_EXPLODE_BY_DRAGONFIRE 80 +#define EP_CAN_EXPLODE_BY_EXPLOSION 81 +#define EP_COULD_MOVE_INTO_ACID 82 +#define EP_MAYBE_DONT_COLLIDE_WITH 83 +#define EP_CAN_BE_CLONED_BY_ANDROID 84 // values for internal purpose only (level editor) -#define EP_WALK_TO_OBJECT 84 -#define EP_DEADLY 85 -#define EP_EDITOR_CASCADE 86 -#define EP_EDITOR_CASCADE_ACTIVE 87 -#define EP_EDITOR_CASCADE_INACTIVE 88 +#define EP_WALK_TO_OBJECT 85 +#define EP_DEADLY 86 +#define EP_EDITOR_CASCADE 87 +#define EP_EDITOR_CASCADE_ACTIVE 88 +#define EP_EDITOR_CASCADE_INACTIVE 89 // values for internal purpose only (game engine) -#define EP_HAS_ACTION 89 -#define EP_CAN_CHANGE_OR_HAS_ACTION 90 +#define EP_HAS_ACTION 90 +#define EP_CAN_CHANGE_OR_HAS_ACTION 91 // values for internal purpose only (other) -#define EP_OBSOLETE 91 +#define EP_OBSOLETE 92 -#define NUM_ELEMENT_PROPERTIES 92 +#define NUM_ELEMENT_PROPERTIES 93 #define NUM_EP_BITFIELDS ((NUM_ELEMENT_PROPERTIES + 31) / 32) #define EP_BITFIELD_BASE_NR 0 @@ -599,6 +600,7 @@ #define GFX_CRUMBLED(e) HAS_PROPERTY(GFX_ELEMENT(e), EP_GFX_CRUMBLED) // macros for pre-defined properties +#define IS_EMPTY_SPACE(e) HAS_PROPERTY(e, EP_EMPTY_SPACE) #define IS_PLAYER_ELEMENT(e) HAS_PROPERTY(e, EP_PLAYER) #define CAN_PASS_MAGIC_WALL(e) HAS_PROPERTY(e, EP_CAN_PASS_MAGIC_WALL) #define CAN_PASS_DC_MAGIC_WALL(e) HAS_PROPERTY(e, EP_CAN_PASS_DC_MAGIC_WALL) @@ -667,6 +669,9 @@ #define IS_OBSOLETE(e) HAS_PROPERTY(e, EP_OBSOLETE) +#define IS_EMPTY(e) IS_EMPTY_SPACE(e) +#define IS_EMPTY_ELEMENT(e) IS_EMPTY_SPACE(e) + // special macros used in game engine #define IS_FILE_ELEMENT(e) ((e) >= 0 && \ (e) <= NUM_FILE_ELEMENTS) @@ -912,6 +917,9 @@ #define GET_PLAYER_NR(e) (GET_PLAYER_ELEMENT(e) - EL_PLAYER_1) +#define GET_EMPTY_ELEMENT(i) ((i) == 0 ? EL_EMPTY_SPACE : \ + EL_EMPTY_SPACE_1 + (i) - 1) + #define ANIM_FRAMES(g) (graphic_info[g].anim_frames) #define ANIM_DELAY(g) (graphic_info[g].anim_delay) #define ANIM_MODE(g) (graphic_info[g].anim_mode) @@ -924,8 +932,8 @@ #define IS_NEW_FRAME(f, g) (IS_ANIMATED(g) && IS_NEW_DELAY(f, g)) #define IS_NEXT_FRAME(f, g) (IS_NEW_FRAME(f, g) && (f) > 0) -#define IS_LOOP_SOUND(s) (sound_info[s].loop) -#define IS_LOOP_MUSIC(s) (music_info[s].loop) +#define IS_LOOP_SOUND(s) ((s) >= 0 && sound_info[s].loop) +#define IS_LOOP_MUSIC(s) ((s) < 0 || music_info[s].loop) #define IS_SPECIAL_GFX_ARG(a) ((a) >= 0 && (a) < NUM_SPECIAL_GFX_ARGS) @@ -976,6 +984,12 @@ #define MAX_ANDROID_ELEMENTS 32 #define MAX_ANDROID_ELEMENTS_OLD 16 // (extended since version 4.2.0.0) +#define MAX_ISO_DATE_LEN 10 +#define MAX_PLATFORM_TEXT_LEN 16 +#define MAX_VERSION_TEXT_LEN 16 +#define MAX_COUNTRY_CODE_LEN 2 +#define MAX_COUNTRY_NAME_LEN 64 + // values for elements with content #define MIN_ELEMENT_CONTENTS 1 #define STD_ELEMENT_CONTENTS 4 @@ -1918,6 +1932,7 @@ #include "conf_emp.h" // include auto-generated data structure definitions #define NUM_EMPTY_SPACE_ELEMENTS 16 +#define NUM_EMPTY_ELEMENTS_ALL (NUM_EMPTY_SPACE_ELEMENTS + 1) #define EL_EMPTY_SPACE_END 1232 // ---------- end of empty space elements section ----------------------------- @@ -2284,6 +2299,7 @@ enum enum { GFX_SPECIAL_ARG_DEFAULT = 0, + GFX_SPECIAL_ARG_LOADING_INITIAL, GFX_SPECIAL_ARG_LOADING, GFX_SPECIAL_ARG_TITLE_INITIAL, GFX_SPECIAL_ARG_TITLE_INITIAL_1, @@ -2302,6 +2318,7 @@ enum GFX_SPECIAL_ARG_LEVELS, GFX_SPECIAL_ARG_LEVELNR, GFX_SPECIAL_ARG_SCORES, + GFX_SPECIAL_ARG_SCOREINFO, GFX_SPECIAL_ARG_EDITOR, GFX_SPECIAL_ARG_INFO, GFX_SPECIAL_ARG_SETUP, @@ -2313,6 +2330,7 @@ enum GFX_SPECIAL_ARG_CRUMBLED, GFX_SPECIAL_ARG_MAINONLY, GFX_SPECIAL_ARG_NAMESONLY, + GFX_SPECIAL_ARG_SCORESONLY, GFX_SPECIAL_ARG_TYPENAME, GFX_SPECIAL_ARG_TYPENAMES, GFX_SPECIAL_ARG_SUBMENU, @@ -2535,6 +2553,7 @@ enum // values for game_status (must match special image configuration suffixes) #define GAME_MODE_DEFAULT GFX_SPECIAL_ARG_DEFAULT +#define GAME_MODE_LOADING_INITIAL GFX_SPECIAL_ARG_LOADING_INITIAL #define GAME_MODE_LOADING GFX_SPECIAL_ARG_LOADING #define GAME_MODE_TITLE_INITIAL GFX_SPECIAL_ARG_TITLE_INITIAL #define GAME_MODE_TITLE_INITIAL_1 GFX_SPECIAL_ARG_TITLE_INITIAL_1 @@ -2553,6 +2572,7 @@ enum #define GAME_MODE_LEVELS GFX_SPECIAL_ARG_LEVELS #define GAME_MODE_LEVELNR GFX_SPECIAL_ARG_LEVELNR #define GAME_MODE_SCORES GFX_SPECIAL_ARG_SCORES +#define GAME_MODE_SCOREINFO GFX_SPECIAL_ARG_SCOREINFO #define GAME_MODE_EDITOR GFX_SPECIAL_ARG_EDITOR #define GAME_MODE_INFO GFX_SPECIAL_ARG_INFO #define GAME_MODE_SETUP GFX_SPECIAL_ARG_SETUP @@ -2564,6 +2584,7 @@ enum #define GAME_MODE_PSEUDO_CRUMBLED GFX_SPECIAL_ARG_CRUMBLED #define GAME_MODE_PSEUDO_MAINONLY GFX_SPECIAL_ARG_MAINONLY #define GAME_MODE_PSEUDO_NAMESONLY GFX_SPECIAL_ARG_NAMESONLY +#define GAME_MODE_PSEUDO_SCORESONLY GFX_SPECIAL_ARG_SCORESONLY #define GAME_MODE_PSEUDO_TYPENAME GFX_SPECIAL_ARG_TYPENAME #define GAME_MODE_PSEUDO_TYPENAMES GFX_SPECIAL_ARG_TYPENAMES #define GAME_MODE_PSEUDO_SUBMENU GFX_SPECIAL_ARG_SUBMENU @@ -2589,15 +2610,15 @@ enum // program information and versioning definitions #define PROGRAM_VERSION_SUPER 4 #define PROGRAM_VERSION_MAJOR 3 -#define PROGRAM_VERSION_MINOR 1 -#define PROGRAM_VERSION_PATCH 0 +#define PROGRAM_VERSION_MINOR 2 +#define PROGRAM_VERSION_PATCH 2 #define PROGRAM_VERSION_EXTRA "" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" #define PROGRAM_EMAIL_STRING "info@artsoft.org" #define PROGRAM_WEBSITE_STRING "https://www.artsoft.org/" -#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-2021 by Holger Schemel" +#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-2022 by Holger Schemel" #define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_ICON_FILENAME "RocksIcon32x32.png" @@ -2789,6 +2810,20 @@ struct MenuSetupInfo struct MenuSetupButtonInfo button; }; +struct MenuScoresButtonInfo +{ + struct MenuPosInfo prev_level; + struct MenuPosInfo next_level; + struct MenuPosInfo prev_score; + struct MenuPosInfo next_score; + struct MenuPosInfo play_tape; +}; + +struct MenuScoresInfo +{ + struct MenuScoresButtonInfo button; +}; + struct TitleFadingInfo { int fade_mode; @@ -2819,7 +2854,9 @@ struct TitleMessageInfo struct InitInfo { + struct MenuPosInfo busy_initial; struct MenuPosInfo busy; + struct MenuPosInfo busy_playfield; }; struct MenuInfo @@ -2878,6 +2915,7 @@ struct MenuInfo struct MenuMainInfo main; struct MenuSetupInfo setup; + struct MenuScoresInfo scores; }; struct DoorInfo @@ -3062,6 +3100,14 @@ struct ScoreEntry char name[MAX_PLAYER_NAME_LEN + 1]; int score; int time; // time (in frames) or steps played + + // additional score information for score info screen + int id; + char tape_date[MAX_ISO_DATE_LEN + 1]; + char platform[MAX_PLATFORM_TEXT_LEN + 1]; + char version[MAX_VERSION_TEXT_LEN + 1]; + char country_code[MAX_COUNTRY_CODE_LEN + 1]; + char country_name[MAX_COUNTRY_NAME_LEN + 1]; }; struct ScoreInfo @@ -3075,10 +3121,16 @@ struct ScoreInfo int num_entries; int last_added; int last_added_local; + int last_level_nr; + int last_entry_nr; + int next_level_nr; boolean updated; boolean uploaded; + boolean tape_downloaded; boolean force_last_added; + boolean continue_playing; + boolean continue_on_return; struct ScoreEntry entry[MAX_SCORE_ENTRIES]; }; @@ -3670,7 +3722,7 @@ struct MusicFileInfo boolean is_sound; - struct MusicFileInfo *next; + struct MusicFileInfo *prev, *next; }; struct ElementActionInfo @@ -3714,6 +3766,7 @@ extern DrawBuffer *drawto_field; extern int game_status; extern int game_status_last_screen; extern boolean level_editor_test_game; +extern boolean score_info_tape_play; extern boolean network_playing; extern int key_joystick_mapping; @@ -3751,6 +3804,7 @@ extern int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxRandomStatic[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern int GfxElementEmpty[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxRedraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; @@ -3855,6 +3909,7 @@ extern SetupFileHash *element_token_hash; extern SetupFileHash *graphic_token_hash; extern SetupFileHash *font_token_hash; extern SetupFileHash *hide_setup_hash; +extern SetupFileHash *anim_url_hash; extern struct ConfigTypeInfo image_config_suffix[]; extern struct ConfigTypeInfo sound_config_suffix[]; extern struct ConfigTypeInfo music_config_suffix[];