X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=2906946675d805c773f5ad8dc94a6f3ad1d3dedd;hb=536a326a06ee35572a2717e9b4cb90830cb5c677;hp=c49fac981efe0702125e0ebefac77b65c5c43484;hpb=146e577821f36b6665d4a29b1e732f6619197c14;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index c49fac98..29069466 100644 --- a/src/main.h +++ b/src/main.h @@ -21,10 +21,11 @@ #include #include "libgame/libgame.h" + +#include "game_bd/game_bd.h" #include "game_em/game_em.h" #include "game_sp/game_sp.h" #include "game_mm/game_mm.h" -#include "engines.h" #include "conf_gfx.h" // include auto-generated data structure definitions #include "conf_snd.h" // include auto-generated data structure definitions @@ -1156,14 +1157,6 @@ #define EL_BD_FIREFLY_UP 75 #define EL_BD_FIREFLY_LEFT 76 #define EL_BD_FIREFLY_DOWN 77 -#define EL_BD_BUTTERFLY_1 EL_BD_BUTTERFLY_DOWN -#define EL_BD_BUTTERFLY_2 EL_BD_BUTTERFLY_LEFT -#define EL_BD_BUTTERFLY_3 EL_BD_BUTTERFLY_UP -#define EL_BD_BUTTERFLY_4 EL_BD_BUTTERFLY_RIGHT -#define EL_BD_FIREFLY_1 EL_BD_FIREFLY_LEFT -#define EL_BD_FIREFLY_2 EL_BD_FIREFLY_DOWN -#define EL_BD_FIREFLY_3 EL_BD_FIREFLY_RIGHT -#define EL_BD_FIREFLY_4 EL_BD_FIREFLY_UP #define EL_BD_BUTTERFLY 78 #define EL_BD_FIREFLY 79 #define EL_PLAYER_1 80 @@ -2664,14 +2657,14 @@ enum #define PROGRAM_VERSION_SUPER 4 #define PROGRAM_VERSION_MAJOR 3 #define PROGRAM_VERSION_MINOR 8 -#define PROGRAM_VERSION_PATCH 0 +#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 "1995-2023 by Holger Schemel" +#define PROGRAM_COPYRIGHT_STRING "1995-2024 by Holger Schemel" #define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_ICON_FILENAME "icons/icon.png" @@ -2731,11 +2724,12 @@ enum // values for game engine type identifier #define GAME_ENGINE_TYPE_UNKNOWN LEVEL_FILE_TYPE_UNKNOWN #define GAME_ENGINE_TYPE_RND LEVEL_FILE_TYPE_RND +#define GAME_ENGINE_TYPE_BD LEVEL_FILE_TYPE_BD #define GAME_ENGINE_TYPE_EM LEVEL_FILE_TYPE_EM #define GAME_ENGINE_TYPE_SP LEVEL_FILE_TYPE_SP #define GAME_ENGINE_TYPE_MM LEVEL_FILE_TYPE_MM -#define NUM_ENGINE_TYPES 4 +#define NUM_ENGINE_TYPES 5 // values for automatically playing tapes #define AUTOPLAY_NONE 0 @@ -3237,6 +3231,7 @@ struct LevelInfo int game_engine_type; // level stored in native format for the alternative native game engines + struct LevelInfo_BD *native_bd_level; struct LevelInfo_EM *native_em_level; struct LevelInfo_SP *native_sp_level; struct LevelInfo_MM *native_mm_level; @@ -3921,7 +3916,8 @@ extern int BX2, BY2; extern int SBX_Left, SBX_Right; extern int SBY_Upper, SBY_Lower; -extern int TimeFrames, TimePlayed, TimeLeft, TapeTime; +extern int TimeFrames, TimePlayed, TimeLeft; +extern int TapeTimeFrames, TapeTime; extern boolean network_player_action_received; @@ -3968,6 +3964,7 @@ extern struct ElementActionInfo element_action_info[]; extern struct ElementDirectionInfo element_direction_info[]; extern struct SpecialSuffixInfo special_suffix_info[]; extern struct TokenIntPtrInfo image_config_vars[]; +extern struct TokenIntPtrInfo sound_config_vars[]; extern struct FontInfo font_info[]; extern struct GlobalAnimInfo global_anim_info[]; extern struct GlobalAnimNameInfo global_anim_name_info[]; @@ -3980,6 +3977,7 @@ extern struct MusicFileInfo *music_file_info; extern struct HelpAnimInfo *helpanim_info; extern SetupFileHash *helptext_info; extern SetupFileHash *image_config_hash; +extern SetupFileHash *sound_config_hash; extern SetupFileHash *element_token_hash; extern SetupFileHash *graphic_token_hash; extern SetupFileHash *font_token_hash;