X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=6f3ee8eec5178512543c912a5dab87e6deadcb45;hb=80e96bb2c18af80bdf42240afb36af0e507d4f3e;hp=fd26e49468cadb0617620cf9607e5aae9f797ba2;hpb=42fb5f9da1e64e9c604ca1a8e6d1bde8fa1a5b58;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index fd26e494..6f3ee8ee 100644 --- a/src/main.h +++ b/src/main.h @@ -1960,11 +1960,11 @@ #define PROGRAM_GAME_BY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_UNIX_DATADIR_STRING ".rocksndiamonds" -#if CREATE_SPECIAL_EDITION_RND_JUE +#if defined(CREATE_SPECIAL_EDITION_RND_JUE) #undef PROGRAM_TITLE_STRING -#define PROGRAM_TITLE_STRING "R'n'D - jue" +#define PROGRAM_TITLE_STRING "R'n'D jue" #undef PROGRAM_UNIX_DATADIR_STRING -#define PROGRAM_UNIX_DATADIR_STRING ".rocksndiamonds-jue" +#define PROGRAM_UNIX_DATADIR_STRING ".rnd_jue" #endif #define ICON_TITLE_STRING PROGRAM_TITLE_STRING @@ -2346,6 +2346,8 @@ struct GlobalInfo char *convert_leveldir; int convert_level_nr; + char *create_images_dir; + int num_toons; float frames_per_second; @@ -2376,7 +2378,7 @@ struct ElementChangeInfo int delay_random; /* added frame delay before changed (random) */ int delay_frames; /* either 1 (frames) or 50 (seconds; 50 fps) */ - int trigger_element; /* element triggering change */ + int initial_trigger_element; /* initial element triggering change */ struct Content target_content;/* elements for extended change target */ boolean use_target_content; /* use extended change target */ @@ -2394,6 +2396,8 @@ struct ElementChangeInfo /* ---------- internal values used at runtime when playing ---------- */ + int trigger_element; /* element triggering change */ + /* functions that are called before, while and after the change of an element -- currently only used for non-custom elements */ void (*pre_change_function)(int x, int y);