X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=b4589dcca77e45f8e3594e5f77c7e515493ba685;hp=281fc47e57e6f0eb48bb5d975004da7206ac5818;hb=9ec014a4e4a6a2332bb45c6cea8cccc46c64c6ae;hpb=f4b305df0ae775ef48daee86020904abb79ebef8 diff --git a/src/main.h b/src/main.h index 281fc47e..b4589dcc 100644 --- a/src/main.h +++ b/src/main.h @@ -1049,34 +1049,30 @@ struct GlobalInfo struct ElementInfo { - char *token_name; /* element token prefix used in config files */ + char *token_name; /* element token used in config files */ char *sound_class_name; /* classification for custom sound effects */ char *editor_description; /* short description for level editor */ char *custom_description; /* custom description for level editor */ int graphic[NUM_ACTIONS]; /* default graphics for several actions */ - 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 */ - int sound[NUM_ACTIONS]; /* default sounds for several actions */ }; -#if 0 struct FontInfo { - int graphic; /* default graphic for this font */ + char *token_name; /* font token used in config files */ + int graphic; /* default graphic for this font */ int special_graphic[NUM_SPECIAL_GFX_ARGS]; /* special graphics for certain screens */ + int special_bitmap_id[NUM_SPECIAL_GFX_ARGS]; + /* internal bitmap ID for special graphics */ }; -#endif struct GraphicInfo { @@ -1202,6 +1198,7 @@ extern struct ElementInfo element_info[]; extern struct ElementActionInfo element_action_info[]; extern struct ElementDirectionInfo element_direction_info[]; extern struct SpecialSuffixInfo special_suffix_info[]; +extern struct FontInfo font_info[]; extern struct GraphicInfo *graphic_info; extern struct SoundInfo *sound_info; extern struct ConfigInfo image_config[], sound_config[];