X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=281fc47e57e6f0eb48bb5d975004da7206ac5818;hb=f4b305df0ae775ef48daee86020904abb79ebef8;hp=7664426e19ae4c1d533d0340b02f470bee4ca28c;hpb=fd273393196972c3214f805b0a580c91734c98d8;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 7664426e..281fc47e 100644 --- a/src/main.h +++ b/src/main.h @@ -797,12 +797,34 @@ /* values for font configuration */ +#define FONT_INITIAL_1 0 +#define FONT_INITIAL_2 1 +#define FONT_INITIAL_3 2 +#define FONT_INITIAL_4 3 +#define FONT_BIG_1 4 +#define FONT_BIG_2 5 +#define FONT_BIG_3 6 +#define FONT_BIG_4 7 +#define FONT_MEDIUM_1 8 +#define FONT_MEDIUM_2 9 +#define FONT_MEDIUM_3 10 +#define FONT_MEDIUM_4 11 +#define FONT_SMALL_1 12 +#define FONT_SMALL_2 13 +#define FONT_SMALL_3 14 +#define FONT_SMALL_4 15 +#define FONT_TAPE 16 +#define FONT_GAME 17 +#define FONT_NARROW 18 + +#define NUM_FONTS 19 +#define NUM_INITIAL_FONTS 4 + #define FIRST_IMG_FONT IMG_FONT_INITIAL_1 #define LAST_IMG_FONT IMG_FONT_NARROW #define NUM_IMG_FONTS (LAST_IMG_FONT - \ FIRST_IMG_FONT + 1) -#define NUM_INITIAL_FONTS 4 /* values for game_status */ @@ -915,8 +937,6 @@ struct PlayerInfo unsigned long push_delay; unsigned long push_delay_value; - int frame_reset_delay; - unsigned long actual_frame_counter; int score; @@ -1035,8 +1055,12 @@ struct ElementInfo char *custom_description; /* custom description for level editor */ int graphic[NUM_ACTIONS]; /* default graphics for several actions */ - /* special graphics for left/right/up/down */ + int direction_graphic[NUM_ACTIONS][NUM_DIRECTIONS]; + /* special graphics for left/right/up/down */ + + int special_graphic[NUM_SPECIAL_GFX_ARGS]; + /* special graphics for certain screens */ int editor_graphic; /* graphic displayed in level editor */ int preview_graphic; /* graphic displayed in level preview */ @@ -1044,6 +1068,16 @@ struct ElementInfo int sound[NUM_ACTIONS]; /* default sounds for several actions */ }; +#if 0 +struct FontInfo +{ + int graphic; /* default graphic for this font */ + + int special_graphic[NUM_SPECIAL_GFX_ARGS]; + /* special graphics for certain screens */ +}; +#endif + struct GraphicInfo { Bitmap *bitmap;