X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=fbd2090631893dc103aeb7b848ebe0452f868570;hb=HEAD;hp=9b6ffeccbd9745c597782db9a612f862484155d2;hpb=d3e24bbfb70edb9a805806345eede28c7129baf8;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 9b6ffecc..6f5b29c7 100644 --- a/src/main.h +++ b/src/main.h @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // main.h // ============================================================================ @@ -118,80 +118,81 @@ // values for pre-defined properties // (from here on, values can be changed by inserting new values) -#define EP_PLAYER 32 -#define EP_CAN_PASS_MAGIC_WALL 33 -#define EP_CAN_PASS_DC_MAGIC_WALL 34 -#define EP_SWITCHABLE 35 -#define EP_BD_ELEMENT 36 -#define EP_SP_ELEMENT 37 -#define EP_SB_ELEMENT 38 -#define EP_GEM 39 -#define EP_FOOD_DARK_YAMYAM 40 -#define EP_FOOD_PENGUIN 41 -#define EP_FOOD_PIG 42 -#define EP_HISTORIC_WALL 43 -#define EP_HISTORIC_SOLID 44 -#define EP_CLASSIC_ENEMY 45 -#define EP_BELT 46 -#define EP_BELT_ACTIVE 47 -#define EP_BELT_SWITCH 48 -#define EP_TUBE 49 -#define EP_ACID_POOL 50 -#define EP_KEYGATE 51 -#define EP_AMOEBOID 52 -#define EP_AMOEBALIVE 53 -#define EP_HAS_EDITOR_CONTENT 54 -#define EP_CAN_TURN_EACH_MOVE 55 -#define EP_CAN_GROW 56 -#define EP_ACTIVE_BOMB 57 -#define EP_INACTIVE 58 +#define EP_EMPTY_SPACE 32 +#define EP_PLAYER 33 +#define EP_CAN_PASS_MAGIC_WALL 34 +#define EP_CAN_PASS_DC_MAGIC_WALL 35 +#define EP_SWITCHABLE 36 +#define EP_BD_ELEMENT 37 +#define EP_SP_ELEMENT 38 +#define EP_SB_ELEMENT 39 +#define EP_GEM 40 +#define EP_FOOD_DARK_YAMYAM 41 +#define EP_FOOD_PENGUIN 42 +#define EP_FOOD_PIG 43 +#define EP_HISTORIC_WALL 44 +#define EP_HISTORIC_SOLID 45 +#define EP_CLASSIC_ENEMY 46 +#define EP_BELT 47 +#define EP_BELT_ACTIVE 48 +#define EP_BELT_SWITCH 49 +#define EP_TUBE 50 +#define EP_ACID_POOL 51 +#define EP_KEYGATE 52 +#define EP_AMOEBOID 53 +#define EP_AMOEBALIVE 54 +#define EP_HAS_EDITOR_CONTENT 55 +#define EP_CAN_TURN_EACH_MOVE 56 +#define EP_CAN_GROW 57 +#define EP_ACTIVE_BOMB 58 +#define EP_INACTIVE 59 // values for special configurable properties (depending on level settings) -#define EP_EM_SLIPPERY_WALL 59 +#define EP_EM_SLIPPERY_WALL 60 // values for special graphics properties (no effect on game engine) -#define EP_GFX_CRUMBLED 60 +#define EP_GFX_CRUMBLED 61 // values for derived properties (determined from properties above) -#define EP_ACCESSIBLE_OVER 61 -#define EP_ACCESSIBLE_INSIDE 62 -#define EP_ACCESSIBLE_UNDER 63 -#define EP_WALKABLE 64 -#define EP_PASSABLE 65 -#define EP_ACCESSIBLE 66 -#define EP_COLLECTIBLE 67 -#define EP_SNAPPABLE 68 -#define EP_WALL 69 -#define EP_SOLID_FOR_PUSHING 70 -#define EP_DRAGONFIRE_PROOF 71 -#define EP_EXPLOSION_PROOF 72 -#define EP_CAN_SMASH 73 -#define EP_EXPLODES_3X3_OLD 74 -#define EP_CAN_EXPLODE_BY_FIRE 75 -#define EP_CAN_EXPLODE_SMASHED 76 -#define EP_CAN_EXPLODE_IMPACT 77 -#define EP_SP_PORT 78 -#define EP_CAN_EXPLODE_BY_DRAGONFIRE 79 -#define EP_CAN_EXPLODE_BY_EXPLOSION 80 -#define EP_COULD_MOVE_INTO_ACID 81 -#define EP_MAYBE_DONT_COLLIDE_WITH 82 -#define EP_CAN_BE_CLONED_BY_ANDROID 83 +#define EP_ACCESSIBLE_OVER 62 +#define EP_ACCESSIBLE_INSIDE 63 +#define EP_ACCESSIBLE_UNDER 64 +#define EP_WALKABLE 65 +#define EP_PASSABLE 66 +#define EP_ACCESSIBLE 67 +#define EP_COLLECTIBLE 68 +#define EP_SNAPPABLE 69 +#define EP_WALL 70 +#define EP_SOLID_FOR_PUSHING 71 +#define EP_DRAGONFIRE_PROOF 72 +#define EP_EXPLOSION_PROOF 73 +#define EP_CAN_SMASH 74 +#define EP_EXPLODES_3X3_OLD 75 +#define EP_CAN_EXPLODE_BY_FIRE 76 +#define EP_CAN_EXPLODE_SMASHED 77 +#define EP_CAN_EXPLODE_IMPACT 78 +#define EP_SP_PORT 79 +#define EP_CAN_EXPLODE_BY_DRAGONFIRE 80 +#define EP_CAN_EXPLODE_BY_EXPLOSION 81 +#define EP_COULD_MOVE_INTO_ACID 82 +#define EP_MAYBE_DONT_COLLIDE_WITH 83 +#define EP_CAN_BE_CLONED_BY_ANDROID 84 // values for internal purpose only (level editor) -#define EP_WALK_TO_OBJECT 84 -#define EP_DEADLY 85 -#define EP_EDITOR_CASCADE 86 -#define EP_EDITOR_CASCADE_ACTIVE 87 -#define EP_EDITOR_CASCADE_INACTIVE 88 +#define EP_WALK_TO_OBJECT 85 +#define EP_DEADLY 86 +#define EP_EDITOR_CASCADE 87 +#define EP_EDITOR_CASCADE_ACTIVE 88 +#define EP_EDITOR_CASCADE_INACTIVE 89 // values for internal purpose only (game engine) -#define EP_HAS_ACTION 89 -#define EP_CAN_CHANGE_OR_HAS_ACTION 90 +#define EP_HAS_ACTION 90 +#define EP_CAN_CHANGE_OR_HAS_ACTION 91 // values for internal purpose only (other) -#define EP_OBSOLETE 91 +#define EP_OBSOLETE 92 -#define NUM_ELEMENT_PROPERTIES 92 +#define NUM_ELEMENT_PROPERTIES 93 #define NUM_EP_BITFIELDS ((NUM_ELEMENT_PROPERTIES + 31) / 32) #define EP_BITFIELD_BASE_NR 0 @@ -199,10 +200,10 @@ #define EP_BITMASK_BASE_DEFAULT (1 << EP_CAN_MOVE_INTO_ACID) #define EP_BITMASK_DEFAULT 0 -#define PROPERTY_BIT(p) (1 << ((p) % 32)) -#define PROPERTY_VAR(e,p) (element_info[e].properties[(p) / 32]) -#define HAS_PROPERTY(e,p) ((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0) -#define SET_PROPERTY(e,p,v) ((v) ? \ +#define PROPERTY_BIT(p) (1u << ((p) % 32)) +#define PROPERTY_VAR(e, p) (element_info[e].properties[(p) / 32]) +#define HAS_PROPERTY(e, p) ((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0) +#define SET_PROPERTY(e, p, v) ((v) ? \ (PROPERTY_VAR(e,p) |= PROPERTY_BIT(p)) : \ (PROPERTY_VAR(e,p) &= ~PROPERTY_BIT(p))) @@ -252,29 +253,39 @@ #define CE_VALUE_CHANGES_OF_X 41 #define CE_SCORE_CHANGES 42 #define CE_SCORE_CHANGES_OF_X 43 +#define CE_CLICKED_BY_MOUSE 44 +#define CE_PRESSED_BY_MOUSE 45 +#define CE_MOUSE_CLICKED_ON_X 46 +#define CE_MOUSE_PRESSED_ON_X 47 +#define CE_NEXT_TO_PLAYER 48 +#define CE_NEXT_TO_X 49 +#define CE_PLAYER_NEXT_TO_X 50 -#define NUM_CHANGE_EVENTS 44 +#define NUM_CHANGE_EVENTS 51 #define NUM_CE_BITFIELDS ((NUM_CHANGE_EVENTS + 31) / 32) +#define CE_HEADLINE_SPECIAL_EVENTS 250 +#define CE_UNDEFINED 255 + #define CE_BITMASK_DEFAULT 0 #define CH_EVENT_BITFIELD_NR(e) (e / 32) #define CH_EVENT_BIT(e) (1 << ((e) % 32)) -#define CH_EVENT_VAR(e,c) (element_info[e].change->has_event[c]) -#define CH_ANY_EVENT_VAR(e,c) (element_info[e].has_change_event[c]) +#define CH_EVENT_VAR(e, c) (element_info[e].change->has_event[c]) +#define CH_ANY_EVENT_VAR(e, c) (element_info[e].has_change_event[c]) -#define PAGE_HAS_CHANGE_EVENT(p,c) ((p)->has_event[c]) -#define HAS_CHANGE_EVENT(e,c) (IS_CUSTOM_ELEMENT(e) && \ - CH_EVENT_VAR(e,c)) -#define HAS_ANY_CHANGE_EVENT(e,c) (IS_CUSTOM_ELEMENT(e) && \ - CH_ANY_EVENT_VAR(e,c)) +#define PAGE_HAS_CHANGE_EVENT(p, c) ((p)->has_event[c]) +#define HAS_CHANGE_EVENT(e, c) (IS_CUSTOM_ELEMENT(e) && \ + CH_EVENT_VAR(e, c)) +#define HAS_ANY_CHANGE_EVENT(e, c) (IS_CUSTOM_ELEMENT(e) && \ + CH_ANY_EVENT_VAR(e, c)) -#define SET_CHANGE_EVENT(e,c,v) (IS_CUSTOM_ELEMENT(e) ? \ - CH_EVENT_VAR(e,c) = (v) : 0) -#define SET_ANY_CHANGE_EVENT(e,c,v) (IS_CUSTOM_ELEMENT(e) ? \ - CH_ANY_EVENT_VAR(e,c) = (v) : 0) +#define SET_CHANGE_EVENT(e, c, v) (IS_CUSTOM_ELEMENT(e) ? \ + CH_EVENT_VAR(e, c) = (v) : 0) +#define SET_ANY_CHANGE_EVENT(e, c, v) (IS_CUSTOM_ELEMENT(e) ? \ + CH_ANY_EVENT_VAR(e, c) = (v) : 0) // values for player bitmasks #define PLAYER_BITS_NONE 0 @@ -324,6 +335,11 @@ #define CH_SIDE_TOP_BOTTOM MV_VERTICAL #define CH_SIDE_ANY MV_ANY_DIRECTION +#define CH_SIDE_FROM_BUTTON(b) ((b) == MB_LEFTBUTTON ? CH_SIDE_LEFT : \ + (b) == MB_RIGHTBUTTON ? CH_SIDE_RIGHT : \ + (b) == MB_MIDDLEBUTTON ? CH_SIDE_TOP_BOTTOM : \ + CH_SIDE_NONE) + // values for change player for custom elements #define CH_PLAYER_NONE PLAYER_BITS_NONE #define CH_PLAYER_1 PLAYER_BITS_1 @@ -366,6 +382,7 @@ #define CA_SET_PLAYER_INVENTORY 18 #define CA_SET_CE_ARTWORK 19 #define CA_SET_LEVEL_RANDOM_SEED 20 +#define CA_MOVE_PLAYER_NEW 21 #define CA_HEADLINE_LEVEL_ACTIONS 250 #define CA_HEADLINE_PLAYER_ACTIONS 251 @@ -583,7 +600,8 @@ #define GFX_CRUMBLED(e) HAS_PROPERTY(GFX_ELEMENT(e), EP_GFX_CRUMBLED) // macros for pre-defined properties -#define ELEM_IS_PLAYER(e) HAS_PROPERTY(e, EP_PLAYER) +#define IS_EMPTY_SPACE(e) HAS_PROPERTY(e, EP_EMPTY_SPACE) +#define IS_PLAYER_ELEMENT(e) HAS_PROPERTY(e, EP_PLAYER) #define CAN_PASS_MAGIC_WALL(e) HAS_PROPERTY(e, EP_CAN_PASS_MAGIC_WALL) #define CAN_PASS_DC_MAGIC_WALL(e) HAS_PROPERTY(e, EP_CAN_PASS_DC_MAGIC_WALL) #define IS_SWITCHABLE(e) HAS_PROPERTY(e, EP_SWITCHABLE) @@ -651,6 +669,9 @@ #define IS_OBSOLETE(e) HAS_PROPERTY(e, EP_OBSOLETE) +#define IS_EMPTY(e) IS_EMPTY_SPACE(e) +#define IS_EMPTY_ELEMENT(e) IS_EMPTY_SPACE(e) + // special macros used in game engine #define IS_FILE_ELEMENT(e) ((e) >= 0 && \ (e) <= NUM_FILE_ELEMENTS) @@ -676,11 +697,22 @@ #define IS_INTERNAL_ELEMENT(e) ((e) >= EL_INTERNAL_START && \ (e) <= EL_INTERNAL_END) -#define IS_MM_ELEMENT(e) ((e) >= EL_MM_START && \ - (e) <= EL_MM_END) - -#define IS_DF_ELEMENT(e) ((e) >= EL_DF_START && \ - (e) <= EL_DF_END) +#define IS_MM_ELEMENT_1(e) ((e) >= EL_MM_START_1 && \ + (e) <= EL_MM_END_1) +#define IS_MM_ELEMENT_2(e) ((e) >= EL_MM_START_2 && \ + (e) <= EL_MM_END_2) +#define IS_MM_ELEMENT_3(e) ((e) >= EL_MM_START_3 && \ + (e) <= EL_MM_END_3) +#define IS_MM_ELEMENT(e) (IS_MM_ELEMENT_1(e) || \ + IS_MM_ELEMENT_2(e) || \ + IS_MM_ELEMENT_3(e)) + +#define IS_DF_ELEMENT_1(e) ((e) >= EL_DF_START_1 && \ + (e) <= EL_DF_END_1) +#define IS_DF_ELEMENT_2(e) ((e) >= EL_DF_START_2 && \ + (e) <= EL_DF_END_2) +#define IS_DF_ELEMENT(e) (IS_DF_ELEMENT_1(e) || \ + IS_DF_ELEMENT_2(e)) #define IS_MM_MCDUFFIN(e) ((e) >= EL_MM_MCDUFFIN_START && \ (e) <= EL_MM_MCDUFFIN_END) @@ -706,6 +738,9 @@ #define IS_ENVELOPE(e) ((e) >= EL_ENVELOPE_1 && \ (e) <= EL_ENVELOPE_4) +#define IS_MM_ENVELOPE(e) ((e) >= EL_MM_ENVELOPE_1 && \ + (e) <= EL_MM_ENVELOPE_4) + #define IS_BALLOON_ELEMENT(e) ((e) == EL_BALLOON || \ (e) == EL_BALLOON_SWITCH_LEFT || \ (e) == EL_BALLOON_SWITCH_RIGHT || \ @@ -781,6 +816,11 @@ IS_EM_GATE_GRAY(e) ? EM_GATE_GRAY_NR(e) : \ IS_EMC_GATE_GRAY(e) ? EMC_GATE_GRAY_NR(e) : 0) +#define RND_ENVELOPE_NR(e) ((e) - EL_ENVELOPE_1) +#define MM_ENVELOPE_NR(e) ((e) - EL_MM_ENVELOPE_1) +#define ENVELOPE_NR(e) (IS_ENVELOPE(e) ? RND_ENVELOPE_NR(e) : \ + MM_ENVELOPE_NR(e)) + #define IS_ACID_POOL_OR_ACID(e) (IS_ACID_POOL(e) || (e) == EL_ACID) #define IS_EMC_PILLAR(e) ((e) >= EL_EMC_WALL_1 && \ @@ -800,6 +840,9 @@ #define IS_DC_STEELWALL_2(e) ((e) >= EL_DC_STEELWALL_2_LEFT && \ (e) <= EL_DC_STEELWALL_2_SINGLE) +// !!! IMPROVE THIS !!! +#define IS_EM_ELEMENT(e) (map_element_EM_to_RND_cave(map_element_RND_to_EM_cave(e)) == (e)) + #define MM_WALL_BASE(e) ((e) & 0xfff0) #define MM_WALL_BITS(e) ((e) & 0x000f) @@ -809,13 +852,13 @@ #if 1 #define TILE_GFX_ELEMENT(x, y) \ (GfxElement[x][y] != EL_UNDEFINED && \ - Feld[x][y] != EL_EXPLOSION ? \ - GfxElement[x][y] : Feld[x][y]) + Tile[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Tile[x][y]) #else #define TILE_GFX_ELEMENT(x, y) \ GFX_ELEMENT(GfxElement[x][y] != EL_UNDEFINED && \ - Feld[x][y] != EL_EXPLOSION ? \ - GfxElement[x][y] : Feld[x][y]) + Tile[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Tile[x][y]) #endif // !!! "use sound" deactivated due to problems with level "bug machine" !!! @@ -834,14 +877,14 @@ (ge == EL_ANY_ELEMENT ? TRUE : \ IS_GROUP_ELEMENT(ge) ? IS_IN_GROUP(e, GROUP_NR(ge)) : (e) == (ge)) -#define IS_PLAYER(x, y) (ELEM_IS_PLAYER(StorePlayer[x][y])) +#define IS_PLAYER(x, y) (IS_PLAYER_ELEMENT(StorePlayer[x][y])) -#define IS_FREE(x, y) (Feld[x][y] == EL_EMPTY && !IS_PLAYER(x, y)) -#define IS_FREE_OR_PLAYER(x, y) (Feld[x][y] == EL_EMPTY) +#define IS_FREE(x, y) (Tile[x][y] == EL_EMPTY && !IS_PLAYER(x, y)) +#define IS_FREE_OR_PLAYER(x, y) (Tile[x][y] == EL_EMPTY) -#define IS_MOVING(x,y) (MovPos[x][y] != 0) -#define IS_FALLING(x,y) (MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN) -#define IS_BLOCKED(x,y) (Feld[x][y] == EL_BLOCKED) +#define IS_MOVING(x, y) (MovPos[x][y] != 0) +#define IS_FALLING(x, y) (MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN) +#define IS_BLOCKED(x, y) (Tile[x][y] == EL_BLOCKED) #define IS_MV_DIAGONAL(x) ((x) & MV_HORIZONTAL && (x) & MV_VERTICAL) @@ -869,13 +912,13 @@ #define TAPE_IS_EMPTY(x) ((x).length == 0) #define TAPE_IS_STOPPED(x) (!(x).recording && !(x).playing) -#define PLAYERINFO(x,y) (&stored_player[StorePlayer[x][y]-EL_PLAYER_1]) +#define PLAYERINFO(x, y) (&stored_player[StorePlayer[x][y] - EL_PLAYER_1]) #define SHIELD_ON(p) ((p)->shield_normal_time_left > 0) -#define ENEMY_PROTECTED_FIELD(x,y) (IS_PROTECTED(Feld[x][y]) || \ +#define ENEMY_PROTECTED_FIELD(x, y) (IS_PROTECTED(Tile[x][y]) || \ IS_PROTECTED(Back[x][y])) -#define EXPLOSION_PROTECTED_FIELD(x,y) (IS_EXPLOSION_PROOF(Feld[x][y])) -#define PLAYER_ENEMY_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) || \ +#define EXPLOSION_PROTECTED_FIELD(x, y) (IS_EXPLOSION_PROOF(Tile[x][y])) +#define PLAYER_ENEMY_PROTECTED(x, y) (SHIELD_ON(PLAYERINFO(x, y)) || \ ENEMY_PROTECTED_FIELD(x, y)) #define PLAYER_EXPLOSION_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) || \ EXPLOSION_PROTECTED_FIELD(x, y)) @@ -886,13 +929,16 @@ #define PLAYER_DROPPING(p,x,y) ((p)->is_dropping && \ (p)->drop_x == (x) && (p)->drop_y == (y)) -#define PLAYER_NR_GFX(g,i) ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1)) +#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 GET_EMPTY_ELEMENT(i) ((i) == 0 ? EL_EMPTY_SPACE : \ + EL_EMPTY_SPACE_1 + (i) - 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) @@ -905,8 +951,8 @@ #define IS_NEW_FRAME(f, g) (IS_ANIMATED(g) && IS_NEW_DELAY(f, g)) #define IS_NEXT_FRAME(f, g) (IS_NEW_FRAME(f, g) && (f) > 0) -#define IS_LOOP_SOUND(s) (sound_info[s].loop) -#define IS_LOOP_MUSIC(s) (music_info[s].loop) +#define IS_LOOP_SOUND(s) ((s) >= 0 && sound_info[s].loop) +#define IS_LOOP_MUSIC(s) ((s) < 0 || music_info[s].loop) #define IS_SPECIAL_GFX_ARG(a) ((a) >= 0 && (a) < NUM_SPECIAL_GFX_ARGS) @@ -954,13 +1000,24 @@ #define MIN_ELEMENTS_IN_GROUP 1 #define MAX_ELEMENTS_IN_GROUP 16 #define MIN_ANDROID_ELEMENTS 1 -#define MAX_ANDROID_ELEMENTS 16 +#define MAX_ANDROID_ELEMENTS 32 +#define MAX_ANDROID_ELEMENTS_OLD 16 // (extended since version 4.2.0.0) + +#define MAX_ISO_DATE_LEN 10 +#define MAX_PLATFORM_TEXT_LEN 16 +#define MAX_VERSION_TEXT_LEN 16 +#define MAX_COUNTRY_CODE_LEN 2 +#define MAX_COUNTRY_NAME_LEN 64 // values for elements with content #define MIN_ELEMENT_CONTENTS 1 #define STD_ELEMENT_CONTENTS 4 #define MAX_ELEMENT_CONTENTS 8 +#define MIN_MM_BALL_CONTENTS 1 +#define STD_MM_BALL_CONTENTS 8 +#define MAX_MM_BALL_CONTENTS 16 + // values for initial player inventory #define MIN_INITIAL_INVENTORY_SIZE 1 #define MAX_INITIAL_INVENTORY_SIZE 8 @@ -1365,7 +1422,7 @@ #define NUM_GROUP_ELEMENTS 32 #define EL_GROUP_END 655 -// ---------- end of custom elements section ---------------------------------- +// ---------- end of group elements section ----------------------------------- #define EL_UNKNOWN 656 #define EL_TRIGGER_ELEMENT 657 @@ -1664,16 +1721,16 @@ #define EL_MM_WOODEN_GRID_FIXED_4 (EL_MM_WOODEN_GRID_FIXED_START + 3) #define EL_MM_WOODEN_GRID_FIXED_END EL_MM_WOODEN_GRID_FIXED_03 #define EL_MM_FUEL_EMPTY (EL_MM_START + 155) - -#define EL_MM_UNUSED_156 (EL_MM_START + 156) -#define EL_MM_UNUSED_157 (EL_MM_START + 157) -#define EL_MM_UNUSED_158 (EL_MM_START + 158) -#define EL_MM_UNUSED_159 (EL_MM_START + 159) +#define EL_MM_ENVELOPE_1 (EL_MM_START + 156) +#define EL_MM_ENVELOPE_2 (EL_MM_START + 157) +#define EL_MM_ENVELOPE_3 (EL_MM_START + 158) +#define EL_MM_ENVELOPE_4 (EL_MM_START + 159) #define EL_MM_END_1 (EL_MM_START + 159) #define EL_MM_START_2 (EL_MM_START + 160) #define EL_DF_START EL_MM_START_2 +#define EL_DF_START_1 EL_MM_START_2 #define EL_DF_START2 (EL_DF_START - 240) #define EL_DF_MIRROR_START EL_DF_START @@ -1799,7 +1856,7 @@ #define EL_DF_STEEL_GRID_ROTATING_8 (EL_DF_STEEL_GRID_ROTATING_START + 7) #define EL_DF_STEEL_GRID_ROTATING_END EL_DF_STEEL_GRID_ROTATING_07 -#define EL_DF_END (EL_DF_START2 + 355) +#define EL_DF_END_1 (EL_DF_START2 + 355) #define EL_MM_TELEPORTER_RED_START (EL_DF_START2 + 356) #define EL_MM_TELEPORTER_RED_1 (EL_MM_TELEPORTER_RED_START + 0) @@ -1887,9 +1944,53 @@ #define EL_DF_WOODEN_WALL 1214 #define EL_MM_END_2 (EL_DF_START2 + 430) -#define EL_MM_END EL_MM_END_2 -#define NUM_FILE_ELEMENTS 1215 +#define EL_SPRING_LEFT 1215 +#define EL_SPRING_RIGHT 1216 + +// ---------- begin of empty space elements section --------------------------- +#define EL_EMPTY_SPACE_START 1217 + +#include "conf_emp.h" // include auto-generated data structure definitions + +#define NUM_EMPTY_SPACE_ELEMENTS 16 +#define NUM_EMPTY_ELEMENTS_ALL (NUM_EMPTY_SPACE_ELEMENTS + 1) +#define EL_EMPTY_SPACE_END 1232 +// ---------- end of empty space elements section ----------------------------- + +#define EL_MM_START_3 EL_DF_MIRROR_FIXED_START +#define EL_DF_START_2 EL_DF_MIRROR_FIXED_START + +#define EL_DF_MIRROR_FIXED_START 1233 +#define EL_DF_MIRROR_FIXED_1 (EL_DF_MIRROR_FIXED_START + 0) +#define EL_DF_MIRROR_FIXED_2 (EL_DF_MIRROR_FIXED_START + 1) +#define EL_DF_MIRROR_FIXED_3 (EL_DF_MIRROR_FIXED_START + 2) +#define EL_DF_MIRROR_FIXED_4 (EL_DF_MIRROR_FIXED_START + 3) +#define EL_DF_MIRROR_FIXED_5 (EL_DF_MIRROR_FIXED_START + 4) +#define EL_DF_MIRROR_FIXED_6 (EL_DF_MIRROR_FIXED_START + 5) +#define EL_DF_MIRROR_FIXED_7 (EL_DF_MIRROR_FIXED_START + 6) +#define EL_DF_MIRROR_FIXED_8 (EL_DF_MIRROR_FIXED_START + 7) +#define EL_DF_MIRROR_FIXED_9 (EL_DF_MIRROR_FIXED_START + 8) +#define EL_DF_MIRROR_FIXED_10 (EL_DF_MIRROR_FIXED_START + 9) +#define EL_DF_MIRROR_FIXED_11 (EL_DF_MIRROR_FIXED_START + 10) +#define EL_DF_MIRROR_FIXED_12 (EL_DF_MIRROR_FIXED_START + 11) +#define EL_DF_MIRROR_FIXED_13 (EL_DF_MIRROR_FIXED_START + 12) +#define EL_DF_MIRROR_FIXED_14 (EL_DF_MIRROR_FIXED_START + 13) +#define EL_DF_MIRROR_FIXED_15 (EL_DF_MIRROR_FIXED_START + 14) +#define EL_DF_MIRROR_FIXED_16 (EL_DF_MIRROR_FIXED_START + 15) +#define EL_DF_MIRROR_FIXED_END EL_DF_MIRROR_FIXED_16 + +#define EL_DF_SLOPE_START 1249 +#define EL_DF_SLOPE_1 (EL_DF_SLOPE_START + 0) +#define EL_DF_SLOPE_2 (EL_DF_SLOPE_START + 1) +#define EL_DF_SLOPE_3 (EL_DF_SLOPE_START + 2) +#define EL_DF_SLOPE_4 (EL_DF_SLOPE_START + 3) +#define EL_DF_SLOPE_END EL_DF_SLOPE_4 + +#define EL_MM_END_3 EL_DF_SLOPE_END +#define EL_DF_END_2 EL_DF_SLOPE_END + +#define NUM_FILE_ELEMENTS 1253 // "real" (and therefore drawable) runtime elements @@ -1969,15 +2070,18 @@ #define EL_EMC_SPRING_BUMPER_ACTIVE (EL_FIRST_RUNTIME_REAL + 71) #define EL_MM_EXIT_OPENING (EL_FIRST_RUNTIME_REAL + 72) #define EL_MM_EXIT_CLOSING (EL_FIRST_RUNTIME_REAL + 73) -#define EL_MM_GRAY_BALL_OPENING (EL_FIRST_RUNTIME_REAL + 74) -#define EL_MM_ICE_WALL_SHRINKING (EL_FIRST_RUNTIME_REAL + 75) -#define EL_MM_AMOEBA_WALL_GROWING (EL_FIRST_RUNTIME_REAL + 76) -#define EL_MM_PACMAN_EATING_RIGHT (EL_FIRST_RUNTIME_REAL + 77) -#define EL_MM_PACMAN_EATING_UP (EL_FIRST_RUNTIME_REAL + 78) -#define EL_MM_PACMAN_EATING_LEFT (EL_FIRST_RUNTIME_REAL + 79) -#define EL_MM_PACMAN_EATING_DOWN (EL_FIRST_RUNTIME_REAL + 80) - -#define NUM_DRAWABLE_ELEMENTS (EL_FIRST_RUNTIME_REAL + 81) +#define EL_MM_GRAY_BALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 74) +#define EL_MM_GRAY_BALL_OPENING (EL_FIRST_RUNTIME_REAL + 75) +#define EL_MM_ICE_WALL_SHRINKING (EL_FIRST_RUNTIME_REAL + 76) +#define EL_MM_AMOEBA_WALL_GROWING (EL_FIRST_RUNTIME_REAL + 77) +#define EL_MM_PACMAN_EATING_RIGHT (EL_FIRST_RUNTIME_REAL + 78) +#define EL_MM_PACMAN_EATING_UP (EL_FIRST_RUNTIME_REAL + 79) +#define EL_MM_PACMAN_EATING_LEFT (EL_FIRST_RUNTIME_REAL + 80) +#define EL_MM_PACMAN_EATING_DOWN (EL_FIRST_RUNTIME_REAL + 81) +#define EL_MM_BOMB_ACTIVE (EL_FIRST_RUNTIME_REAL + 82) +#define EL_DF_MINE_ACTIVE (EL_FIRST_RUNTIME_REAL + 83) + +#define NUM_DRAWABLE_ELEMENTS (EL_FIRST_RUNTIME_REAL + 84) #define EL_MM_RUNTIME_START EL_MM_EXIT_OPENING #define EL_MM_RUNTIME_END EL_MM_AMOEBA_WALL_GROWING @@ -2039,35 +2143,22 @@ #define EL_MM_LIGHTBALL_RED (EL_FIRST_DUMMY + 21) #define EL_MM_LIGHTBALL_BLUE (EL_FIRST_DUMMY + 22) #define EL_MM_LIGHTBALL_YELLOW (EL_FIRST_DUMMY + 23) -#define EL_MM_MASK_MCDUFFIN_RIGHT (EL_FIRST_DUMMY + 24) -#define EL_MM_MASK_MCDUFFIN_UP (EL_FIRST_DUMMY + 25) -#define EL_MM_MASK_MCDUFFIN_LEFT (EL_FIRST_DUMMY + 26) -#define EL_MM_MASK_MCDUFFIN_DOWN (EL_FIRST_DUMMY + 27) -#define EL_MM_MASK_GRID_1 (EL_FIRST_DUMMY + 28) -#define EL_MM_MASK_GRID_2 (EL_FIRST_DUMMY + 29) -#define EL_MM_MASK_GRID_3 (EL_FIRST_DUMMY + 30) -#define EL_MM_MASK_GRID_4 (EL_FIRST_DUMMY + 31) -#define EL_MM_MASK_RECTANGLE (EL_FIRST_DUMMY + 32) -#define EL_MM_MASK_CIRCLE (EL_FIRST_DUMMY + 33) -#define EL_DEFAULT (EL_FIRST_DUMMY + 34) -#define EL_BD_DEFAULT (EL_FIRST_DUMMY + 35) -#define EL_SP_DEFAULT (EL_FIRST_DUMMY + 36) -#define EL_SB_DEFAULT (EL_FIRST_DUMMY + 37) -#define EL_MM_DEFAULT (EL_FIRST_DUMMY + 38) -#define EL_GRAPHIC_1 (EL_FIRST_DUMMY + 39) -#define EL_GRAPHIC_2 (EL_FIRST_DUMMY + 40) -#define EL_GRAPHIC_3 (EL_FIRST_DUMMY + 41) -#define EL_GRAPHIC_4 (EL_FIRST_DUMMY + 42) -#define EL_GRAPHIC_5 (EL_FIRST_DUMMY + 43) -#define EL_GRAPHIC_6 (EL_FIRST_DUMMY + 44) -#define EL_GRAPHIC_7 (EL_FIRST_DUMMY + 45) -#define EL_GRAPHIC_8 (EL_FIRST_DUMMY + 46) - -#define EL_MM_DUMMY_START EL_MM_MASK_MCDUFFIN_RIGHT -#define EL_MM_DUMMY_END EL_MM_MASK_CIRCLE +#define EL_DEFAULT (EL_FIRST_DUMMY + 24) +#define EL_BD_DEFAULT (EL_FIRST_DUMMY + 25) +#define EL_SP_DEFAULT (EL_FIRST_DUMMY + 26) +#define EL_SB_DEFAULT (EL_FIRST_DUMMY + 27) +#define EL_MM_DEFAULT (EL_FIRST_DUMMY + 28) +#define EL_GRAPHIC_1 (EL_FIRST_DUMMY + 29) +#define EL_GRAPHIC_2 (EL_FIRST_DUMMY + 30) +#define EL_GRAPHIC_3 (EL_FIRST_DUMMY + 31) +#define EL_GRAPHIC_4 (EL_FIRST_DUMMY + 32) +#define EL_GRAPHIC_5 (EL_FIRST_DUMMY + 33) +#define EL_GRAPHIC_6 (EL_FIRST_DUMMY + 34) +#define EL_GRAPHIC_7 (EL_FIRST_DUMMY + 35) +#define EL_GRAPHIC_8 (EL_FIRST_DUMMY + 36) // internal elements (only used for internal purposes like copying) -#define EL_FIRST_INTERNAL (EL_FIRST_DUMMY + 47) +#define EL_FIRST_INTERNAL (EL_FIRST_DUMMY + 37) #define EL_INTERNAL_CLIPBOARD_CUSTOM (EL_FIRST_INTERNAL + 0) #define EL_INTERNAL_CLIPBOARD_CHANGE (EL_FIRST_INTERNAL + 1) @@ -2102,350 +2193,392 @@ #define EL_INTERNAL_CASCADE_CE_ACTIVE (EL_FIRST_INTERNAL + 29) #define EL_INTERNAL_CASCADE_GE (EL_FIRST_INTERNAL + 30) #define EL_INTERNAL_CASCADE_GE_ACTIVE (EL_FIRST_INTERNAL + 31) -#define EL_INTERNAL_CASCADE_REF (EL_FIRST_INTERNAL + 32) -#define EL_INTERNAL_CASCADE_REF_ACTIVE (EL_FIRST_INTERNAL + 33) -#define EL_INTERNAL_CASCADE_USER (EL_FIRST_INTERNAL + 34) -#define EL_INTERNAL_CASCADE_USER_ACTIVE (EL_FIRST_INTERNAL + 35) -#define EL_INTERNAL_CASCADE_DYNAMIC (EL_FIRST_INTERNAL + 36) -#define EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE (EL_FIRST_INTERNAL + 37) +#define EL_INTERNAL_CASCADE_ES (EL_FIRST_INTERNAL + 32) +#define EL_INTERNAL_CASCADE_ES_ACTIVE (EL_FIRST_INTERNAL + 33) +#define EL_INTERNAL_CASCADE_REF (EL_FIRST_INTERNAL + 34) +#define EL_INTERNAL_CASCADE_REF_ACTIVE (EL_FIRST_INTERNAL + 35) +#define EL_INTERNAL_CASCADE_USER (EL_FIRST_INTERNAL + 36) +#define EL_INTERNAL_CASCADE_USER_ACTIVE (EL_FIRST_INTERNAL + 37) +#define EL_INTERNAL_CASCADE_DYNAMIC (EL_FIRST_INTERNAL + 38) +#define EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE (EL_FIRST_INTERNAL + 39) #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 + 37) +#define EL_INTERNAL_END (EL_FIRST_INTERNAL + 39) -#define MAX_NUM_ELEMENTS (EL_FIRST_INTERNAL + 38) +#define MAX_NUM_ELEMENTS (EL_FIRST_INTERNAL + 40) // values for graphics/sounds action types -#define ACTION_DEFAULT 0 -#define ACTION_WAITING 1 -#define ACTION_FALLING 2 -#define ACTION_MOVING 3 -#define ACTION_DIGGING 4 -#define ACTION_SNAPPING 5 -#define ACTION_COLLECTING 6 -#define ACTION_DROPPING 7 -#define ACTION_PUSHING 8 -#define ACTION_WALKING 9 -#define ACTION_PASSING 10 -#define ACTION_IMPACT 11 -#define ACTION_BREAKING 12 -#define ACTION_ACTIVATING 13 -#define ACTION_DEACTIVATING 14 -#define ACTION_OPENING 15 -#define ACTION_CLOSING 16 -#define ACTION_ATTACKING 17 -#define ACTION_GROWING 18 -#define ACTION_SHRINKING 19 -#define ACTION_ACTIVE 20 -#define ACTION_FILLING 21 -#define ACTION_EMPTYING 22 -#define ACTION_CHANGING 23 -#define ACTION_EXPLODING 24 -#define ACTION_BORING 25 -#define ACTION_BORING_1 26 -#define ACTION_BORING_2 27 -#define ACTION_BORING_3 28 -#define ACTION_BORING_4 29 -#define ACTION_BORING_5 30 -#define ACTION_BORING_6 31 -#define ACTION_BORING_7 32 -#define ACTION_BORING_8 33 -#define ACTION_BORING_9 34 -#define ACTION_BORING_10 35 -#define ACTION_SLEEPING 36 -#define ACTION_SLEEPING_1 37 -#define ACTION_SLEEPING_2 38 -#define ACTION_SLEEPING_3 39 -#define ACTION_AWAKENING 40 -#define ACTION_DYING 41 -#define ACTION_TURNING 42 -#define ACTION_TURNING_FROM_LEFT 43 -#define ACTION_TURNING_FROM_RIGHT 44 -#define ACTION_TURNING_FROM_UP 45 -#define ACTION_TURNING_FROM_DOWN 46 -#define ACTION_SMASHED_BY_ROCK 47 -#define ACTION_SMASHED_BY_SPRING 48 -#define ACTION_EATING 49 -#define ACTION_TWINKLING 50 -#define ACTION_SPLASHING 51 -#define ACTION_HITTING 52 -#define ACTION_PAGE_1 53 -#define ACTION_PAGE_2 54 -#define ACTION_PAGE_3 55 -#define ACTION_PAGE_4 56 -#define ACTION_PAGE_5 57 -#define ACTION_PAGE_6 58 -#define ACTION_PAGE_7 59 -#define ACTION_PAGE_8 60 -#define ACTION_PAGE_9 61 -#define ACTION_PAGE_10 62 -#define ACTION_PAGE_11 63 -#define ACTION_PAGE_12 64 -#define ACTION_PAGE_13 65 -#define ACTION_PAGE_14 66 -#define ACTION_PAGE_15 67 -#define ACTION_PAGE_16 68 -#define ACTION_PAGE_17 69 -#define ACTION_PAGE_18 70 -#define ACTION_PAGE_19 71 -#define ACTION_PAGE_20 72 -#define ACTION_PAGE_21 73 -#define ACTION_PAGE_22 74 -#define ACTION_PAGE_23 75 -#define ACTION_PAGE_24 76 -#define ACTION_PAGE_25 77 -#define ACTION_PAGE_26 78 -#define ACTION_PAGE_27 79 -#define ACTION_PAGE_28 80 -#define ACTION_PAGE_29 81 -#define ACTION_PAGE_30 82 -#define ACTION_PAGE_31 83 -#define ACTION_PAGE_32 84 -#define ACTION_PART_1 85 -#define ACTION_PART_2 86 -#define ACTION_PART_3 87 -#define ACTION_PART_4 88 -#define ACTION_PART_5 89 -#define ACTION_PART_6 90 -#define ACTION_PART_7 91 -#define ACTION_PART_8 92 -#define ACTION_PART_9 93 -#define ACTION_PART_10 94 -#define ACTION_PART_11 95 -#define ACTION_PART_12 96 -#define ACTION_PART_13 97 -#define ACTION_PART_14 98 -#define ACTION_PART_15 99 -#define ACTION_PART_16 100 -#define ACTION_PART_17 101 -#define ACTION_PART_18 102 -#define ACTION_PART_19 103 -#define ACTION_PART_20 104 -#define ACTION_PART_21 105 -#define ACTION_PART_22 106 -#define ACTION_PART_23 107 -#define ACTION_PART_24 108 -#define ACTION_PART_25 109 -#define ACTION_PART_26 110 -#define ACTION_PART_27 111 -#define ACTION_PART_28 112 -#define ACTION_PART_29 113 -#define ACTION_PART_30 114 -#define ACTION_PART_31 115 -#define ACTION_PART_32 116 -#define ACTION_OTHER 117 - -#define NUM_ACTIONS 118 +enum +{ + ACTION_DEFAULT = 0, + ACTION_WAITING, + ACTION_FALLING, + ACTION_MOVING, + ACTION_DIGGING, + ACTION_SNAPPING, + ACTION_COLLECTING, + ACTION_DROPPING, + ACTION_PUSHING, + ACTION_WALKING, + ACTION_PASSING, + ACTION_IMPACT, + ACTION_BREAKING, + ACTION_ACTIVATING, + ACTION_DEACTIVATING, + ACTION_OPENING, + ACTION_CLOSING, + ACTION_ATTACKING, + ACTION_GROWING, + ACTION_SHRINKING, + ACTION_ACTIVE, + ACTION_FILLING, + ACTION_EMPTYING, + ACTION_CHANGING, + ACTION_EXPLODING, + ACTION_BORING, + ACTION_BORING_1, + ACTION_BORING_2, + ACTION_BORING_3, + ACTION_BORING_4, + ACTION_BORING_5, + ACTION_BORING_6, + ACTION_BORING_7, + ACTION_BORING_8, + ACTION_BORING_9, + ACTION_BORING_10, + ACTION_SLEEPING, + ACTION_SLEEPING_1, + ACTION_SLEEPING_2, + ACTION_SLEEPING_3, + ACTION_AWAKENING, + ACTION_DYING, + ACTION_TURNING, + ACTION_TURNING_FROM_LEFT, + ACTION_TURNING_FROM_RIGHT, + ACTION_TURNING_FROM_UP, + ACTION_TURNING_FROM_DOWN, + ACTION_SMASHED_BY_ROCK, + ACTION_SMASHED_BY_SPRING, + ACTION_EATING, + ACTION_TWINKLING, + ACTION_SPLASHING, + ACTION_HITTING, + ACTION_PAGE_1, + ACTION_PAGE_2, + ACTION_PAGE_3, + ACTION_PAGE_4, + ACTION_PAGE_5, + ACTION_PAGE_6, + ACTION_PAGE_7, + ACTION_PAGE_8, + ACTION_PAGE_9, + ACTION_PAGE_10, + ACTION_PAGE_11, + ACTION_PAGE_12, + ACTION_PAGE_13, + ACTION_PAGE_14, + ACTION_PAGE_15, + ACTION_PAGE_16, + ACTION_PAGE_17, + ACTION_PAGE_18, + ACTION_PAGE_19, + ACTION_PAGE_20, + ACTION_PAGE_21, + ACTION_PAGE_22, + ACTION_PAGE_23, + ACTION_PAGE_24, + ACTION_PAGE_25, + ACTION_PAGE_26, + ACTION_PAGE_27, + ACTION_PAGE_28, + ACTION_PAGE_29, + ACTION_PAGE_30, + ACTION_PAGE_31, + ACTION_PAGE_32, + ACTION_PART_1, + ACTION_PART_2, + ACTION_PART_3, + ACTION_PART_4, + ACTION_PART_5, + ACTION_PART_6, + ACTION_PART_7, + ACTION_PART_8, + ACTION_PART_9, + ACTION_PART_10, + ACTION_PART_11, + ACTION_PART_12, + ACTION_PART_13, + ACTION_PART_14, + ACTION_PART_15, + ACTION_PART_16, + ACTION_PART_17, + ACTION_PART_18, + ACTION_PART_19, + ACTION_PART_20, + ACTION_PART_21, + ACTION_PART_22, + ACTION_PART_23, + ACTION_PART_24, + ACTION_PART_25, + ACTION_PART_26, + ACTION_PART_27, + ACTION_PART_28, + ACTION_PART_29, + ACTION_PART_30, + ACTION_PART_31, + ACTION_PART_32, + ACTION_OTHER, + + NUM_ACTIONS +}; #define ACTION_BORING_LAST ACTION_BORING_10 #define ACTION_SLEEPING_LAST ACTION_SLEEPING_3 // values for special image configuration suffixes (must match game mode) -#define GFX_SPECIAL_ARG_DEFAULT 0 -#define GFX_SPECIAL_ARG_LOADING 1 -#define GFX_SPECIAL_ARG_TITLE_INITIAL 2 -#define GFX_SPECIAL_ARG_TITLE_INITIAL_1 3 -#define GFX_SPECIAL_ARG_TITLE_INITIAL_2 4 -#define GFX_SPECIAL_ARG_TITLE_INITIAL_3 5 -#define GFX_SPECIAL_ARG_TITLE_INITIAL_4 6 -#define GFX_SPECIAL_ARG_TITLE_INITIAL_5 7 -#define GFX_SPECIAL_ARG_TITLE 8 -#define GFX_SPECIAL_ARG_TITLE_1 9 -#define GFX_SPECIAL_ARG_TITLE_2 10 -#define GFX_SPECIAL_ARG_TITLE_3 11 -#define GFX_SPECIAL_ARG_TITLE_4 12 -#define GFX_SPECIAL_ARG_TITLE_5 13 -#define GFX_SPECIAL_ARG_MAIN 14 -#define GFX_SPECIAL_ARG_LEVELS 15 -#define GFX_SPECIAL_ARG_LEVELNR 16 -#define GFX_SPECIAL_ARG_SCORES 17 -#define GFX_SPECIAL_ARG_EDITOR 18 -#define GFX_SPECIAL_ARG_INFO 19 -#define GFX_SPECIAL_ARG_SETUP 20 -#define GFX_SPECIAL_ARG_PLAYING 21 -#define GFX_SPECIAL_ARG_DOOR 22 -#define GFX_SPECIAL_ARG_TAPE 23 -#define GFX_SPECIAL_ARG_PANEL 24 -#define GFX_SPECIAL_ARG_PREVIEW 25 -#define GFX_SPECIAL_ARG_CRUMBLED 26 -#define GFX_SPECIAL_ARG_MAINONLY 27 -#define GFX_SPECIAL_ARG_TYPENAME 28 -#define GFX_SPECIAL_ARG_SUBMENU 29 -#define GFX_SPECIAL_ARG_MENU 30 -#define GFX_SPECIAL_ARG_TOONS 31 -#define GFX_SPECIAL_ARG_SCORESOLD 32 -#define GFX_SPECIAL_ARG_SCORESNEW 33 -#define GFX_SPECIAL_ARG_NO_TITLE 34 -#define GFX_SPECIAL_ARG_FADING 35 -#define GFX_SPECIAL_ARG_QUIT 36 - -#define NUM_SPECIAL_GFX_ARGS 37 +enum +{ + GFX_SPECIAL_ARG_DEFAULT = 0, + GFX_SPECIAL_ARG_LOADING_INITIAL, + GFX_SPECIAL_ARG_LOADING, + GFX_SPECIAL_ARG_TITLE_INITIAL, + GFX_SPECIAL_ARG_TITLE_INITIAL_1, + GFX_SPECIAL_ARG_TITLE_INITIAL_2, + GFX_SPECIAL_ARG_TITLE_INITIAL_3, + GFX_SPECIAL_ARG_TITLE_INITIAL_4, + GFX_SPECIAL_ARG_TITLE_INITIAL_5, + GFX_SPECIAL_ARG_TITLE, + GFX_SPECIAL_ARG_TITLE_1, + GFX_SPECIAL_ARG_TITLE_2, + GFX_SPECIAL_ARG_TITLE_3, + GFX_SPECIAL_ARG_TITLE_4, + GFX_SPECIAL_ARG_TITLE_5, + GFX_SPECIAL_ARG_MAIN, + GFX_SPECIAL_ARG_NAMES, + GFX_SPECIAL_ARG_LEVELS, + GFX_SPECIAL_ARG_LEVELNR, + GFX_SPECIAL_ARG_SCORES, + GFX_SPECIAL_ARG_SCOREINFO, + GFX_SPECIAL_ARG_EDITOR, + GFX_SPECIAL_ARG_INFO, + GFX_SPECIAL_ARG_SETUP, + GFX_SPECIAL_ARG_PLAYING, + GFX_SPECIAL_ARG_DOOR, + GFX_SPECIAL_ARG_TAPE, + GFX_SPECIAL_ARG_PANEL, + GFX_SPECIAL_ARG_PREVIEW, + GFX_SPECIAL_ARG_CRUMBLED, + GFX_SPECIAL_ARG_MAINONLY, + GFX_SPECIAL_ARG_NAMESONLY, + GFX_SPECIAL_ARG_SCORESONLY, + GFX_SPECIAL_ARG_TYPENAME, + GFX_SPECIAL_ARG_TYPENAMES, + GFX_SPECIAL_ARG_SUBMENU, + GFX_SPECIAL_ARG_MENU, + GFX_SPECIAL_ARG_TOONS, + GFX_SPECIAL_ARG_SCORESOLD, + GFX_SPECIAL_ARG_SCORESNEW, + GFX_SPECIAL_ARG_NO_TITLE, + GFX_SPECIAL_ARG_FADING, + GFX_SPECIAL_ARG_RESTARTING, + GFX_SPECIAL_ARG_QUIT, + + NUM_SPECIAL_GFX_ARGS +}; // these additional definitions are currently only used for draw offsets -#define GFX_SPECIAL_ARG_INFO_MAIN 0 -#define GFX_SPECIAL_ARG_INFO_TITLE 1 -#define GFX_SPECIAL_ARG_INFO_ELEMENTS 2 -#define GFX_SPECIAL_ARG_INFO_MUSIC 3 -#define GFX_SPECIAL_ARG_INFO_CREDITS 4 -#define GFX_SPECIAL_ARG_INFO_PROGRAM 5 -#define GFX_SPECIAL_ARG_INFO_VERSION 6 -#define GFX_SPECIAL_ARG_INFO_LEVELSET 7 - -#define NUM_SPECIAL_GFX_INFO_ARGS 8 +enum +{ + GFX_SPECIAL_ARG_INFO_MAIN = 0, + GFX_SPECIAL_ARG_INFO_TITLE, + GFX_SPECIAL_ARG_INFO_ELEMENTS, + GFX_SPECIAL_ARG_INFO_MUSIC, + GFX_SPECIAL_ARG_INFO_CREDITS, + GFX_SPECIAL_ARG_INFO_PROGRAM, + GFX_SPECIAL_ARG_INFO_VERSION, + GFX_SPECIAL_ARG_INFO_LEVELSET, + + NUM_SPECIAL_GFX_INFO_ARGS +}; // these additional definitions are currently only used for draw offsets // (must match SETUP_MODE_* values as defined in src/screens.c) // (should also match corresponding entries in src/conf_gfx.c) -#define GFX_SPECIAL_ARG_SETUP_MAIN 0 -#define GFX_SPECIAL_ARG_SETUP_GAME 1 -#define GFX_SPECIAL_ARG_SETUP_EDITOR 2 -#define GFX_SPECIAL_ARG_SETUP_GRAPHICS 3 -#define GFX_SPECIAL_ARG_SETUP_SOUND 4 -#define GFX_SPECIAL_ARG_SETUP_ARTWORK 5 -#define GFX_SPECIAL_ARG_SETUP_INPUT 6 -#define GFX_SPECIAL_ARG_SETUP_TOUCH 7 -#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS 8 -#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1 9 -#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2 10 -#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3 11 -#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4 12 -#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5 13 -#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK 14 -#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER 15 - -#define NUM_SPECIAL_GFX_SETUP_ARGS 16 - +enum +{ + GFX_SPECIAL_ARG_SETUP_MAIN = 0, + GFX_SPECIAL_ARG_SETUP_GAME, + GFX_SPECIAL_ARG_SETUP_ENGINES, + GFX_SPECIAL_ARG_SETUP_EDITOR, + GFX_SPECIAL_ARG_SETUP_GRAPHICS, + GFX_SPECIAL_ARG_SETUP_SOUND, + GFX_SPECIAL_ARG_SETUP_ARTWORK, + GFX_SPECIAL_ARG_SETUP_INPUT, + GFX_SPECIAL_ARG_SETUP_TOUCH, + GFX_SPECIAL_ARG_SETUP_SHORTCUTS, + GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1, + GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2, + GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3, + GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4, + GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5, + GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK, + GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER, + + NUM_SPECIAL_GFX_SETUP_ARGS +}; // values for image configuration suffixes -#define GFX_ARG_X 0 -#define GFX_ARG_Y 1 -#define GFX_ARG_XPOS 2 -#define GFX_ARG_YPOS 3 -#define GFX_ARG_WIDTH 4 -#define GFX_ARG_HEIGHT 5 -#define GFX_ARG_VERTICAL 6 -#define GFX_ARG_OFFSET 7 -#define GFX_ARG_XOFFSET 8 -#define GFX_ARG_YOFFSET 9 -#define GFX_ARG_2ND_MOVEMENT_TILE 10 -#define GFX_ARG_2ND_VERTICAL 11 -#define GFX_ARG_2ND_OFFSET 12 -#define GFX_ARG_2ND_XOFFSET 13 -#define GFX_ARG_2ND_YOFFSET 14 -#define GFX_ARG_2ND_SWAP_TILES 15 -#define GFX_ARG_FRAMES 16 -#define GFX_ARG_FRAMES_PER_LINE 17 -#define GFX_ARG_START_FRAME 18 -#define GFX_ARG_DELAY 19 -#define GFX_ARG_ANIM_MODE 20 -#define GFX_ARG_GLOBAL_SYNC 21 -#define GFX_ARG_CRUMBLED_LIKE 22 -#define GFX_ARG_DIGGABLE_LIKE 23 -#define GFX_ARG_BORDER_SIZE 24 -#define GFX_ARG_STEP_OFFSET 25 -#define GFX_ARG_STEP_XOFFSET 26 -#define GFX_ARG_STEP_YOFFSET 27 -#define GFX_ARG_STEP_DELAY 28 -#define GFX_ARG_DIRECTION 29 -#define GFX_ARG_POSITION 30 -#define GFX_ARG_DRAW_XOFFSET 31 -#define GFX_ARG_DRAW_YOFFSET 32 -#define GFX_ARG_DRAW_MASKED 33 -#define GFX_ARG_DRAW_ORDER 34 -#define GFX_ARG_INIT_DELAY_FIXED 35 -#define GFX_ARG_INIT_DELAY_RANDOM 36 -#define GFX_ARG_ANIM_DELAY_FIXED 37 -#define GFX_ARG_ANIM_DELAY_RANDOM 38 -#define GFX_ARG_POST_DELAY_FIXED 39 -#define GFX_ARG_POST_DELAY_RANDOM 40 -#define GFX_ARG_INIT_EVENT 41 -#define GFX_ARG_INIT_EVENT_ACTION 42 -#define GFX_ARG_ANIM_EVENT 43 -#define GFX_ARG_ANIM_EVENT_ACTION 44 -#define GFX_ARG_NAME 45 -#define GFX_ARG_SCALE_UP_FACTOR 46 -#define GFX_ARG_TILE_SIZE 47 -#define GFX_ARG_CLONE_FROM 48 -#define GFX_ARG_FADE_MODE 49 -#define GFX_ARG_FADE_DELAY 50 -#define GFX_ARG_POST_DELAY 51 -#define GFX_ARG_AUTO_DELAY 52 -#define GFX_ARG_ALIGN 53 -#define GFX_ARG_VALIGN 54 -#define GFX_ARG_SORT_PRIORITY 55 -#define GFX_ARG_CLASS 56 -#define GFX_ARG_STYLE 57 -#define GFX_ARG_ACTIVE_XOFFSET 58 -#define GFX_ARG_ACTIVE_YOFFSET 59 -#define GFX_ARG_PRESSED_XOFFSET 60 -#define GFX_ARG_PRESSED_YOFFSET 61 - -#define NUM_GFX_ARGS 62 - +enum +{ + GFX_ARG_X = 0, + GFX_ARG_Y, + GFX_ARG_XPOS, + GFX_ARG_YPOS, + GFX_ARG_WIDTH, + GFX_ARG_HEIGHT, + GFX_ARG_VERTICAL, + GFX_ARG_OFFSET, + GFX_ARG_XOFFSET, + GFX_ARG_YOFFSET, + GFX_ARG_2ND_MOVEMENT_TILE, + GFX_ARG_2ND_VERTICAL, + GFX_ARG_2ND_OFFSET, + GFX_ARG_2ND_XOFFSET, + GFX_ARG_2ND_YOFFSET, + GFX_ARG_2ND_SWAP_TILES, + GFX_ARG_FRAMES, + GFX_ARG_FRAMES_PER_LINE, + GFX_ARG_START_FRAME, + GFX_ARG_DELAY, + GFX_ARG_ANIM_MODE, + GFX_ARG_GLOBAL_SYNC, + GFX_ARG_GLOBAL_ANIM_SYNC, + GFX_ARG_CRUMBLED_LIKE, + GFX_ARG_DIGGABLE_LIKE, + GFX_ARG_BORDER_SIZE, + GFX_ARG_STEP_OFFSET, + GFX_ARG_STEP_XOFFSET, + GFX_ARG_STEP_YOFFSET, + GFX_ARG_STEP_DELAY, + GFX_ARG_DIRECTION, + GFX_ARG_POSITION, + GFX_ARG_DRAW_XOFFSET, + GFX_ARG_DRAW_YOFFSET, + GFX_ARG_DRAW_MASKED, + GFX_ARG_DRAW_ORDER, + GFX_ARG_INIT_DELAY_FIXED, + GFX_ARG_INIT_DELAY_RANDOM, + GFX_ARG_INIT_DELAY_ACTION, + GFX_ARG_ANIM_DELAY_FIXED, + GFX_ARG_ANIM_DELAY_RANDOM, + GFX_ARG_ANIM_DELAY_ACTION, + GFX_ARG_POST_DELAY_FIXED, + GFX_ARG_POST_DELAY_RANDOM, + GFX_ARG_POST_DELAY_ACTION, + GFX_ARG_INIT_EVENT, + GFX_ARG_INIT_EVENT_ACTION, + GFX_ARG_ANIM_EVENT, + GFX_ARG_ANIM_EVENT_ACTION, + GFX_ARG_NAME, + GFX_ARG_SCALE_UP_FACTOR, + GFX_ARG_TILE_SIZE, + GFX_ARG_CLONE_FROM, + GFX_ARG_FADE_MODE, + GFX_ARG_FADE_DELAY, + GFX_ARG_POST_DELAY, + GFX_ARG_AUTO_DELAY, + GFX_ARG_AUTO_DELAY_UNIT, + GFX_ARG_ALIGN, + GFX_ARG_VALIGN, + GFX_ARG_SORT_PRIORITY, + GFX_ARG_CLASS, + GFX_ARG_STYLE, + GFX_ARG_ALPHA, + GFX_ARG_ACTIVE_XOFFSET, + GFX_ARG_ACTIVE_YOFFSET, + GFX_ARG_PRESSED_XOFFSET, + GFX_ARG_PRESSED_YOFFSET, + GFX_ARG_STACKED_XFACTOR, + GFX_ARG_STACKED_YFACTOR, + GFX_ARG_STACKED_XOFFSET, + GFX_ARG_STACKED_YOFFSET, + + NUM_GFX_ARGS +}; // values for sound configuration suffixes -#define SND_ARG_MODE_LOOP 0 -#define SND_ARG_VOLUME 1 -#define SND_ARG_PRIORITY 2 - -#define NUM_SND_ARGS 3 +enum +{ + SND_ARG_MODE_LOOP = 0, + SND_ARG_VOLUME, + SND_ARG_PRIORITY, + NUM_SND_ARGS +}; // values for music configuration suffixes -#define MUS_ARG_MODE_LOOP 0 - -#define NUM_MUS_ARGS 1 +enum +{ + MUS_ARG_MODE_LOOP = 0, + NUM_MUS_ARGS +}; // values for font configuration (definitions must match those from main.c) -#define FONT_INITIAL_1 0 -#define FONT_INITIAL_2 1 -#define FONT_INITIAL_3 2 -#define FONT_INITIAL_4 3 -#define FONT_TITLE_1 4 -#define FONT_TITLE_2 5 -#define FONT_MENU_1_ACTIVE 6 -#define FONT_MENU_2_ACTIVE 7 -#define FONT_MENU_1 8 -#define FONT_MENU_2 9 -#define FONT_TEXT_1_ACTIVE 10 -#define FONT_TEXT_2_ACTIVE 11 -#define FONT_TEXT_3_ACTIVE 12 -#define FONT_TEXT_4_ACTIVE 13 -#define FONT_TEXT_1 14 -#define FONT_TEXT_2 15 -#define FONT_TEXT_3 16 -#define FONT_TEXT_4 17 -#define FONT_ENVELOPE_1 18 -#define FONT_ENVELOPE_2 19 -#define FONT_ENVELOPE_3 20 -#define FONT_ENVELOPE_4 21 -#define FONT_REQUEST 22 -#define FONT_INPUT_1_ACTIVE 23 -#define FONT_INPUT_2_ACTIVE 24 -#define FONT_INPUT_1 25 -#define FONT_INPUT_2 26 -#define FONT_OPTION_OFF_NARROW 27 -#define FONT_OPTION_OFF 28 -#define FONT_OPTION_ON_NARROW 29 -#define FONT_OPTION_ON 30 -#define FONT_VALUE_1 31 -#define FONT_VALUE_2 32 -#define FONT_VALUE_OLD_NARROW 33 -#define FONT_VALUE_OLD 34 -#define FONT_VALUE_NARROW 35 -#define FONT_LEVEL_NUMBER_ACTIVE 36 -#define FONT_LEVEL_NUMBER 37 -#define FONT_TAPE_RECORDER 38 -#define FONT_GAME_INFO 39 -#define FONT_INFO_ELEMENTS 40 -#define FONT_INFO_LEVELSET 41 -#define FONT_MAIN_NETWORK_PLAYERS 42 - -#define NUM_FONTS 43 +enum +{ + FONT_INITIAL_1 = MAIN_FONT_INITIAL_1, + FONT_INITIAL_2 = MAIN_FONT_INITIAL_2, + FONT_INITIAL_3 = MAIN_FONT_INITIAL_3, + FONT_INITIAL_4 = MAIN_FONT_INITIAL_4, + FONT_TITLE_1, + FONT_TITLE_2, + FONT_MENU_1_ACTIVE, + FONT_MENU_2_ACTIVE, + FONT_MENU_1, + FONT_MENU_2, + FONT_TEXT_1_ACTIVE, + FONT_TEXT_2_ACTIVE, + FONT_TEXT_3_ACTIVE, + FONT_TEXT_4_ACTIVE, + FONT_TEXT_1, + FONT_TEXT_2, + FONT_TEXT_3, + FONT_TEXT_4, + FONT_ENVELOPE_1, + FONT_ENVELOPE_2, + FONT_ENVELOPE_3, + FONT_ENVELOPE_4, + FONT_REQUEST_NARROW, + FONT_REQUEST, + FONT_INPUT_1_ACTIVE, + FONT_INPUT_2_ACTIVE, + FONT_INPUT_1, + FONT_INPUT_2, + FONT_OPTION_OFF_NARROW, + FONT_OPTION_OFF, + FONT_OPTION_ON_NARROW, + FONT_OPTION_ON, + FONT_VALUE_1, + FONT_VALUE_2, + FONT_VALUE_OLD_NARROW, + FONT_VALUE_OLD, + FONT_VALUE_NARROW, + FONT_LEVEL_NUMBER_ACTIVE, + FONT_LEVEL_NUMBER, + FONT_TAPE_RECORDER, + FONT_GAME_INFO, + FONT_INFO_ELEMENTS, + FONT_INFO_LEVELSET, + FONT_MAIN_NETWORK_PLAYERS, + + NUM_FONTS +}; + #define NUM_INITIAL_FONTS 4 // values for toon animation configuration @@ -2471,45 +2604,52 @@ #define IMG_GLOBAL_BORDER_LAST IMG_GLOBAL_BORDER_PLAYING // values for game_status (must match special image configuration suffixes) -#define GAME_MODE_DEFAULT 0 -#define GAME_MODE_LOADING 1 -#define GAME_MODE_TITLE_INITIAL 2 -#define GAME_MODE_TITLE_INITIAL_1 3 -#define GAME_MODE_TITLE_INITIAL_2 4 -#define GAME_MODE_TITLE_INITIAL_3 5 -#define GAME_MODE_TITLE_INITIAL_4 6 -#define GAME_MODE_TITLE_INITIAL_5 7 -#define GAME_MODE_TITLE 8 -#define GAME_MODE_TITLE_1 9 -#define GAME_MODE_TITLE_2 10 -#define GAME_MODE_TITLE_3 11 -#define GAME_MODE_TITLE_4 12 -#define GAME_MODE_TITLE_5 13 -#define GAME_MODE_MAIN 14 -#define GAME_MODE_LEVELS 15 -#define GAME_MODE_LEVELNR 16 -#define GAME_MODE_SCORES 17 -#define GAME_MODE_EDITOR 18 -#define GAME_MODE_INFO 19 -#define GAME_MODE_SETUP 20 -#define GAME_MODE_PLAYING 21 -#define GAME_MODE_PSEUDO_DOOR 22 -#define GAME_MODE_PSEUDO_TAPE 23 -#define GAME_MODE_PSEUDO_PANEL 24 -#define GAME_MODE_PSEUDO_PREVIEW 25 -#define GAME_MODE_PSEUDO_CRUMBLED 26 -#define GAME_MODE_PSEUDO_MAINONLY 27 -#define GAME_MODE_PSEUDO_TYPENAME 28 -#define GAME_MODE_PSEUDO_SUBMENU 29 -#define GAME_MODE_PSEUDO_MENU 30 -#define GAME_MODE_PSEUDO_TOONS 31 -#define GAME_MODE_PSEUDO_SCORESOLD 32 -#define GAME_MODE_PSEUDO_SCORESNEW 33 -#define GAME_MODE_PSEUDO_NO_TITLE 34 -#define GAME_MODE_PSEUDO_FADING 35 -#define GAME_MODE_QUIT 36 - -#define NUM_GAME_MODES 37 +#define GAME_MODE_DEFAULT GFX_SPECIAL_ARG_DEFAULT +#define GAME_MODE_LOADING_INITIAL GFX_SPECIAL_ARG_LOADING_INITIAL +#define GAME_MODE_LOADING GFX_SPECIAL_ARG_LOADING +#define GAME_MODE_TITLE_INITIAL GFX_SPECIAL_ARG_TITLE_INITIAL +#define GAME_MODE_TITLE_INITIAL_1 GFX_SPECIAL_ARG_TITLE_INITIAL_1 +#define GAME_MODE_TITLE_INITIAL_2 GFX_SPECIAL_ARG_TITLE_INITIAL_2 +#define GAME_MODE_TITLE_INITIAL_3 GFX_SPECIAL_ARG_TITLE_INITIAL_3 +#define GAME_MODE_TITLE_INITIAL_4 GFX_SPECIAL_ARG_TITLE_INITIAL_4 +#define GAME_MODE_TITLE_INITIAL_5 GFX_SPECIAL_ARG_TITLE_INITIAL_5 +#define GAME_MODE_TITLE GFX_SPECIAL_ARG_TITLE +#define GAME_MODE_TITLE_1 GFX_SPECIAL_ARG_TITLE_1 +#define GAME_MODE_TITLE_2 GFX_SPECIAL_ARG_TITLE_2 +#define GAME_MODE_TITLE_3 GFX_SPECIAL_ARG_TITLE_3 +#define GAME_MODE_TITLE_4 GFX_SPECIAL_ARG_TITLE_4 +#define GAME_MODE_TITLE_5 GFX_SPECIAL_ARG_TITLE_5 +#define GAME_MODE_MAIN GFX_SPECIAL_ARG_MAIN +#define GAME_MODE_NAMES GFX_SPECIAL_ARG_NAMES +#define GAME_MODE_LEVELS GFX_SPECIAL_ARG_LEVELS +#define GAME_MODE_LEVELNR GFX_SPECIAL_ARG_LEVELNR +#define GAME_MODE_SCORES GFX_SPECIAL_ARG_SCORES +#define GAME_MODE_SCOREINFO GFX_SPECIAL_ARG_SCOREINFO +#define GAME_MODE_EDITOR GFX_SPECIAL_ARG_EDITOR +#define GAME_MODE_INFO GFX_SPECIAL_ARG_INFO +#define GAME_MODE_SETUP GFX_SPECIAL_ARG_SETUP +#define GAME_MODE_PLAYING GFX_SPECIAL_ARG_PLAYING +#define GAME_MODE_PSEUDO_DOOR GFX_SPECIAL_ARG_DOOR +#define GAME_MODE_PSEUDO_TAPE GFX_SPECIAL_ARG_TAPE +#define GAME_MODE_PSEUDO_PANEL GFX_SPECIAL_ARG_PANEL +#define GAME_MODE_PSEUDO_PREVIEW GFX_SPECIAL_ARG_PREVIEW +#define GAME_MODE_PSEUDO_CRUMBLED GFX_SPECIAL_ARG_CRUMBLED +#define GAME_MODE_PSEUDO_MAINONLY GFX_SPECIAL_ARG_MAINONLY +#define GAME_MODE_PSEUDO_NAMESONLY GFX_SPECIAL_ARG_NAMESONLY +#define GAME_MODE_PSEUDO_SCORESONLY GFX_SPECIAL_ARG_SCORESONLY +#define GAME_MODE_PSEUDO_TYPENAME GFX_SPECIAL_ARG_TYPENAME +#define GAME_MODE_PSEUDO_TYPENAMES GFX_SPECIAL_ARG_TYPENAMES +#define GAME_MODE_PSEUDO_SUBMENU GFX_SPECIAL_ARG_SUBMENU +#define GAME_MODE_PSEUDO_MENU GFX_SPECIAL_ARG_MENU +#define GAME_MODE_PSEUDO_TOONS GFX_SPECIAL_ARG_TOONS +#define GAME_MODE_PSEUDO_SCORESOLD GFX_SPECIAL_ARG_SCORESOLD +#define GAME_MODE_PSEUDO_SCORESNEW GFX_SPECIAL_ARG_SCORESNEW +#define GAME_MODE_PSEUDO_NO_TITLE GFX_SPECIAL_ARG_NO_TITLE +#define GAME_MODE_PSEUDO_FADING GFX_SPECIAL_ARG_FADING +#define GAME_MODE_PSEUDO_RESTARTING GFX_SPECIAL_ARG_RESTARTING +#define GAME_MODE_QUIT GFX_SPECIAL_ARG_QUIT + +#define NUM_GAME_MODES NUM_SPECIAL_GFX_ARGS // special definitions currently only used for custom artwork configuration #define MUSIC_PREFIX_BACKGROUND 0 @@ -2522,19 +2662,19 @@ // program information and versioning definitions #define PROGRAM_VERSION_SUPER 4 -#define PROGRAM_VERSION_MAJOR 1 -#define PROGRAM_VERSION_MINOR 1 -#define PROGRAM_VERSION_PATCH 1 +#define PROGRAM_VERSION_MAJOR 3 +#define PROGRAM_VERSION_MINOR 8 +#define PROGRAM_VERSION_PATCH 2 #define PROGRAM_VERSION_EXTRA "" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" #define PROGRAM_EMAIL_STRING "info@artsoft.org" -#define PROGRAM_WEBSITE_STRING "http://www.artsoft.org/" -#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-2018 by Holger Schemel" +#define PROGRAM_WEBSITE_STRING "https://www.artsoft.org/" +#define PROGRAM_COPYRIGHT_STRING "1995-2024 by Holger Schemel" #define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment" -#define PROGRAM_ICON_FILENAME "RocksIcon32x32.png" +#define PROGRAM_ICON_FILENAME "icons/icon.png" #define COOKIE_PREFIX "ROCKSNDIAMONDS" @@ -2572,7 +2712,7 @@ // values for game_emulation #define EMU_NONE 0 #define EMU_BOULDERDASH 1 -#define EMU_SOKOBAN 2 +#define EMU_UNUSED_2 2 #define EMU_SUPAPLEX 3 // values for level file type identifier @@ -2603,6 +2743,9 @@ #define AUTOPLAY_FFWD (1 << 1) #define AUTOPLAY_WARP (1 << 2) #define AUTOPLAY_TEST (1 << 3) +#define AUTOPLAY_SAVE (1 << 4) +#define AUTOPLAY_UPLOAD (1 << 5) +#define AUTOPLAY_FIX (1 << 6) #define AUTOPLAY_WARP_NO_DISPLAY AUTOPLAY_TEST #define AUTOPLAY_MODE_NONE 0 @@ -2610,6 +2753,9 @@ #define AUTOPLAY_MODE_FFWD (AUTOPLAY_MODE_PLAY | AUTOPLAY_FFWD) #define AUTOPLAY_MODE_WARP (AUTOPLAY_MODE_FFWD | AUTOPLAY_WARP) #define AUTOPLAY_MODE_TEST (AUTOPLAY_MODE_WARP | AUTOPLAY_TEST) +#define AUTOPLAY_MODE_SAVE (AUTOPLAY_MODE_TEST | AUTOPLAY_SAVE) +#define AUTOPLAY_MODE_UPLOAD (AUTOPLAY_MODE_TEST | AUTOPLAY_UPLOAD) +#define AUTOPLAY_MODE_FIX (AUTOPLAY_MODE_TEST | AUTOPLAY_FIX) #define AUTOPLAY_MODE_WARP_NO_DISPLAY AUTOPLAY_MODE_TEST @@ -2624,10 +2770,15 @@ struct RequestButtonInfo struct TextPosInfo yes; struct TextPosInfo no; struct TextPosInfo confirm; + struct TextPosInfo player_1; struct TextPosInfo player_2; struct TextPosInfo player_3; struct TextPosInfo player_4; + + struct TextPosInfo touch_yes; + struct TextPosInfo touch_no; + struct TextPosInfo touch_confirm; }; struct MenuMainButtonInfo @@ -2650,6 +2801,9 @@ struct MenuMainButtonInfo struct MenuPosInfo insert_solution; struct MenuPosInfo play_solution; + + struct MenuPosInfo levelset_info; + struct MenuPosInfo switch_ecs_aga; }; struct MenuMainTextInfo @@ -2694,12 +2848,43 @@ struct MenuMainInfo struct TextPosInfo network_players; }; +struct MenuSetupButtonInfo +{ + struct MenuPosInfo prev_player; + struct MenuPosInfo next_player; + + struct MenuPosInfo touch_back; + struct MenuPosInfo touch_next; + struct MenuPosInfo touch_back2; + struct MenuPosInfo touch_next2; +}; + +struct MenuSetupInfo +{ + struct MenuSetupButtonInfo button; +}; + +struct MenuScoresButtonInfo +{ + struct MenuPosInfo prev_level; + struct MenuPosInfo next_level; + struct MenuPosInfo prev_score; + struct MenuPosInfo next_score; + struct MenuPosInfo play_tape; +}; + +struct MenuScoresInfo +{ + struct MenuScoresButtonInfo button; +}; + struct TitleFadingInfo { int fade_mode; int fade_delay; int post_delay; int auto_delay; + int auto_delay_unit; }; struct TitleMessageInfo @@ -2718,11 +2903,14 @@ struct TitleMessageInfo int fade_delay; int post_delay; int auto_delay; + int auto_delay_unit; }; struct InitInfo { + struct MenuPosInfo busy_initial; struct MenuPosInfo busy; + struct MenuPosInfo busy_playfield; }; struct MenuInfo @@ -2736,12 +2924,17 @@ struct MenuInfo int scrollbar_xoffset; + struct MenuPosInfo list_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int list_size[NUM_SPECIAL_GFX_ARGS]; int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int list_entry_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int tile_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; int left_spacing[NUM_SPECIAL_GFX_ARGS]; int left_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; int left_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int middle_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; int right_spacing[NUM_SPECIAL_GFX_ARGS]; int right_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; int right_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; @@ -2778,6 +2971,8 @@ struct MenuInfo int music[NUM_SPECIAL_GFX_ARGS]; struct MenuMainInfo main; + struct MenuSetupInfo setup; + struct MenuScoresInfo scores; }; struct DoorInfo @@ -2813,9 +3008,15 @@ struct RequestInfo int anim_mode; int align; int valign; + int sort_priority; boolean autowrap; boolean centered; boolean wrap_single_words; + + // run-time values + Bitmap *bitmap; + int sx, sy; + int xsize, ysize; }; struct PreviewInfo @@ -2828,6 +3029,8 @@ struct PreviewInfo int step_offset; int step_delay; int anim_mode; + + boolean redefined; // redefined by custom artwork }; struct EditorTabsInfo @@ -2948,10 +3151,45 @@ struct ViewportInfo struct RectWithBorder door_2[NUM_SPECIAL_GFX_ARGS]; }; -struct HiScore +struct ScoreEntry { - char Name[MAX_PLAYER_NAME_LEN + 1]; - int Score; + char tape_basename[MAX_FILENAME_LEN + 1]; + char name[MAX_PLAYER_NAME_LEN + 1]; + int score; + int time; // time (in frames) or steps played + + // additional score information for score info screen + int id; + char tape_date[MAX_ISO_DATE_LEN + 1]; + char platform[MAX_PLATFORM_TEXT_LEN + 1]; + char version[MAX_VERSION_TEXT_LEN + 1]; + char country_code[MAX_COUNTRY_CODE_LEN + 1]; + char country_name[MAX_COUNTRY_NAME_LEN + 1]; +}; + +struct ScoreInfo +{ + int file_version; // file format version the score is stored with + int game_version; // game release version the score was created with + + char level_identifier[MAX_FILENAME_LEN + 1]; + int level_nr; + + int num_entries; + int last_added; + int last_added_local; + int last_level_nr; + int last_entry_nr; + int next_level_nr; + + boolean updated; + boolean uploaded; + boolean tape_downloaded; + boolean force_last_added; + boolean continue_playing; + boolean continue_on_return; + + struct ScoreEntry entry[MAX_SCORE_ENTRIES]; }; struct Content @@ -3017,6 +3255,7 @@ struct LevelInfo int time; // available time (seconds) int gems_needed; boolean auto_count_gems; + boolean rate_time_over_score; char name[MAX_LEVEL_NAME_LEN + 1]; char author[MAX_LEVEL_AUTHOR_LEN + 1]; @@ -3062,7 +3301,7 @@ struct LevelInfo int android_move_time; int android_clone_time; boolean ball_random; - boolean ball_state_initial; + boolean ball_active_initial; int ball_time; int lenses_score; int magnify_score; @@ -3101,6 +3340,8 @@ struct LevelInfo boolean sb_objects_needed; // all Sokoban objects must be solved boolean auto_exit_sokoban; // automatically finish solved Sokoban levels boolean solved_by_one_player; // level is solved if one player enters exit + boolean finish_dig_collect; // only finished dig/collect triggers ce action + boolean keep_walkable_ce; // keep walkable CE if it changes to the player boolean continuous_snapping; // repeated snapping without releasing key boolean block_snap_field; // snapping blocks field to show animation @@ -3115,9 +3356,17 @@ struct LevelInfo int mm_time_ball; int mm_time_block; + int num_mm_ball_contents; + int mm_ball_choice_mode; + int mm_ball_content[MAX_MM_BALL_CONTENTS]; + boolean rotate_mm_ball_content; + boolean explode_mm_ball; + // ('int' instead of 'boolean' because used as selectbox value in editor) int use_step_counter; // count steps instead of seconds for level + int time_score_base; // use time score for 1 or 10 seconds/steps + short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; boolean use_custom_template; // use custom properties from template file @@ -3148,13 +3397,26 @@ struct GlobalInfo { char *autoplay_leveldir; int autoplay_level[MAX_TAPES_PER_SET]; + int autoplay_mode; boolean autoplay_all; - boolean autoplay_mode; + time_t autoplay_time; + + char *patchtapes_mode; + char *patchtapes_leveldir; + int patchtapes_level[MAX_TAPES_PER_SET]; + boolean patchtapes_all; char *convert_leveldir; int convert_level_nr; - char *create_images_dir; + char *dumplevel_leveldir; + int dumplevel_level_nr; + + char *dumptape_leveldir; + int dumptape_level_nr; + + char *create_sketch_images_dir; + char *create_collect_images_dir; int num_toons; @@ -3169,6 +3431,8 @@ struct GlobalInfo int anim_status_next; boolean use_envelope_request; + + char **user_names; }; struct ElementChangeInfo @@ -3215,6 +3479,8 @@ struct ElementChangeInfo void (*post_change_function)(int x, int y); short actual_trigger_element; // element that actually triggered change + int actual_trigger_x; // element x position that triggered change + int actual_trigger_y; // element y position that triggered change int actual_trigger_side; // element side that triggered the change int actual_trigger_player; // player which actually triggered change int actual_trigger_player_bits; // player bits of triggering players @@ -3302,6 +3568,8 @@ struct ElementInfo int drop_delay_random; // additional random delay after dropping int move_delay_fixed; // constant delay after moving int move_delay_random; // additional random delay after moving + int step_delay_fixed; // constant delay while moving + int step_delay_random; // additional random delay while moving int move_pattern; // direction movable element moves to int move_direction_initial; // initial direction element moves to @@ -3327,6 +3595,8 @@ struct ElementInfo struct ElementGroupInfo *group; // pointer to element group info + boolean has_anim_event; // element can trigger global animation + // ---------- internal values used at runtime when playing ---------- boolean has_change_event[NUM_CHANGE_EVENTS]; @@ -3387,6 +3657,18 @@ struct GlobalAnimInfo int music[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS]; }; +struct GlobalAnimEventListInfo +{ + int *event_value; + int num_event_values; +}; + +struct GlobalAnimEventInfo +{ + struct GlobalAnimEventListInfo **event_list; + int num_event_lists; +}; + struct GraphicInfo { Bitmap **bitmaps; // bitmaps in all required sizes @@ -3411,6 +3693,7 @@ struct GraphicInfo int anim_mode; boolean anim_global_sync; + boolean anim_global_anim_sync; int crumbled_like; // element for cloning crumble graphics int diggable_like; // element for cloning digging graphics @@ -3424,10 +3707,13 @@ struct GraphicInfo int init_delay_fixed; // optional initial delay values for global int init_delay_random; // animations (pause interval before start) + int init_delay_action; // optional action called on animation start int anim_delay_fixed; // optional delay values for bored/sleeping int anim_delay_random; // and global animations (animation length) + int anim_delay_action; // optional action called on animation end int post_delay_fixed; // optional delay values after bored/global int post_delay_random; // animations (pause before next animation) + int post_delay_action; // optional action called after post delay int init_event; // optional event triggering animation start int init_event_action; // optional action called on animation start @@ -3453,17 +3739,24 @@ struct GraphicInfo int fade_delay; // optional setting for drawing title screens int post_delay; // optional setting for drawing title screens int auto_delay; // optional setting for drawing title screens + int auto_delay_unit; // optional setting for drawing title screens int align, valign; // optional setting for drawing title screens int sort_priority; // optional setting for drawing title screens int class; int style; + int alpha; int active_xoffset; int active_yoffset; int pressed_xoffset; int pressed_yoffset; + int stacked_xfactor; + int stacked_yfactor; + int stacked_xoffset; + int stacked_yoffset; + boolean use_image_size; // use image size as default width and height }; @@ -3493,17 +3786,19 @@ struct MusicFileInfo char *artist_header; char *album_header; char *year_header; + char *played_header; char *title; char *artist; char *album; char *year; + char *played; int music; boolean is_sound; - struct MusicFileInfo *next; + struct MusicFileInfo *prev, *next; }; struct ElementActionInfo @@ -3536,7 +3831,6 @@ struct HelpAnimInfo extern Bitmap *bitmap_db_field; -extern Bitmap *bitmap_db_panel; extern Bitmap *bitmap_db_door_1; extern Bitmap *bitmap_db_door_2; extern Bitmap *bitmap_db_store_1; @@ -3545,15 +3839,14 @@ extern DrawBuffer *fieldbuffer; extern DrawBuffer *drawto_field; extern int game_status; -extern boolean game_status_last_screen; +extern int game_status_last_screen; extern boolean level_editor_test_game; +extern boolean score_info_tape_play; extern boolean network_playing; -extern boolean network_server; -extern SDL_Thread *server_thread; extern int key_joystick_mapping; -extern short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern short Tile[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short Last[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; @@ -3584,7 +3877,9 @@ extern int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern int GfxRandomStatic[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern int GfxElementEmpty[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxRedraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; @@ -3633,7 +3928,7 @@ extern boolean network_player_action_received; extern int graphics_action_mapping[]; extern struct LevelInfo level, level_template; -extern struct HiScore highscore[]; +extern struct ScoreInfo scores, server_scores; extern struct TapeInfo tape; extern struct GlobalInfo global; extern struct BorderInfo border; @@ -3676,6 +3971,7 @@ extern struct TokenIntPtrInfo image_config_vars[]; extern struct FontInfo font_info[]; extern struct GlobalAnimInfo global_anim_info[]; extern struct GlobalAnimNameInfo global_anim_name_info[]; +extern struct GlobalAnimEventInfo global_anim_event_info; extern struct MusicPrefixInfo music_prefix_info[]; extern struct GraphicInfo *graphic_info; extern struct SoundInfo *sound_info; @@ -3688,6 +3984,7 @@ extern SetupFileHash *element_token_hash; extern SetupFileHash *graphic_token_hash; extern SetupFileHash *font_token_hash; extern SetupFileHash *hide_setup_hash; +extern SetupFileHash *anim_url_hash; extern struct ConfigTypeInfo image_config_suffix[]; extern struct ConfigTypeInfo sound_config_suffix[]; extern struct ConfigTypeInfo music_config_suffix[];