X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=92585c34140f2c322253f4f22020689b808c6429;hb=effdabc5d3461d471514ef58a2294365f5030d3a;hp=8cc19c8f2d9b12921c02617f0b57988ab775cb0e;hpb=537a385b8e0c43fd2f51de48f35ccfaef64d26b3;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 8cc19c8f..92585c34 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 @@ -2497,6 +2490,7 @@ enum GFX_ARG_SORT_PRIORITY, GFX_ARG_CLASS, GFX_ARG_STYLE, + GFX_ARG_ALPHA, GFX_ARG_ACTIVE_XOFFSET, GFX_ARG_ACTIVE_YOFFSET, GFX_ARG_PRESSED_XOFFSET, @@ -2552,6 +2546,7 @@ enum FONT_ENVELOPE_2, FONT_ENVELOPE_3, FONT_ENVELOPE_4, + FONT_REQUEST_NARROW, FONT_REQUEST, FONT_INPUT_1_ACTIVE, FONT_INPUT_2_ACTIVE, @@ -2661,7 +2656,7 @@ enum // program information and versioning definitions #define PROGRAM_VERSION_SUPER 4 #define PROGRAM_VERSION_MAJOR 3 -#define PROGRAM_VERSION_MINOR 7 +#define PROGRAM_VERSION_MINOR 8 #define PROGRAM_VERSION_PATCH 2 #define PROGRAM_VERSION_EXTRA "" @@ -2669,7 +2664,7 @@ enum #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" @@ -2729,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 @@ -3235,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; @@ -3743,6 +3740,7 @@ struct GraphicInfo int class; int style; + int alpha; int active_xoffset; int active_yoffset;