X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=5331d94a2126f4b30e0dc6e3209ec1ed8b98b23a;hb=652f2eebd3bac1458da0010bef1b1208c19649c7;hp=d7bbde09ff305eb172cf629d22d7f221c431ef6b;hpb=e990d1036d8657377f18d8da3dbe446395a26b57;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index d7bbde09..5331d94a 100644 --- a/src/main.h +++ b/src/main.h @@ -154,12 +154,15 @@ /* values for internal purpose only (level editor) */ #define EP_WALK_TO_OBJECT 81 #define EP_DEADLY 82 +#define EP_EDITOR_CASCADE 83 +#define EP_EDITOR_CASCADE_ACTIVE 84 +#define EP_EDITOR_CASCADE_INACTIVE 85 /* values for internal purpose only (game engine) */ -#define EP_HAS_ACTION 83 -#define EP_CAN_CHANGE_OR_HAS_ACTION 84 +#define EP_HAS_ACTION 86 +#define EP_CAN_CHANGE_OR_HAS_ACTION 87 -#define NUM_ELEMENT_PROPERTIES 85 +#define NUM_ELEMENT_PROPERTIES 88 #define NUM_EP_BITFIELDS ((NUM_ELEMENT_PROPERTIES + 31) / 32) #define EP_BITFIELD_BASE 0 @@ -191,8 +194,8 @@ #define CE_PLAYER_PUSHES_X 13 #define CE_PLAYER_COLLECTS_X 14 #define CE_PLAYER_DROPS_X 15 -#define CE_COUNT_AT_ZERO 16 -#define CE_COUNT_AT_ZERO_OF_X 17 +#define CE_VALUE_GETS_ZERO 16 +#define CE_VALUE_GETS_ZERO_OF_X 17 #define CE_BY_OTHER_ACTION 18 #define CE_BY_DIRECT_ACTION 19 #define CE_PLAYER_DIGS_X 20 @@ -206,8 +209,13 @@ #define CE_HITTING_X 28 #define CE_HIT_BY_X 29 #define CE_BLOCKED 30 +#define CE_SWITCHED_BY_PLAYER 31 +#define CE_PLAYER_SWITCHES_X 32 +#define CE_SNAPPED_BY_PLAYER 33 +#define CE_PLAYER_SNAPS_X 34 +#define CE_MOVE_OF_X 35 -#define NUM_CHANGE_EVENTS 31 +#define NUM_CHANGE_EVENTS 36 #define CE_BITMASK_DEFAULT 0 @@ -237,6 +245,15 @@ PLAYER_BITS_4) #define PLAYER_BITS_TRIGGER (1 << 4) +/* values for move directions (bits 0 - 3: basic move directions) */ +#define MV_BIT_PREVIOUS 4 +#define MV_BIT_TRIGGER 5 +#define MV_BIT_TRIGGER_BACK 6 + +#define MV_PREVIOUS (1 << MV_BIT_PREVIOUS) +#define MV_TRIGGER (1 << MV_BIT_TRIGGER) +#define MV_TRIGGER_BACK (1 << MV_BIT_TRIGGER_BACK) + /* values for change side for custom elements */ #define CH_SIDE_NONE MV_NONE #define CH_SIDE_LEFT MV_LEFT @@ -271,23 +288,25 @@ #define CA_NO_ACTION 0 #define CA_EXIT_PLAYER 1 #define CA_KILL_PLAYER 2 -#define CA_RESTART_LEVEL 3 -#define CA_SHOW_ENVELOPE 4 -#define CA_ADD_KEY 5 -#define CA_DEL_KEY 6 -#define CA_SET_GEMS 7 -#define CA_SET_TIME 8 -#define CA_SET_SCORE 9 -#define CA_SET_CE_SCORE 10 -#define CA_SET_CE_COUNT 11 +#define CA_MOVE_PLAYER 3 +#define CA_RESTART_LEVEL 4 +#define CA_SHOW_ENVELOPE 5 +#define CA_SET_LEVEL_TIME 6 +#define CA_SET_LEVEL_GEMS 7 +#define CA_SET_LEVEL_SCORE 8 +#define CA_SET_LEVEL_WIND 9 +#define CA_SET_LEVEL_GRAVITY 10 +#define CA_SET_PLAYER_KEYS 11 #define CA_SET_PLAYER_SPEED 12 -#define CA_SET_PLAYER_GRAVITY 13 -#define CA_SET_WIND_DIRECTION 14 -#if 0 -#define CA_SET_DYNABOMB_NUMBER 15 -#define CA_SET_DYNABOMB_SIZE 16 -#define CA_SET_DYNABOMB_POWER 17 -#endif +#define CA_SET_PLAYER_SHIELD 13 +#define CA_SET_PLAYER_ARTWORK 14 +#define CA_SET_CE_SCORE 15 +#define CA_SET_CE_VALUE 16 + +#define CA_HEADLINE_LEVEL_ACTIONS 250 +#define CA_HEADLINE_PLAYER_ACTIONS 251 +#define CA_HEADLINE_CE_ACTIONS 252 +#define CA_UNDEFINED 255 /* values for change action mode for custom elements */ #define CA_MODE_UNDEFINED 0 @@ -327,14 +346,19 @@ #define CA_ARG_NUMBER_MAX (CA_ARG_NUMBER + 1) #define CA_ARG_NUMBER_RESET (CA_ARG_NUMBER + 2) #define CA_ARG_NUMBER_CE_SCORE (CA_ARG_NUMBER + 3) -#define CA_ARG_NUMBER_CE_COUNT (CA_ARG_NUMBER + 4) +#define CA_ARG_NUMBER_CE_VALUE (CA_ARG_NUMBER + 4) #define CA_ARG_NUMBER_CE_DELAY (CA_ARG_NUMBER + 5) +#define CA_ARG_NUMBER_LEVEL_TIME (CA_ARG_NUMBER + 6) +#define CA_ARG_NUMBER_LEVEL_GEMS (CA_ARG_NUMBER + 7) +#define CA_ARG_NUMBER_LEVEL_SCORE (CA_ARG_NUMBER + 8) #define CA_ARG_NUMBER_HEADLINE (CA_ARG_NUMBER + 999) #define CA_ARG_ELEMENT 12000 -#define CA_ARG_ELEMENT_TARGET (CA_ARG_ELEMENT + 0) -#define CA_ARG_ELEMENT_TRIGGER (CA_ARG_ELEMENT + 1) +#define CA_ARG_ELEMENT_RESET (CA_ARG_ELEMENT + 0) +#define CA_ARG_ELEMENT_TARGET (CA_ARG_ELEMENT + 1) +#define CA_ARG_ELEMENT_TRIGGER (CA_ARG_ELEMENT + 2) #define CA_ARG_ELEMENT_HEADLINE (CA_ARG_ELEMENT + 999) #define CA_ARG_SPEED 13000 +#define CA_ARG_SPEED_NOT_MOVING (CA_ARG_SPEED + 0) #define CA_ARG_SPEED_VERY_SLOW (CA_ARG_SPEED + 1) #define CA_ARG_SPEED_SLOW (CA_ARG_SPEED + 2) #define CA_ARG_SPEED_NORMAL (CA_ARG_SPEED + 4) @@ -343,7 +367,7 @@ #define CA_ARG_SPEED_EVEN_FASTER (CA_ARG_SPEED + 32) #define CA_ARG_SPEED_SLOWER (CA_ARG_SPEED + 50) #define CA_ARG_SPEED_FASTER (CA_ARG_SPEED + 200) -#define CA_ARG_SPEED_RESET (CA_ARG_SPEED + 0) +#define CA_ARG_SPEED_RESET (CA_ARG_SPEED + 100) #define CA_ARG_SPEED_HEADLINE (CA_ARG_SPEED + 999) #define CA_ARG_GRAVITY 14000 #define CA_ARG_GRAVITY_OFF (CA_ARG_GRAVITY + 0) @@ -356,8 +380,14 @@ #define CA_ARG_DIRECTION_RIGHT (CA_ARG_DIRECTION + MV_RIGHT) #define CA_ARG_DIRECTION_UP (CA_ARG_DIRECTION + MV_UP) #define CA_ARG_DIRECTION_DOWN (CA_ARG_DIRECTION + MV_DOWN) -#define CA_ARG_DIRECTION_TRIGGER (CA_ARG_DIRECTION + MV_ANY_DIRECTION) +#define CA_ARG_DIRECTION_TRIGGER (CA_ARG_DIRECTION + MV_TRIGGER) +#define CA_ARG_DIRECTION_TRIGGER_BACK (CA_ARG_DIRECTION + MV_TRIGGER_BACK) #define CA_ARG_DIRECTION_HEADLINE (CA_ARG_DIRECTION + 999) +#define CA_ARG_SHIELD 16000 +#define CA_ARG_SHIELD_OFF (CA_ARG_SHIELD + 0) +#define CA_ARG_SHIELD_NORMAL (CA_ARG_SHIELD + 1) +#define CA_ARG_SHIELD_DEADLY (CA_ARG_SHIELD + 2) +#define CA_ARG_SHIELD_HEADLINE (CA_ARG_SHIELD + 999) #define CA_ARG_UNDEFINED 19999 /* values for custom move patterns (bits 0 - 3: basic move directions) */ @@ -393,9 +423,6 @@ #define MV_TURNING_RANDOM (1 << MV_BIT_TURNING_RANDOM) #define MV_WIND_DIRECTION (1 << MV_BIT_WIND_DIRECTION) -/* values for initial move direction (bits 0 - 3: basic move directions) */ -#define MV_START_BIT_PREVIOUS 4 - /* values for initial move direction */ #define MV_START_NONE (MV_NONE) #define MV_START_AUTOMATIC (MV_NONE) @@ -404,7 +431,7 @@ #define MV_START_UP (MV_UP) #define MV_START_DOWN (MV_DOWN) #define MV_START_RANDOM (MV_ALL_DIRECTIONS) -#define MV_START_PREVIOUS (1 << MV_START_BIT_PREVIOUS) +#define MV_START_PREVIOUS (MV_PREVIOUS) /* values for elements left behind by custom elements */ #define LEAVE_TYPE_UNLIMITED 0 @@ -513,6 +540,13 @@ HAS_PROPERTY(e, EP_CAN_EXPLODE_BY_EXPLOSION) #define COULD_MOVE_INTO_ACID(e) HAS_PROPERTY(e, EP_COULD_MOVE_INTO_ACID) #define MAYBE_DONT_COLLIDE_WITH(e) HAS_PROPERTY(e, EP_MAYBE_DONT_COLLIDE_WITH) + +#define IS_EDITOR_CASCADE(e) HAS_PROPERTY(e, EP_EDITOR_CASCADE) +#define IS_EDITOR_CASCADE_ACTIVE(e) \ + HAS_PROPERTY(e, EP_EDITOR_CASCADE_ACTIVE) +#define IS_EDITOR_CASCADE_INACTIVE(e) \ + HAS_PROPERTY(e, EP_EDITOR_CASCADE_INACTIVE) + #define HAS_ACTION(e) HAS_PROPERTY(e, EP_HAS_ACTION) #define CAN_CHANGE_OR_HAS_ACTION(e) \ HAS_PROPERTY(e, EP_CAN_CHANGE_OR_HAS_ACTION) @@ -567,16 +601,28 @@ #define IS_RND_GATE_GRAY(e) ((e) >= EL_GATE_1_GRAY && \ (e) <= EL_GATE_4_GRAY) +#define IS_RND_GATE_GRAY_ACTIVE(e) ((e) >= EL_GATE_1_GRAY_ACTIVE && \ + (e) <= EL_GATE_4_GRAY_ACTIVE) #define IS_EM_GATE_GRAY(e) ((e) >= EL_EM_GATE_1_GRAY && \ (e) <= EL_EM_GATE_4_GRAY) +#define IS_EM_GATE_GRAY_ACTIVE(e) ((e) >= EL_EM_GATE_1_GRAY_ACTIVE && \ + (e) <= EL_EM_GATE_4_GRAY_ACTIVE) #define IS_EMC_GATE_GRAY(e) ((e) >= EL_EMC_GATE_5_GRAY && \ (e) <= EL_EMC_GATE_8_GRAY) +#define IS_EMC_GATE_GRAY_ACTIVE(e) ((e) >= EL_EMC_GATE_5_GRAY_ACTIVE && \ + (e) <= EL_EMC_GATE_8_GRAY_ACTIVE) #define IS_GATE_GRAY(e) (IS_RND_GATE_GRAY(e) || \ IS_EM_GATE_GRAY(e) || \ IS_EMC_GATE_GRAY(e)) +#define IS_GATE_GRAY_ACTIVE(e) (IS_RND_GATE_GRAY_ACTIVE(e) || \ + IS_EM_GATE_GRAY_ACTIVE(e) || \ + IS_EMC_GATE_GRAY_ACTIVE(e)) #define RND_GATE_GRAY_NR(e) ((e) - EL_GATE_1_GRAY) +#define RND_GATE_GRAY_ACTIVE_NR(e) ((e) - EL_GATE_1_GRAY_ACTIVE) #define EM_GATE_GRAY_NR(e) ((e) - EL_EM_GATE_1_GRAY) +#define EM_GATE_GRAY_ACTIVE_NR(e) ((e) - EL_EM_GATE_1_GRAY_ACTIVE) #define EMC_GATE_GRAY_NR(e) ((e) - EL_EMC_GATE_5_GRAY + 4) +#define EMC_GATE_GRAY_ACTIVE_NR(e) ((e) - EL_EMC_GATE_5_GRAY_ACTIVE + 4) #define GATE_GRAY_NR(e) (IS_RND_GATE_GRAY(e) ? RND_GATE_GRAY_NR(e) : \ IS_EM_GATE_GRAY(e) ? EM_GATE_GRAY_NR(e) : \ IS_EMC_GATE_GRAY(e) ? EMC_GATE_GRAY_NR(e) : 0) @@ -635,6 +681,11 @@ #define PLAYER_NR_GFX(g,i) ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1)) +#define GET_PLAYER_ELEMENT(e) ((e) >= EL_PLAYER_1 && (e) <= EL_PLAYER_4 ? \ + (e) : EL_PLAYER_1) + +#define GET_PLAYER_NR(e) (GET_PLAYER_ELEMENT(e) - EL_PLAYER_1) + #define ANIM_FRAMES(g) (graphic_info[g].anim_frames) #define ANIM_DELAY(g) (graphic_info[g].anim_delay) #define ANIM_MODE(g) (graphic_info[g].anim_mode) @@ -646,6 +697,11 @@ #define IS_LOOP_SOUND(s) (sound_info[s].loop) +#define EL_CASCADE_ACTIVE(e) (IS_EDITOR_CASCADE_INACTIVE(e) ? (e) + 1 : (e)) +#define EL_CASCADE_INACTIVE(e) (IS_EDITOR_CASCADE_ACTIVE(e) ? (e) - 1 : (e)) +#define EL_CASCADE_TOGGLE(e) (IS_EDITOR_CASCADE_INACTIVE(e) ? (e) + 1 : \ + IS_EDITOR_CASCADE_ACTIVE(e) ? (e) - 1 : (e)) + /* fundamental game speed values */ #define ONE_SECOND_DELAY 1000 /* delay value for one second */ @@ -1199,9 +1255,23 @@ #define EL_BD_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 42) #define EL_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 43) #define EL_BD_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 44) +#define EL_EMC_FAKE_GRASS_ACTIVE (EL_FIRST_RUNTIME_REAL + 45) +#define EL_GATE_1_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 46) +#define EL_GATE_2_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 47) +#define EL_GATE_3_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 48) +#define EL_GATE_4_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 49) +#define EL_EM_GATE_1_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 50) +#define EL_EM_GATE_2_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 51) +#define EL_EM_GATE_3_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 52) +#define EL_EM_GATE_4_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 53) +#define EL_EMC_GATE_5_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 54) +#define EL_EMC_GATE_6_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 55) +#define EL_EMC_GATE_7_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 56) +#define EL_EMC_GATE_8_GRAY_ACTIVE (EL_FIRST_RUNTIME_REAL + 57) +#define EL_EMC_DRIPPER_ACTIVE (EL_FIRST_RUNTIME_REAL + 58) /* "unreal" (and therefore not drawable) runtime elements */ -#define EL_FIRST_RUNTIME_UNREAL (EL_FIRST_RUNTIME_REAL + 45) +#define EL_FIRST_RUNTIME_UNREAL (EL_FIRST_RUNTIME_REAL + 59) #define EL_BLOCKED (EL_FIRST_RUNTIME_UNREAL + 0) #define EL_EXPLOSION (EL_FIRST_RUNTIME_UNREAL + 1) @@ -1221,9 +1291,10 @@ #define EL_QUICKSAND_FILLING (EL_FIRST_RUNTIME_UNREAL + 15) #define EL_MAGIC_WALL_FILLING (EL_FIRST_RUNTIME_UNREAL + 16) #define EL_BD_MAGIC_WALL_FILLING (EL_FIRST_RUNTIME_UNREAL + 17) +#define EL_ELEMENT_SNAPPING (EL_FIRST_RUNTIME_UNREAL + 18) /* dummy elements (never used as game elements, only used as graphics) */ -#define EL_FIRST_DUMMY (EL_FIRST_RUNTIME_UNREAL + 18) +#define EL_FIRST_DUMMY (EL_FIRST_RUNTIME_UNREAL + 19) #define EL_STEELWALL_TOPLEFT (EL_FIRST_DUMMY + 0) #define EL_STEELWALL_TOPRIGHT (EL_FIRST_DUMMY + 1) @@ -1259,12 +1330,41 @@ #define EL_INTERNAL_CLIPBOARD_GROUP (EL_FIRST_INTERNAL + 2) #define EL_INTERNAL_DUMMY (EL_FIRST_INTERNAL + 3) +#define EL_INTERNAL_CASCADE_BD (EL_FIRST_INTERNAL + 4) +#define EL_INTERNAL_CASCADE_BD_ACTIVE (EL_FIRST_INTERNAL + 5) +#define EL_INTERNAL_CASCADE_EM (EL_FIRST_INTERNAL + 6) +#define EL_INTERNAL_CASCADE_EM_ACTIVE (EL_FIRST_INTERNAL + 7) +#define EL_INTERNAL_CASCADE_EMC (EL_FIRST_INTERNAL + 8) +#define EL_INTERNAL_CASCADE_EMC_ACTIVE (EL_FIRST_INTERNAL + 9) +#define EL_INTERNAL_CASCADE_RND (EL_FIRST_INTERNAL + 10) +#define EL_INTERNAL_CASCADE_RND_ACTIVE (EL_FIRST_INTERNAL + 11) +#define EL_INTERNAL_CASCADE_SB (EL_FIRST_INTERNAL + 12) +#define EL_INTERNAL_CASCADE_SB_ACTIVE (EL_FIRST_INTERNAL + 13) +#define EL_INTERNAL_CASCADE_SP (EL_FIRST_INTERNAL + 14) +#define EL_INTERNAL_CASCADE_SP_ACTIVE (EL_FIRST_INTERNAL + 15) +#define EL_INTERNAL_CASCADE_DC (EL_FIRST_INTERNAL + 16) +#define EL_INTERNAL_CASCADE_DC_ACTIVE (EL_FIRST_INTERNAL + 17) +#define EL_INTERNAL_CASCADE_DX (EL_FIRST_INTERNAL + 18) +#define EL_INTERNAL_CASCADE_DX_ACTIVE (EL_FIRST_INTERNAL + 19) +#define EL_INTERNAL_CASCADE_TEXT (EL_FIRST_INTERNAL + 20) +#define EL_INTERNAL_CASCADE_TEXT_ACTIVE (EL_FIRST_INTERNAL + 21) +#define EL_INTERNAL_CASCADE_CE (EL_FIRST_INTERNAL + 22) +#define EL_INTERNAL_CASCADE_CE_ACTIVE (EL_FIRST_INTERNAL + 23) +#define EL_INTERNAL_CASCADE_GE (EL_FIRST_INTERNAL + 24) +#define EL_INTERNAL_CASCADE_GE_ACTIVE (EL_FIRST_INTERNAL + 25) +#define EL_INTERNAL_CASCADE_USER (EL_FIRST_INTERNAL + 26) +#define EL_INTERNAL_CASCADE_USER_ACTIVE (EL_FIRST_INTERNAL + 27) +#define EL_INTERNAL_CASCADE_GENERIC (EL_FIRST_INTERNAL + 28) +#define EL_INTERNAL_CASCADE_GENERIC_ACTIVE (EL_FIRST_INTERNAL + 29) +#define EL_INTERNAL_CASCADE_DYNAMIC (EL_FIRST_INTERNAL + 30) +#define EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE (EL_FIRST_INTERNAL + 31) + #define EL_INTERNAL_CLIPBOARD_START (EL_FIRST_INTERNAL + 0) #define EL_INTERNAL_CLIPBOARD_END (EL_FIRST_INTERNAL + 2) #define EL_INTERNAL_START (EL_FIRST_INTERNAL + 0) -#define EL_INTERNAL_END (EL_FIRST_INTERNAL + 3) +#define EL_INTERNAL_END (EL_FIRST_INTERNAL + 31) -#define MAX_NUM_ELEMENTS (EL_FIRST_INTERNAL + 4) +#define MAX_NUM_ELEMENTS (EL_FIRST_INTERNAL + 32) /* values for graphics/sounds action types */ @@ -1512,7 +1612,7 @@ #define PROGRAM_VERSION_MAJOR 3 #define PROGRAM_VERSION_MINOR 2 #define PROGRAM_VERSION_PATCH 0 -#define PROGRAM_VERSION_BUILD 5 +#define PROGRAM_VERSION_BUILD 6 #endif #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" @@ -1643,7 +1743,8 @@ struct PlayerInfo int GfxAction; - boolean use_murphy_graphic; + boolean use_murphy; + int artwork_element; boolean block_last_field; int block_delay_adjustment; /* needed for different engine versions */ @@ -1667,6 +1768,8 @@ struct PlayerInfo boolean is_bored; boolean is_sleeping; + boolean cannot_move; + int frame_counter_bored; int frame_counter_sleeping; @@ -1777,6 +1880,12 @@ struct LevelInfo int extra_time; int time_orb_time; + int extra_time_score; + + int start_element[MAX_PLAYERS]; + boolean use_start_element[MAX_PLAYERS]; + +#if 1 /* values for the new EMC elements */ int android_move_time; int android_clone_time; @@ -1789,8 +1898,12 @@ struct LevelInfo int lenses_time; int magnify_time; int wind_direction_initial; + struct Content ball_content[MAX_ELEMENT_CONTENTS]; + int num_ball_contents; + boolean android_array[16]; +#endif int can_move_into_acid_bits; /* bitfield to store property for elements */ int dont_collide_with_bits; /* bitfield to store property for elements */ @@ -1799,10 +1912,12 @@ struct LevelInfo boolean initial_gravity; boolean em_slippery_gems; /* EM style "gems slip from wall" behaviour */ boolean use_spring_bug; /* for compatibility with old levels */ + boolean use_time_orb_bug; /* for compatibility with old levels */ boolean instant_relocation; /* no visual delay when relocating player */ boolean can_pass_to_walkable; /* player can pass to empty or walkable tile */ boolean grow_into_diggable; /* amoeba can grow into anything diggable */ + boolean block_snap_field; /* snapping blocks field to show animation */ boolean block_last_field; /* player blocks previous field while moving */ boolean sp_block_last_field; /* player blocks previous field while moving */ @@ -1886,6 +2001,12 @@ struct GameInfo boolean explosions_delayed; boolean envelope_active; +#if 1 + /* values for the new EMC elements */ + int lenses_time_left; + int magnify_time_left; +#endif + /* values for player idle animation (no effect on engine) */ int player_boring_delay_fixed; int player_boring_delay_random; @@ -1922,13 +2043,13 @@ struct ElementChangeInfo int trigger_side; /* side triggering change */ int trigger_page; /* page triggering change */ - short target_element; /* target element after change */ + int target_element; /* target element after change */ int delay_fixed; /* added frame delay before changed (fixed) */ int delay_random; /* added frame delay before changed (random) */ int delay_frames; /* either 1 (frames) or 50 (seconds; 50 fps) */ - short trigger_element; /* element triggering change */ + int trigger_element; /* element triggering change */ struct Content target_content;/* elements for extended change target */ boolean use_target_content; /* use extended change target */ @@ -1953,8 +2074,9 @@ struct ElementChangeInfo void (*post_change_function)(int x, int y); short actual_trigger_element; /* element that actually triggered change */ - int actual_trigger_side; /* el.side that actually triggered change */ + int actual_trigger_side; /* element side that triggered the change */ int actual_trigger_player; /* player which actually triggered change */ + int actual_trigger_ce_value; /* CE value of element that triggered change */ boolean can_change_or_has_action; /* can_change | has_action */ @@ -1967,7 +2089,7 @@ struct ElementChangeInfo struct ElementGroupInfo { int num_elements; /* number of elements in this group */ - short element[MAX_ELEMENTS_IN_GROUP]; /* list of elements in this group */ + int element[MAX_ELEMENTS_IN_GROUP]; /* list of elements in this group */ int choice_mode; /* how to choose element from group */ @@ -2018,13 +2140,17 @@ struct ElementInfo /* ---------- special element property values ---------- */ boolean use_gfx_element; /* use custom graphic element */ - short gfx_element; /* optional custom graphic element */ + int gfx_element; /* optional custom graphic element */ int access_direction; /* accessible from which direction */ int collect_score_initial; /* initial score value for collecting */ int collect_count_initial; /* initial count value for collecting */ + int ce_value_fixed_initial; /* initial value for custom variable (fix) */ + int ce_value_random_initial; /* initial value for custom variable (rnd) */ + boolean use_last_ce_value; /* use value from element before change */ + int push_delay_fixed; /* constant delay before pushing */ int push_delay_random; /* additional random delay before pushing */ int drop_delay_fixed; /* constant delay after dropping */ @@ -2229,7 +2355,7 @@ extern short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short ChangeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short ChangePage[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; -extern short Count[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern short CustomValue[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];