X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=31264e0345dbc73b994973a000ee2883729a853e;hb=ff2510f5098b545a03965c6b95296eec6885a4fb;hp=3fc93b732c3d53bb42eb0ec031db182c63505c66;hpb=3378979a81f39e4a4082d208bf288492d87f5cd1;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 3fc93b73..31264e03 100644 --- a/src/main.h +++ b/src/main.h @@ -177,7 +177,8 @@ #define ANIM_MODE(g) (graphic_info[g].anim_mode) #define IS_ANIMATED(g) (ANIM_FRAMES(g) > 1) -#define IS_NEW_FRAME(f, g) ((f) % ANIM_DELAY(g) == 0) +#define IS_NEW_DELAY(f, g) ((f) % ANIM_DELAY(g) == 0) +#define IS_NEW_FRAME(f, g) (IS_ANIMATED(g) && IS_NEW_DELAY(f, g)) #define IS_LOOP_SOUND(s) (sound_info[s].loop) @@ -797,6 +798,11 @@ #define NUM_ACTIONS 21 +/* values for special image configuration suffixes */ +#define GFX_SPECIAL_ARG_EDITOR 0 + +#define NUM_SPECIAL_GFX_ARGS 1 + /* values for image configuration suffixes */ #define GFX_ARG_XPOS 0 @@ -1049,6 +1055,8 @@ struct ElementInfo /* special graphics for left/right/up/down */ int direction_graphic[NUM_ACTIONS][NUM_DIRECTIONS]; + int editor_graphic; /* graphic displayed in level editor */ + int sound[NUM_ACTIONS]; /* default sounds for several actions */ }; @@ -1087,6 +1095,12 @@ struct ElementDirectionInfo int value; }; +struct SpecialSuffixInfo +{ + char *suffix; + int value; +}; + #if 0 extern GC tile_clip_gc; @@ -1163,6 +1177,7 @@ extern struct GlobalInfo global; 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 GraphicInfo *graphic_info; extern struct SoundInfo *sound_info; extern struct ConfigInfo image_config[], sound_config[];