X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=3b8863640ed4cf5dbc5bb663909761c895db3ddf;hb=615a8c2934804dacec082ba713078d9fd7070b12;hp=3f9f9177b39dbb4c5401082ca1b71cc851cd4f4c;hpb=6ee3c137f499f7a288b95b9455efcafa1aa0e774;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 3f9f9177..3b886364 100644 --- a/src/main.h +++ b/src/main.h @@ -68,8 +68,8 @@ #define EP_UNUSED_4 4 #define EP_INDESTRUCTIBLE 5 #define EP_SLIPPERY 6 -#define EP_UNUSED_7 7 -#define EP_UNUSED_8 8 +#define EP_CAN_EXPLODE 7 +#define EP_CAN_MOVE 8 #define EP_CAN_FALL 9 #define EP_CAN_SMASH 10 #define EP_WALKABLE_OVER 11 @@ -90,50 +90,53 @@ /* values for special configurable properties (depending on level settings) */ #define EP_EM_SLIPPERY_WALL 25 +/* values for special graphics properties (no effect on game engine) */ +#define EP_CAN_BE_CRUMBLED 26 + /* values for pre-defined properties */ -#define EP_PLAYER 26 -#define EP_CAN_BE_CRUMBLED 27 -#define EP_CAN_MOVE 28 -#define EP_CAN_PASS_MAGIC_WALL 29 -#define EP_SWITCHABLE 30 -#define EP_DONT_TOUCH 31 -#define EP_ENEMY 32 -#define EP_DONT_GO_TO 33 -#define EP_CAN_EXPLODE 34 -#define EP_BD_ELEMENT 35 -#define EP_SP_ELEMENT 36 -#define EP_SB_ELEMENT 37 -#define EP_GEM 38 -#define EP_FOOD_DARK_YAMYAM 39 -#define EP_FOOD_PENGUIN 40 -#define EP_FOOD_PIG 41 -#define EP_HISTORIC_WALL 42 -#define EP_HISTORIC_SOLID 43 -#define EP_BELT 44 -#define EP_BELT_ACTIVE 45 -#define EP_BELT_SWITCH 46 -#define EP_TUBE 47 -#define EP_KEYGATE 48 -#define EP_AMOEBOID 49 -#define EP_AMOEBALIVE 50 -#define EP_HAS_CONTENT 51 -#define EP_ACTIVE_BOMB 52 -#define EP_INACTIVE 53 +#define EP_PLAYER 27 +#define EP_CAN_PASS_MAGIC_WALL 28 +#define EP_SWITCHABLE 29 +#define EP_DONT_TOUCH 30 +#define EP_ENEMY 31 +#define EP_DONT_GO_TO 32 +#define EP_BD_ELEMENT 33 +#define EP_SP_ELEMENT 34 +#define EP_SB_ELEMENT 35 +#define EP_GEM 36 +#define EP_FOOD_DARK_YAMYAM 37 +#define EP_FOOD_PENGUIN 38 +#define EP_FOOD_PIG 39 +#define EP_HISTORIC_WALL 40 +#define EP_HISTORIC_SOLID 41 +#define EP_BELT 42 +#define EP_BELT_ACTIVE 43 +#define EP_BELT_SWITCH 44 +#define EP_TUBE 45 +#define EP_KEYGATE 46 +#define EP_AMOEBOID 47 +#define EP_AMOEBALIVE 48 +#define EP_HAS_CONTENT 49 +#define EP_ACTIVE_BOMB 50 +#define EP_INACTIVE 51 /* values for derived properties (determined from properties above) */ -#define EP_ACCESSIBLE_OVER 54 -#define EP_ACCESSIBLE_INSIDE 55 -#define EP_ACCESSIBLE_UNDER 56 -#define EP_WALKABLE 57 -#define EP_PASSABLE 58 -#define EP_ACCESSIBLE 59 -#define EP_SNAPPABLE 60 -#define EP_WALL 61 -#define EP_SOLID_FOR_PUSHING 62 -#define EP_DRAGONFIRE_PROOF 63 -#define EP_EXPLOSION_PROOF 64 - -#define NUM_ELEMENT_PROPERTIES 65 +#define EP_ACCESSIBLE_OVER 52 +#define EP_ACCESSIBLE_INSIDE 53 +#define EP_ACCESSIBLE_UNDER 54 +#define EP_WALKABLE 55 +#define EP_PASSABLE 56 +#define EP_ACCESSIBLE 57 +#define EP_SNAPPABLE 58 +#define EP_WALL 59 +#define EP_SOLID_FOR_PUSHING 60 +#define EP_DRAGONFIRE_PROOF 61 +#define EP_EXPLOSION_PROOF 62 + +/* values for internal purpose only (level editor) */ +#define EP_WALK_TO_OBJECT 63 + +#define NUM_ELEMENT_PROPERTIES 64 #define NUM_EP_BITFIELDS ((NUM_ELEMENT_PROPERTIES + 31) / 32) #define EP_BITFIELD_BASE 0 @@ -149,17 +152,14 @@ /* values for change events for custom elements */ -#define CE_DELAY_FIXED 0 -#define CE_DELAY_RANDOM 1 +#define CE_DELAY 0 -#define NUM_CHANGE_EVENTS 2 +#define NUM_CHANGE_EVENTS 1 #define CE_BITMASK_DEFAULT 0 -#define CUSTOM_ELEMENT_INFO(e) (level.custom_element[(e) - EL_CUSTOM_START]) - #define CH_EVENT_BIT(c) (1 << (c)) -#define CH_EVENT_VAR(e) (CUSTOM_ELEMENT_INFO(e).change.events) +#define CH_EVENT_VAR(e) (element_info[e].change.events) #define HAS_CHANGE_EVENT(e,c) (IS_CUSTOM_ELEMENT(e) && \ (CH_EVENT_VAR(e) & CH_EVENT_BIT(c)) != 0) @@ -174,6 +174,8 @@ #define IS_COLLECTIBLE(e) HAS_PROPERTY(e, EP_COLLECTIBLE) #define IS_INDESTRUCTIBLE(e) HAS_PROPERTY(e, EP_INDESTRUCTIBLE) #define IS_SLIPPERY(e) HAS_PROPERTY(e, EP_SLIPPERY) +#define CAN_EXPLODE(e) HAS_PROPERTY(e, EP_CAN_EXPLODE) +#define CAN_MOVE(e) HAS_PROPERTY(e, EP_CAN_MOVE) #define CAN_FALL(e) HAS_PROPERTY(e, EP_CAN_FALL) #define CAN_SMASH(e) HAS_PROPERTY(e, EP_CAN_SMASH) #define IS_WALKABLE_OVER(e) HAS_PROPERTY(e, EP_WALKABLE_OVER) @@ -188,16 +190,16 @@ /* macros for special configurable properties */ #define IS_EM_SLIPPERY_WALL(e) HAS_PROPERTY(e, EP_EM_SLIPPERY_WALL) +/* macros for special graphics properties */ +#define CAN_BE_CRUMBLED(e) HAS_PROPERTY(GFX_ELEMENT(e),EP_CAN_BE_CRUMBLED) + /* macros for pre-defined properties */ #define ELEM_IS_PLAYER(e) HAS_PROPERTY(e, EP_PLAYER) -#define CAN_BE_CRUMBLED(e) HAS_PROPERTY(e, EP_CAN_BE_CRUMBLED) -#define CAN_MOVE(e) HAS_PROPERTY(e, EP_CAN_MOVE) #define CAN_PASS_MAGIC_WALL(e) HAS_PROPERTY(e, EP_CAN_PASS_MAGIC_WALL) #define IS_SWITCHABLE(e) HAS_PROPERTY(e, EP_SWITCHABLE) #define DONT_TOUCH(e) HAS_PROPERTY(e, EP_DONT_TOUCH) #define IS_ENEMY(e) HAS_PROPERTY(e, EP_ENEMY) #define DONT_GO_TO(e) HAS_PROPERTY(e, EP_DONT_GO_TO) -#define IS_CAN_EXPLODE(e) HAS_PROPERTY(e, EP_CAN_EXPLODE) #define IS_BD_ELEMENT(e) HAS_PROPERTY(e, EP_BD_ELEMENT) #define IS_SP_ELEMENT(e) HAS_PROPERTY(e, EP_SP_ELEMENT) #define IS_SB_ELEMENT(e) HAS_PROPERTY(e, EP_SB_ELEMENT) @@ -231,9 +233,12 @@ #define IS_DRAGONFIRE_PROOF(e) HAS_PROPERTY(e, EP_DRAGONFIRE_PROOF) #define IS_EXPLOSION_PROOF(e) HAS_PROPERTY(e, EP_EXPLOSION_PROOF) -#define IS_CUSTOM_ELEMENT(e) ((e) >= EL_CUSTOM_START && \ +#define IS_CUSTOM_ELEMENT(e) ((e) >= EL_CUSTOM_START && \ (e) <= EL_CUSTOM_END) +#define GFX_ELEMENT(e) (element_info[e].use_gfx_element ? \ + element_info[e].gfx_element : e) + #define IS_PLAYER(x,y) (ELEM_IS_PLAYER(StorePlayer[x][y])) #define IS_FREE(x,y) (Feld[x][y] == EL_EMPTY && !IS_PLAYER(x,y)) @@ -279,56 +284,11 @@ #define IS_LOOP_SOUND(s) (sound_info[s].loop) -#if 0 - -/* Bitmaps with graphic file */ -#define PIX_BACK 0 -#define PIX_DOOR 1 -#define PIX_TOONS 2 -#define PIX_FONT_BIG 3 -#define PIX_FONT_SMALL 4 -#define PIX_FONT_MEDIUM 5 -#define PIX_FONT_EM 6 -/* Bitmaps without graphic file */ -#define PIX_DB_DOOR 7 -#define PIX_DB_FIELD 8 - -#define NUM_PICTURES 7 -#define NUM_BITMAPS 9 - -#else - -/* Bitmaps with graphic file */ -#define PIX_BACK 0 -#define PIX_ELEMENTS 1 -#define PIX_DOOR 2 -#define PIX_HEROES 3 -#define PIX_TOONS 4 -#define PIX_SP 5 -#define PIX_DC 6 -#define PIX_MORE 7 -#define PIX_FONT_BIG 8 -#define PIX_FONT_SMALL 9 -#define PIX_FONT_MEDIUM 10 -#define PIX_FONT_EM 11 -/* Bitmaps without graphic file */ -#define PIX_DB_DOOR 12 -#define PIX_DB_FIELD 13 - -#define NUM_PICTURES 12 -#define NUM_BITMAPS 14 - -#endif - /* boundaries of arrays etc. */ #define MAX_LEVEL_NAME_LEN 32 #define MAX_LEVEL_AUTHOR_LEN 32 #define MAX_TAPELEN (1000 * 50) /* max. time * framerate */ #define MAX_SCORE_ENTRIES 100 -#if 0 -#define MAX_ELEMENTS 700 /* 500 static + 200 runtime */ -#define MAX_GRAPHICS 1536 /* see below: NUM_TILES */ -#endif #define MAX_NUM_AMOEBA 100 /* values for elements with content */ @@ -937,6 +897,7 @@ #define PROGRAM_VERSION_MAJOR 2 #define PROGRAM_VERSION_MINOR 2 #define PROGRAM_VERSION_PATCH 0 +#define PROGRAM_VERSION_RELEASE 7 #define PROGRAM_VERSION_STRING "2.2.0rc7" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" @@ -984,9 +945,10 @@ #define GAME_VERSION_1_4 FILE_VERSION_1_4 #define GAME_VERSION_2_0 FILE_VERSION_2_0 -#define GAME_VERSION_ACTUAL VERSION_IDENT(PROGRAM_VERSION_MAJOR, \ +#define GAME_VERSION_ACTUAL RELEASE_IDENT(PROGRAM_VERSION_MAJOR, \ PROGRAM_VERSION_MINOR, \ - PROGRAM_VERSION_PATCH) + PROGRAM_VERSION_PATCH, \ + PROGRAM_VERSION_RELEASE) /* values for game_emulation */ #define EMU_NONE 0 @@ -1055,21 +1017,6 @@ struct PlayerInfo int shield_deadly_time_left; }; -struct CustomElementChangeInfo -{ - unsigned long events; /* bitfield for change events */ - - short successor; /* new custom element after change */ - - int delay_fixed; /* added frame delay before changed (fixed) */ - int delay_random; /* added frame delay before changed (random) */ -}; - -struct CustomElementInfo -{ - struct CustomElementChangeInfo change; -}; - struct LevelInfo { int file_version; /* file format version the level is stored with */ @@ -1086,8 +1033,8 @@ struct LevelInfo char name[MAX_LEVEL_NAME_LEN + 1]; char author[MAX_LEVEL_AUTHOR_LEN + 1]; int score[LEVEL_SCORE_ELEMENTS]; - int yam_content[MAX_ELEMENT_CONTENTS][3][3]; - int num_yam_contents; + int yamyam_content[MAX_ELEMENT_CONTENTS][3][3]; + int num_yamyam_contents; int amoeba_speed; int amoeba_content; int time_magic_wall; @@ -1098,8 +1045,6 @@ struct LevelInfo boolean gravity; boolean em_slippery_gems; /* EM style "gems slip from wall" behaviour */ - struct CustomElementInfo custom_element[NUM_CUSTOM_ELEMENTS]; - boolean no_level_file; }; @@ -1145,7 +1090,7 @@ struct GameInfo int initial_move_delay_value; /* variable within running game */ - int yam_content_nr; + int yamyam_content_nr; boolean magic_wall_active; int magic_wall_time_left; int light_time_left; @@ -1183,13 +1128,28 @@ struct DoorInfo int step_delay; }; +struct ElementChangeInfo +{ + unsigned long events; /* bitfield for change events */ + + 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 successor; /* new custom element after change */ +}; + struct ElementInfo { + /* ---------- token and description strings ---------- */ + char *token_name; /* element token used in config files */ char *class_name; /* element class used in config files */ char *editor_description; /* short description for level editor */ char *custom_description; /* custom description for level editor */ + /* ---------- graphic and sound definitions ---------- */ + int graphic[NUM_ACTIONS]; /* default graphics for several actions */ int direction_graphic[NUM_ACTIONS][NUM_DIRECTIONS]; /* special graphics for left/right/up/down */ @@ -1197,6 +1157,29 @@ struct ElementInfo /* special graphics for certain screens */ int sound[NUM_ACTIONS]; /* default sounds for several actions */ + + /* ---------- special element property values ---------- */ + + boolean use_template; /* use all properties from template file */ + + boolean use_gfx_element; + short gfx_element; /* optional custom graphic element */ + + int score; /* score for collection, smashing, ... */ + + int push_delay_fixed; /* constant frame delay for pushing */ + int push_delay_random; /* additional random frame delay for pushing */ + int move_delay_fixed; /* constant frame delay for moving */ + int move_delay_random; /* additional random frame delay for moving */ + + int move_direction; /* direction movable element moves to */ + + int walk_to_action; /* only for level editor; not stored */ + int walkable_layer; /* only for level editor; not stored */ + + int content[3][3]; /* new elements after explosion */ + + struct ElementChangeInfo change; }; struct FontInfo