X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=aa5926f5fb30692019f36f80216559a3c7f80ff6;hb=0d0e1a63d6b14109b64805bcb1a45ddf469ba35d;hp=31264e0345dbc73b994973a000ee2883729a853e;hpb=ff2510f5098b545a03965c6b95296eec6885a4fb;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 31264e03..aa5926f5 100644 --- a/src/main.h +++ b/src/main.h @@ -27,8 +27,8 @@ #include "libgame/libgame.h" -#include "conf_gfx.h" -#include "conf_snd.h" +#include "conf_gfx.h" /* include auto-generated data structure definitions */ +#include "conf_snd.h" /* include auto-generated data structure definitions */ #define IMG_UNDEFINED (-1) #define IMG_EMPTY IMG_EMPTY_SPACE @@ -66,7 +66,7 @@ #define EP_BIT_SCHLUESSEL (1 << 2) #define EP_BIT_PFORTE (1 << 3) #define EP_BIT_SOLID (1 << 4) -#define EP_BIT_MASSIVE (1 << 5) +#define EP_BIT_INDESTRUCTIBLE (1 << 5) #define EP_BIT_SLIPPERY (1 << 6) #define EP_BIT_ENEMY (1 << 7) #define EP_BIT_MAUER (1 << 8) @@ -101,12 +101,14 @@ #define EP_BIT_TUBE (1 << 3) #define EP_BIT_EM_SLIPPERY_WALL (1 << 4) +#define EP_BITMASK_DEFAULT 0 + #define IS_AMOEBALIVE(e) (Properties1[e] & EP_BIT_AMOEBALIVE) #define IS_AMOEBOID(e) (Properties1[e] & EP_BIT_AMOEBOID) #define IS_SCHLUESSEL(e) (Properties1[e] & EP_BIT_SCHLUESSEL) #define IS_PFORTE(e) (Properties1[e] & EP_BIT_PFORTE) #define IS_SOLID(e) (Properties1[e] & EP_BIT_SOLID) -#define IS_MASSIVE(e) (Properties1[e] & EP_BIT_MASSIVE) +#define IS_INDESTRUCTIBLE(e) (Properties1[e] & EP_BIT_INDESTRUCTIBLE) #define IS_SLIPPERY(e) (Properties1[e] & EP_BIT_SLIPPERY) #define IS_ENEMY(e) (Properties1[e] & EP_BIT_ENEMY) #define IS_MAUER(e) (Properties1[e] & EP_BIT_MAUER) @@ -140,6 +142,9 @@ #define IS_TUBE(e) (Properties2[e] & EP_BIT_TUBE) #define IS_EM_SLIPPERY_WALL(e) (Properties2[e] & EP_BIT_EM_SLIPPERY_WALL) +#define IS_CUSTOM_ELEMENT(e) ((e) >= EL_CUSTOM_START && \ + (e) <= EL_CUSTOM_END) + #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)) @@ -164,13 +169,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_PLAYER1]) +#define PLAYERINFO(x,y) (&stored_player[StorePlayer[x][y]-EL_PLAYER_1]) #define SHIELD_ON(p) ((p)->shield_normal_time_left > 0) #define PROTECTED_FIELD(x,y) (IS_TUBE(Feld[x][y])) #define PLAYER_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) || \ PROTECTED_FIELD(x, y)) -#define PLAYER_NR_GFX(g,i) ((g) + i * (IMG_PLAYER2 - IMG_PLAYER1)) +#define PLAYER_NR_GFX(g,i) ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1)) #define ANIM_FRAMES(g) (graphic_info[g].anim_frames) #define ANIM_DELAY(g) (graphic_info[g].anim_delay) @@ -179,6 +184,7 @@ #define IS_ANIMATED(g) (ANIM_FRAMES(g) > 1) #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_NEXT_FRAME(f, g) (IS_NEW_FRAME(f, g) && (f) > 0) #define IS_LOOP_SOUND(s) (sound_info[s].loop) @@ -296,10 +302,10 @@ #define EL_WALL 2 #define EL_WALL_CRUMBLED 3 #define EL_ROCK 4 -#define EL_KEY_OBSOLETE 5 /* obsolete; mapped to EL_KEY1 */ +#define EL_KEY_OBSOLETE 5 /* obsolete; mapped to EL_KEY_1 */ #define EL_EMERALD 6 #define EL_EXIT_CLOSED 7 -#define EL_PLAYER_OBSOLETE 8 /* obsolete; mapped to EL_PLAYER1 */ +#define EL_PLAYER_OBSOLETE 8 /* obsolete; mapped to EL_PLAYER_1 */ #define EL_BUG 9 #define EL_SPACESHIP 10 #define EL_YAMYAM 11 @@ -317,24 +323,24 @@ #define EL_AMOEBA_WET 23 #define EL_AMOEBA_DRY 24 #define EL_NUT 25 -#define EL_GAMEOFLIFE 26 +#define EL_GAME_OF_LIFE 26 #define EL_BIOMAZE 27 #define EL_DYNAMITE_ACTIVE 28 #define EL_STONEBLOCK 29 #define EL_ROBOT_WHEEL 30 #define EL_ROBOT_WHEEL_ACTIVE 31 -#define EL_KEY1 32 -#define EL_KEY2 33 -#define EL_KEY3 34 -#define EL_KEY4 35 -#define EL_GATE1 36 -#define EL_GATE2 37 -#define EL_GATE3 38 -#define EL_GATE4 39 -#define EL_GATE1_GRAY 40 -#define EL_GATE2_GRAY 41 -#define EL_GATE3_GRAY 42 -#define EL_GATE4_GRAY 43 +#define EL_KEY_1 32 +#define EL_KEY_2 33 +#define EL_KEY_3 34 +#define EL_KEY_4 35 +#define EL_GATE_1 36 +#define EL_GATE_2 37 +#define EL_GATE_3 38 +#define EL_GATE_4 39 +#define EL_GATE_1_GRAY 40 +#define EL_GATE_2_GRAY 41 +#define EL_GATE_3_GRAY 42 +#define EL_GATE_4_GRAY 43 #define EL_DYNAMITE 44 #define EL_PACMAN 45 #define EL_INVISIBLE_WALL 46 @@ -346,7 +352,7 @@ #define EL_BD_AMOEBA 52 #define EL_TIME_ORB_FULL 53 #define EL_TIME_ORB_EMPTY 54 -#define EL_WALL_GROWING 55 +#define EL_EXPANDABLE_WALL 55 #define EL_BD_DIAMOND 56 #define EL_EMERALD_YELLOW 57 #define EL_WALL_BD_DIAMOND 58 @@ -357,9 +363,9 @@ #define EL_UNUSED_63 63 -#define EL_DYNABOMB_NR 64 -#define EL_DYNABOMB_SZ 65 -#define EL_DYNABOMB_XL 66 +#define EL_DYNABOMB_INCREASE_NUMBER 64 +#define EL_DYNABOMB_INCREASE_SIZE 65 +#define EL_DYNABOMB_INCREASE_POWER 66 #define EL_SOKOBAN_OBJECT 67 #define EL_SOKOBAN_FIELD_EMPTY 68 #define EL_SOKOBAN_FIELD_FULL 69 @@ -381,10 +387,10 @@ #define EL_BD_FIREFLY_4 EL_BD_FIREFLY_UP #define EL_BD_BUTTERFLY 78 #define EL_BD_FIREFLY 79 -#define EL_PLAYER1 80 -#define EL_PLAYER2 81 -#define EL_PLAYER3 82 -#define EL_PLAYER4 83 +#define EL_PLAYER_1 80 +#define EL_PLAYER_2 81 +#define EL_PLAYER_3 82 +#define EL_PLAYER_4 83 #define EL_BUG_RIGHT 84 #define EL_BUG_UP 85 #define EL_BUG_LEFT 86 @@ -401,11 +407,11 @@ #define EL_EMERALD_PURPLE 97 #define EL_WALL_EMERALD_RED 98 #define EL_WALL_EMERALD_PURPLE 99 -#define EL_ACIDPOOL_TOPLEFT 100 -#define EL_ACIDPOOL_TOPRIGHT 101 -#define EL_ACIDPOOL_BOTTOMLEFT 102 -#define EL_ACIDPOOL_BOTTOM 103 -#define EL_ACIDPOOL_BOTTOMRIGHT 104 +#define EL_ACID_POOL_TOPLEFT 100 +#define EL_ACID_POOL_TOPRIGHT 101 +#define EL_ACID_POOL_BOTTOMLEFT 102 +#define EL_ACID_POOL_BOTTOM 103 +#define EL_ACID_POOL_BOTTOMRIGHT 104 #define EL_BD_WALL 105 #define EL_BD_ROCK 106 #define EL_EXIT_OPEN 107 @@ -414,53 +420,21 @@ #define EL_MOLE 110 #define EL_PENGUIN 111 #define EL_SATELLITE 112 -#define EL_ARROW_BLUE_LEFT 113 -#define EL_ARROW_BLUE_RIGHT 114 -#define EL_ARROW_BLUE_UP 115 -#define EL_ARROW_BLUE_DOWN 116 +#define EL_ARROW_LEFT 113 +#define EL_ARROW_RIGHT 114 +#define EL_ARROW_UP 115 +#define EL_ARROW_DOWN 116 #define EL_PIG 117 #define EL_DRAGON 118 -#define EL_EM_KEY1_FILE 119 +#define EL_EM_KEY_1_FILE 119 #define EL_CHAR_START 120 #define EL_CHAR_ASCII0 (EL_CHAR_START - 32) #define EL_CHAR_ASCII0_START (EL_CHAR_ASCII0 + 32) -#define EL_CHAR_EXCLAM (EL_CHAR_ASCII0 + 33) -#define EL_CHAR_QUOTEDBL (EL_CHAR_ASCII0 + 34) -#define EL_CHAR_NUMBERSIGN (EL_CHAR_ASCII0 + 35) -#define EL_CHAR_DOLLAR (EL_CHAR_ASCII0 + 36) -#define EL_CHAR_PROCENT (EL_CHAR_ASCII0 + 37) -#define EL_CHAR_AMPERSAND (EL_CHAR_ASCII0 + 38) -#define EL_CHAR_APOSTROPHE (EL_CHAR_ASCII0 + 39) -#define EL_CHAR_PARENLEFT (EL_CHAR_ASCII0 + 40) -#define EL_CHAR_PARENRIGHT (EL_CHAR_ASCII0 + 41) -#define EL_CHAR_ASTERISK (EL_CHAR_ASCII0 + 42) -#define EL_CHAR_PLUS (EL_CHAR_ASCII0 + 43) -#define EL_CHAR_COMMA (EL_CHAR_ASCII0 + 44) -#define EL_CHAR_MINUS (EL_CHAR_ASCII0 + 45) -#define EL_CHAR_PERIOD (EL_CHAR_ASCII0 + 46) -#define EL_CHAR_SLASH (EL_CHAR_ASCII0 + 47) -#define EL_CHAR_0 (EL_CHAR_ASCII0 + 48) -#define EL_CHAR_9 (EL_CHAR_ASCII0 + 57) -#define EL_CHAR_COLON (EL_CHAR_ASCII0 + 58) -#define EL_CHAR_SEMICOLON (EL_CHAR_ASCII0 + 59) -#define EL_CHAR_LESS (EL_CHAR_ASCII0 + 60) -#define EL_CHAR_EQUAL (EL_CHAR_ASCII0 + 61) -#define EL_CHAR_GREATER (EL_CHAR_ASCII0 + 62) -#define EL_CHAR_QUESTION (EL_CHAR_ASCII0 + 63) -#define EL_CHAR_AT (EL_CHAR_ASCII0 + 64) -#define EL_CHAR_A (EL_CHAR_ASCII0 + 65) -#define EL_CHAR_Z (EL_CHAR_ASCII0 + 90) -#define EL_CHAR_AE (EL_CHAR_ASCII0 + 91) -#define EL_CHAR_OE (EL_CHAR_ASCII0 + 92) -#define EL_CHAR_UE (EL_CHAR_ASCII0 + 93) -#define EL_CHAR_COPYRIGHT (EL_CHAR_ASCII0 + 94) -#define EL_CHAR_UNDERSCORE (EL_CHAR_ASCII0 + 95) -#define EL_CHAR_EMPTY (EL_CHAR_ASCII0 + 96) -#define EL_CHAR_DEGREE (EL_CHAR_ASCII0 + 97) -#define EL_CHAR_TM (EL_CHAR_ASCII0 + 98) -#define EL_CHAR_CURSOR (EL_CHAR_ASCII0 + 99) + +#include "conf_chr.h" /* include auto-generated data structure definitions */ + #define EL_CHAR_ASCII0_END (EL_CHAR_ASCII0 + 111) #define EL_CHAR_END (EL_CHAR_START + 79) @@ -474,18 +448,18 @@ (x) == '|' ? EL_CHAR_CURSOR : \ EL_CHAR_A + (x) - 'A') -#define EL_WALL_GROWING_X 200 -#define EL_WALL_GROWING_Y 201 -#define EL_WALL_GROWING_XY 202 +#define EL_EXPANDABLE_WALL_HORIZONTAL 200 +#define EL_EXPANDABLE_WALL_VERTICAL 201 +#define EL_EXPANDABLE_WALL_ANY 202 -#define EL_EM_GATE1 203 -#define EL_EM_GATE2 204 -#define EL_EM_GATE3 205 -#define EL_EM_GATE4 206 +#define EL_EM_GATE_1 203 +#define EL_EM_GATE_2 204 +#define EL_EM_GATE_3 205 +#define EL_EM_GATE_4 206 -#define EL_EM_KEY2_FILE 207 -#define EL_EM_KEY3_FILE 208 -#define EL_EM_KEY4_FILE 209 +#define EL_EM_KEY_2_FILE 207 +#define EL_EM_KEY_3_FILE 208 +#define EL_EM_KEY_4_FILE 209 #define EL_SP_START 210 #define EL_SP_EMPTY_SPACE (EL_SP_START + 0) @@ -495,46 +469,46 @@ #define EL_SP_MURPHY (EL_SP_START + 3) #define EL_SP_INFOTRON (EL_SP_START + 4) #define EL_SP_CHIP_SINGLE (EL_SP_START + 5) -#define EL_SP_HARD_GRAY (EL_SP_START + 6) +#define EL_SP_HARDWARE_GRAY (EL_SP_START + 6) #define EL_SP_EXIT_CLOSED (EL_SP_START + 7) #define EL_SP_DISK_ORANGE (EL_SP_START + 8) -#define EL_SP_PORT1_RIGHT (EL_SP_START + 9) -#define EL_SP_PORT1_DOWN (EL_SP_START + 10) -#define EL_SP_PORT1_LEFT (EL_SP_START + 11) -#define EL_SP_PORT1_UP (EL_SP_START + 12) -#define EL_SP_PORT2_RIGHT (EL_SP_START + 13) -#define EL_SP_PORT2_DOWN (EL_SP_START + 14) -#define EL_SP_PORT2_LEFT (EL_SP_START + 15) -#define EL_SP_PORT2_UP (EL_SP_START + 16) +#define EL_SP_PORT_RIGHT (EL_SP_START + 9) +#define EL_SP_PORT_DOWN (EL_SP_START + 10) +#define EL_SP_PORT_LEFT (EL_SP_START + 11) +#define EL_SP_PORT_UP (EL_SP_START + 12) +#define EL_SP_GRAVITY_PORT_RIGHT (EL_SP_START + 13) +#define EL_SP_GRAVITY_PORT_DOWN (EL_SP_START + 14) +#define EL_SP_GRAVITY_PORT_LEFT (EL_SP_START + 15) +#define EL_SP_GRAVITY_PORT_UP (EL_SP_START + 16) #define EL_SP_SNIKSNAK (EL_SP_START + 17) #define EL_SP_DISK_YELLOW (EL_SP_START + 18) #define EL_SP_TERMINAL (EL_SP_START + 19) #define EL_SP_DISK_RED (EL_SP_START + 20) -#define EL_SP_PORT_Y (EL_SP_START + 21) -#define EL_SP_PORT_X (EL_SP_START + 22) -#define EL_SP_PORT_XY (EL_SP_START + 23) +#define EL_SP_PORT_VERTICAL (EL_SP_START + 21) +#define EL_SP_PORT_HORIZONTAL (EL_SP_START + 22) +#define EL_SP_PORT_ANY (EL_SP_START + 23) #define EL_SP_ELECTRON (EL_SP_START + 24) #define EL_SP_BUGGY_BASE (EL_SP_START + 25) #define EL_SP_CHIP_LEFT (EL_SP_START + 26) #define EL_SP_CHIP_RIGHT (EL_SP_START + 27) -#define EL_SP_HARD_BASE1 (EL_SP_START + 28) -#define EL_SP_HARD_GREEN (EL_SP_START + 29) -#define EL_SP_HARD_BLUE (EL_SP_START + 30) -#define EL_SP_HARD_RED (EL_SP_START + 31) -#define EL_SP_HARD_YELLOW (EL_SP_START + 32) -#define EL_SP_HARD_BASE2 (EL_SP_START + 33) -#define EL_SP_HARD_BASE3 (EL_SP_START + 34) -#define EL_SP_HARD_BASE4 (EL_SP_START + 35) -#define EL_SP_HARD_BASE5 (EL_SP_START + 36) -#define EL_SP_HARD_BASE6 (EL_SP_START + 37) -#define EL_SP_CHIP_UPPER (EL_SP_START + 38) -#define EL_SP_CHIP_LOWER (EL_SP_START + 39) +#define EL_SP_HARDWARE_BASE_1 (EL_SP_START + 28) +#define EL_SP_HARDWARE_GREEN (EL_SP_START + 29) +#define EL_SP_HARDWARE_BLUE (EL_SP_START + 30) +#define EL_SP_HARDWARE_RED (EL_SP_START + 31) +#define EL_SP_HARDWARE_YELLOW (EL_SP_START + 32) +#define EL_SP_HARDWARE_BASE_2 (EL_SP_START + 33) +#define EL_SP_HARDWARE_BASE_3 (EL_SP_START + 34) +#define EL_SP_HARDWARE_BASE_4 (EL_SP_START + 35) +#define EL_SP_HARDWARE_BASE_5 (EL_SP_START + 36) +#define EL_SP_HARDWARE_BASE_6 (EL_SP_START + 37) +#define EL_SP_CHIP_TOP (EL_SP_START + 38) +#define EL_SP_CHIP_BOTTOM (EL_SP_START + 39) #define EL_SP_END (EL_SP_START + 39) -#define EL_EM_GATE1_GRAY 250 -#define EL_EM_GATE2_GRAY 251 -#define EL_EM_GATE3_GRAY 252 -#define EL_EM_GATE4_GRAY 253 +#define EL_EM_GATE_1_GRAY 250 +#define EL_EM_GATE_2_GRAY 251 +#define EL_EM_GATE_3_GRAY 252 +#define EL_EM_GATE_4_GRAY 253 #define EL_UNUSED_254 254 #define EL_UNUSED_255 255 @@ -556,30 +530,30 @@ #define EL_UNUSED_269 269 #define EL_UNUSED_270 270 -#define EL_CONVEYOR_BELT1_LEFT 271 -#define EL_CONVEYOR_BELT1_MIDDLE 272 -#define EL_CONVEYOR_BELT1_RIGHT 273 -#define EL_CONVEYOR_BELT1_SWITCH_LEFT 274 -#define EL_CONVEYOR_BELT1_SWITCH_MIDDLE 275 -#define EL_CONVEYOR_BELT1_SWITCH_RIGHT 276 -#define EL_CONVEYOR_BELT2_LEFT 277 -#define EL_CONVEYOR_BELT2_MIDDLE 278 -#define EL_CONVEYOR_BELT2_RIGHT 279 -#define EL_CONVEYOR_BELT2_SWITCH_LEFT 280 -#define EL_CONVEYOR_BELT2_SWITCH_MIDDLE 281 -#define EL_CONVEYOR_BELT2_SWITCH_RIGHT 282 -#define EL_CONVEYOR_BELT3_LEFT 283 -#define EL_CONVEYOR_BELT3_MIDDLE 284 -#define EL_CONVEYOR_BELT3_RIGHT 285 -#define EL_CONVEYOR_BELT3_SWITCH_LEFT 286 -#define EL_CONVEYOR_BELT3_SWITCH_MIDDLE 287 -#define EL_CONVEYOR_BELT3_SWITCH_RIGHT 288 -#define EL_CONVEYOR_BELT4_LEFT 289 -#define EL_CONVEYOR_BELT4_MIDDLE 290 -#define EL_CONVEYOR_BELT4_RIGHT 291 -#define EL_CONVEYOR_BELT4_SWITCH_LEFT 292 -#define EL_CONVEYOR_BELT4_SWITCH_MIDDLE 293 -#define EL_CONVEYOR_BELT4_SWITCH_RIGHT 294 +#define EL_CONVEYOR_BELT_1_LEFT 271 +#define EL_CONVEYOR_BELT_1_MIDDLE 272 +#define EL_CONVEYOR_BELT_1_RIGHT 273 +#define EL_CONVEYOR_BELT_1_SWITCH_LEFT 274 +#define EL_CONVEYOR_BELT_1_SWITCH_MIDDLE 275 +#define EL_CONVEYOR_BELT_1_SWITCH_RIGHT 276 +#define EL_CONVEYOR_BELT_2_LEFT 277 +#define EL_CONVEYOR_BELT_2_MIDDLE 278 +#define EL_CONVEYOR_BELT_2_RIGHT 279 +#define EL_CONVEYOR_BELT_2_SWITCH_LEFT 280 +#define EL_CONVEYOR_BELT_2_SWITCH_MIDDLE 281 +#define EL_CONVEYOR_BELT_2_SWITCH_RIGHT 282 +#define EL_CONVEYOR_BELT_3_LEFT 283 +#define EL_CONVEYOR_BELT_3_MIDDLE 284 +#define EL_CONVEYOR_BELT_3_RIGHT 285 +#define EL_CONVEYOR_BELT_3_SWITCH_LEFT 286 +#define EL_CONVEYOR_BELT_3_SWITCH_MIDDLE 287 +#define EL_CONVEYOR_BELT_3_SWITCH_RIGHT 288 +#define EL_CONVEYOR_BELT_4_LEFT 289 +#define EL_CONVEYOR_BELT_4_MIDDLE 290 +#define EL_CONVEYOR_BELT_4_RIGHT 291 +#define EL_CONVEYOR_BELT_4_SWITCH_LEFT 292 +#define EL_CONVEYOR_BELT_4_SWITCH_MIDDLE 293 +#define EL_CONVEYOR_BELT_4_SWITCH_RIGHT 294 #define EL_LANDMINE 295 #define EL_ENVELOPE 296 #define EL_LIGHT_SWITCH 297 @@ -615,26 +589,26 @@ #define EL_TIMEGATE_SWITCH 325 #define EL_BALLOON 326 -#define EL_BALLOON_SEND_LEFT 327 -#define EL_BALLOON_SEND_RIGHT 328 -#define EL_BALLOON_SEND_UP 329 -#define EL_BALLOON_SEND_DOWN 330 -#define EL_BALLOON_SEND_ANY_DIRECTION 331 - -#define EL_EMC_STEELWALL1 332 -#define EL_EMC_STEELWALL2 333 -#define EL_EMC_STEELWALL3 334 -#define EL_EMC_STEELWALL4 335 -#define EL_EMC_WALL_PILLAR_UPPER 336 -#define EL_EMC_WALL_PILLAR_MIDDLE 337 -#define EL_EMC_WALL_PILLAR_LOWER 338 -#define EL_EMC_WALL4 339 -#define EL_EMC_WALL5 340 -#define EL_EMC_WALL6 341 -#define EL_EMC_WALL7 342 -#define EL_EMC_WALL8 343 - -#define EL_TUBE_ALL 344 +#define EL_BALLOON_SWITCH_LEFT 327 +#define EL_BALLOON_SWITCH_RIGHT 328 +#define EL_BALLOON_SWITCH_UP 329 +#define EL_BALLOON_SWITCH_DOWN 330 +#define EL_BALLOON_SWITCH_ANY 331 + +#define EL_EMC_STEELWALL_1 332 +#define EL_EMC_STEELWALL_2 333 +#define EL_EMC_STEELWALL_3 334 +#define EL_EMC_STEELWALL_4 335 +#define EL_EMC_WALL_1 336 +#define EL_EMC_WALL_2 337 +#define EL_EMC_WALL_3 338 +#define EL_EMC_WALL_4 339 +#define EL_EMC_WALL_5 340 +#define EL_EMC_WALL_6 341 +#define EL_EMC_WALL_7 342 +#define EL_EMC_WALL_8 343 + +#define EL_TUBE_ANY 344 #define EL_TUBE_VERTICAL 345 #define EL_TUBE_HORIZONTAL 346 #define EL_TUBE_VERTICAL_LEFT 347 @@ -653,80 +627,83 @@ #define EL_UNUSED_359 359 #define EL_CUSTOM_START 360 -#define EL_CUSTOM_1 (EL_CUSTOM_START + 0) -#define EL_CUSTOM_128 (EL_CUSTOM_START + 127) + +#include "conf_cus.h" /* include auto-generated data structure definitions */ + #define EL_CUSTOM_END (EL_CUSTOM_START + 127) +#define NUM_CUSTOM_ELEMENTS 128 #define NUM_FILE_ELEMENTS 488 /* "real" (and therefore drawable) runtime elements */ #define EL_FIRST_RUNTIME_REAL NUM_FILE_ELEMENTS -#define EL_EM_KEY1 (EL_FIRST_RUNTIME_REAL + 0) -#define EL_EM_KEY2 (EL_FIRST_RUNTIME_REAL + 1) -#define EL_EM_KEY3 (EL_FIRST_RUNTIME_REAL + 2) -#define EL_EM_KEY4 (EL_FIRST_RUNTIME_REAL + 3) -#define EL_DYNABOMB_PLAYER1_ACTIVE (EL_FIRST_RUNTIME_REAL + 4) -#define EL_DYNABOMB_PLAYER2_ACTIVE (EL_FIRST_RUNTIME_REAL + 5) -#define EL_DYNABOMB_PLAYER3_ACTIVE (EL_FIRST_RUNTIME_REAL + 6) -#define EL_DYNABOMB_PLAYER4_ACTIVE (EL_FIRST_RUNTIME_REAL + 7) -#define EL_SWITCHGATE_OPENING (EL_FIRST_RUNTIME_REAL + 8) -#define EL_SWITCHGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 9) -#define EL_TIMEGATE_OPENING (EL_FIRST_RUNTIME_REAL + 10) -#define EL_TIMEGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 11) -#define EL_PEARL_BREAKING (EL_FIRST_RUNTIME_REAL + 12) -#define EL_TRAP_ACTIVE (EL_FIRST_RUNTIME_REAL + 13) -#define EL_INVISIBLE_STEELWALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 14) -#define EL_INVISIBLE_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 15) -#define EL_INVISIBLE_SAND_ACTIVE (EL_FIRST_RUNTIME_REAL + 16) -#define EL_CONVEYOR_BELT1_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 17) -#define EL_CONVEYOR_BELT1_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 18) -#define EL_CONVEYOR_BELT1_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 19) -#define EL_CONVEYOR_BELT2_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 20) -#define EL_CONVEYOR_BELT2_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 21) -#define EL_CONVEYOR_BELT2_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 22) -#define EL_CONVEYOR_BELT3_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 23) -#define EL_CONVEYOR_BELT3_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 24) -#define EL_CONVEYOR_BELT3_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 25) -#define EL_CONVEYOR_BELT4_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 26) -#define EL_CONVEYOR_BELT4_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 27) -#define EL_CONVEYOR_BELT4_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 28) -#define EL_EXIT_OPENING (EL_FIRST_RUNTIME_REAL + 29) -#define EL_SP_EXIT_OPEN (EL_FIRST_RUNTIME_REAL + 30) -#define EL_SP_TERMINAL_ACTIVE (EL_FIRST_RUNTIME_REAL + 31) -#define EL_SP_BUGGY_BASE_ACTIVATING (EL_FIRST_RUNTIME_REAL + 32) -#define EL_SP_BUGGY_BASE_ACTIVE (EL_FIRST_RUNTIME_REAL + 33) -#define EL_SP_MURPHY_CLONE (EL_FIRST_RUNTIME_REAL + 34) -#define EL_AMOEBA_DRIPPING (EL_FIRST_RUNTIME_REAL + 35) -#define EL_QUICKSAND_EMPTYING (EL_FIRST_RUNTIME_REAL + 36) -#define EL_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 37) -#define EL_BD_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 38) -#define EL_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 39) -#define EL_BD_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 40) -#define EL_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 41) -#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_EM_KEY_1 (EL_FIRST_RUNTIME_REAL + 0) +#define EL_EM_KEY_2 (EL_FIRST_RUNTIME_REAL + 1) +#define EL_EM_KEY_3 (EL_FIRST_RUNTIME_REAL + 2) +#define EL_EM_KEY_4 (EL_FIRST_RUNTIME_REAL + 3) +#define EL_DYNABOMB_PLAYER_1_ACTIVE (EL_FIRST_RUNTIME_REAL + 4) +#define EL_DYNABOMB_PLAYER_2_ACTIVE (EL_FIRST_RUNTIME_REAL + 5) +#define EL_DYNABOMB_PLAYER_3_ACTIVE (EL_FIRST_RUNTIME_REAL + 6) +#define EL_DYNABOMB_PLAYER_4_ACTIVE (EL_FIRST_RUNTIME_REAL + 7) +#define EL_SP_DISK_RED_ACTIVE (EL_FIRST_RUNTIME_REAL + 8) +#define EL_SWITCHGATE_OPENING (EL_FIRST_RUNTIME_REAL + 9) +#define EL_SWITCHGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 10) +#define EL_TIMEGATE_OPENING (EL_FIRST_RUNTIME_REAL + 11) +#define EL_TIMEGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 12) +#define EL_PEARL_BREAKING (EL_FIRST_RUNTIME_REAL + 13) +#define EL_TRAP_ACTIVE (EL_FIRST_RUNTIME_REAL + 14) +#define EL_INVISIBLE_STEELWALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 15) +#define EL_INVISIBLE_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 16) +#define EL_INVISIBLE_SAND_ACTIVE (EL_FIRST_RUNTIME_REAL + 17) +#define EL_CONVEYOR_BELT_1_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 18) +#define EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 19) +#define EL_CONVEYOR_BELT_1_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 20) +#define EL_CONVEYOR_BELT_2_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 21) +#define EL_CONVEYOR_BELT_2_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 22) +#define EL_CONVEYOR_BELT_2_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 23) +#define EL_CONVEYOR_BELT_3_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 24) +#define EL_CONVEYOR_BELT_3_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 25) +#define EL_CONVEYOR_BELT_3_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 26) +#define EL_CONVEYOR_BELT_4_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 27) +#define EL_CONVEYOR_BELT_4_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 28) +#define EL_CONVEYOR_BELT_4_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 29) +#define EL_EXIT_OPENING (EL_FIRST_RUNTIME_REAL + 30) +#define EL_SP_EXIT_OPEN (EL_FIRST_RUNTIME_REAL + 31) +#define EL_SP_TERMINAL_ACTIVE (EL_FIRST_RUNTIME_REAL + 32) +#define EL_SP_BUGGY_BASE_ACTIVATING (EL_FIRST_RUNTIME_REAL + 33) +#define EL_SP_BUGGY_BASE_ACTIVE (EL_FIRST_RUNTIME_REAL + 34) +#define EL_SP_MURPHY_CLONE (EL_FIRST_RUNTIME_REAL + 35) +#define EL_AMOEBA_DROPPING (EL_FIRST_RUNTIME_REAL + 36) +#define EL_QUICKSAND_EMPTYING (EL_FIRST_RUNTIME_REAL + 37) +#define EL_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 38) +#define EL_BD_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 39) +#define EL_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 40) +#define EL_BD_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 41) +#define EL_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 42) +#define EL_BD_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 43) +#define EL_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 44) +#define EL_BD_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 45) /* "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 + 46) #define EL_BLOCKED (EL_FIRST_RUNTIME_UNREAL + 0) #define EL_EXPLOSION (EL_FIRST_RUNTIME_UNREAL + 1) -#define EL_NUT_CRACKING (EL_FIRST_RUNTIME_UNREAL + 2) +#define EL_NUT_BREAKING (EL_FIRST_RUNTIME_UNREAL + 2) #define EL_ACID_SPLASH_LEFT (EL_FIRST_RUNTIME_UNREAL + 3) #define EL_ACID_SPLASH_RIGHT (EL_FIRST_RUNTIME_UNREAL + 4) -#define EL_AMOEBA_CREATING (EL_FIRST_RUNTIME_UNREAL + 5) +#define EL_AMOEBA_GROWING (EL_FIRST_RUNTIME_UNREAL + 5) #define EL_AMOEBA_SHRINKING (EL_FIRST_RUNTIME_UNREAL + 6) -#define EL_WALL_GROWING_ACTIVE (EL_FIRST_RUNTIME_UNREAL + 7) +#define EL_EXPANDABLE_WALL_GROWING (EL_FIRST_RUNTIME_UNREAL + 7) #define EL_FLAMES (EL_FIRST_RUNTIME_UNREAL + 8) #define EL_PLAYER_IS_LEAVING (EL_FIRST_RUNTIME_UNREAL + 9) #define EL_QUICKSAND_FILLING (EL_FIRST_RUNTIME_UNREAL + 10) #define EL_MAGIC_WALL_FILLING (EL_FIRST_RUNTIME_UNREAL + 11) #define EL_BD_MAGIC_WALL_FILLING (EL_FIRST_RUNTIME_UNREAL + 12) -/* dummy (not drawable) runtime elements (internal use only) */ +/* dummy elements (never used as game elements, only used as graphics) */ #define EL_FIRST_DUMMY (EL_FIRST_RUNTIME_UNREAL + 13) #define EL_STEELWALL_TOPLEFT (EL_FIRST_DUMMY + 0) @@ -742,35 +719,11 @@ #define EL_INVISIBLE_STEELWALL_HORIZONTAL (EL_FIRST_DUMMY + 10) #define EL_INVISIBLE_STEELWALL_VERTICAL (EL_FIRST_DUMMY + 11) #define EL_SAND_CRUMBLED (EL_FIRST_DUMMY + 12) -#define EL_BD_AMOEBA_PART1 (EL_FIRST_DUMMY + 13) -#define EL_BD_AMOEBA_PART2 (EL_FIRST_DUMMY + 14) -#define EL_BD_AMOEBA_PART3 (EL_FIRST_DUMMY + 15) -#define EL_BD_AMOEBA_PART4 (EL_FIRST_DUMMY + 16) -#define EL_AMOEBA_WET_PART1 (EL_FIRST_DUMMY + 17) -#define EL_AMOEBA_WET_PART2 (EL_FIRST_DUMMY + 18) -#define EL_AMOEBA_WET_PART3 (EL_FIRST_DUMMY + 19) -#define EL_AMOEBA_WET_PART4 (EL_FIRST_DUMMY + 20) -#define EL_AMOEBA_DRY_PART1 (EL_FIRST_DUMMY + 21) -#define EL_AMOEBA_DRY_PART2 (EL_FIRST_DUMMY + 22) -#define EL_AMOEBA_DRY_PART3 (EL_FIRST_DUMMY + 23) -#define EL_AMOEBA_DRY_PART4 (EL_FIRST_DUMMY + 24) -#define EL_AMOEBA_FULL_PART1 (EL_FIRST_DUMMY + 25) -#define EL_AMOEBA_FULL_PART2 (EL_FIRST_DUMMY + 26) -#define EL_AMOEBA_FULL_PART3 (EL_FIRST_DUMMY + 27) -#define EL_AMOEBA_FULL_PART4 (EL_FIRST_DUMMY + 28) -#define EL_AMOEBA_DEAD_PART1 (EL_FIRST_DUMMY + 29) -#define EL_AMOEBA_DEAD_PART2 (EL_FIRST_DUMMY + 30) -#define EL_AMOEBA_DEAD_PART3 (EL_FIRST_DUMMY + 31) -#define EL_AMOEBA_DEAD_PART4 (EL_FIRST_DUMMY + 32) -#define EL_DYNABOMB_ACTIVE (EL_FIRST_DUMMY + 33) -#define EL_SHIELD_NORMAL_ACTIVE (EL_FIRST_DUMMY + 34) -#define EL_SHIELD_DEADLY_ACTIVE (EL_FIRST_DUMMY + 35) -#define EL_ARROW_RED_LEFT (EL_FIRST_DUMMY + 36) -#define EL_ARROW_RED_RIGHT (EL_FIRST_DUMMY + 37) -#define EL_ARROW_RED_UP (EL_FIRST_DUMMY + 38) -#define EL_ARROW_RED_DOWN (EL_FIRST_DUMMY + 39) - -#define MAX_NUM_ELEMENTS (EL_FIRST_DUMMY + 40) +#define EL_DYNABOMB_ACTIVE (EL_FIRST_DUMMY + 13) +#define EL_SHIELD_NORMAL_ACTIVE (EL_FIRST_DUMMY + 14) +#define EL_SHIELD_DEADLY_ACTIVE (EL_FIRST_DUMMY + 15) + +#define MAX_NUM_ELEMENTS (EL_FIRST_DUMMY + 16) /* values for graphics/sounds action types */ @@ -781,48 +734,68 @@ #define ACTION_DIGGING 4 #define ACTION_SNAPPING 5 #define ACTION_COLLECTING 6 -#define ACTION_PUSHING 7 -#define ACTION_PASSING 8 -#define ACTION_IMPACT 9 -#define ACTION_CRACKING 10 +#define ACTION_DROPPING 7 +#define ACTION_PUSHING 8 +#define ACTION_PASSING 9 +#define ACTION_IMPACT 10 #define ACTION_BREAKING 11 #define ACTION_ACTIVATING 12 -#define ACTION_OPENING 13 -#define ACTION_CLOSING 14 -#define ACTION_EATING 15 +#define ACTION_DEACTIVATING 13 +#define ACTION_OPENING 14 +#define ACTION_CLOSING 15 #define ACTION_ATTACKING 16 #define ACTION_GROWING 17 #define ACTION_SHRINKING 18 #define ACTION_ACTIVE 19 -#define ACTION_OTHER 20 +#define ACTION_FILLING 20 +#define ACTION_EMPTYING 21 +#define ACTION_CHANGING 22 +#define ACTION_EXPLODING 23 +#define ACTION_DYING 24 +#define ACTION_OTHER 25 -#define NUM_ACTIONS 21 +#define NUM_ACTIONS 26 /* values for special image configuration suffixes */ -#define GFX_SPECIAL_ARG_EDITOR 0 +#define GFX_SPECIAL_ARG_MAIN 0 +#define GFX_SPECIAL_ARG_LEVELS 1 +#define GFX_SPECIAL_ARG_SCORES 2 +#define GFX_SPECIAL_ARG_EDITOR 3 +#define GFX_SPECIAL_ARG_INFO 4 +#define GFX_SPECIAL_ARG_SETUP 5 +#define GFX_SPECIAL_ARG_DOOR 6 +#define GFX_SPECIAL_ARG_PREVIEW 7 -#define NUM_SPECIAL_GFX_ARGS 1 +#define NUM_SPECIAL_GFX_ARGS 8 /* values for image configuration suffixes */ -#define GFX_ARG_XPOS 0 -#define GFX_ARG_YPOS 1 -#define GFX_ARG_OFFSET 2 -#define GFX_ARG_VERTICAL 3 -#define GFX_ARG_XOFFSET 4 -#define GFX_ARG_YOFFSET 5 -#define GFX_ARG_FRAMES 6 -#define GFX_ARG_START_FRAME 7 -#define GFX_ARG_DELAY 8 -#define GFX_ARG_MODE_LOOP 9 -#define GFX_ARG_MODE_LINEAR 10 -#define GFX_ARG_MODE_PINGPONG 11 -#define GFX_ARG_MODE_PINGPONG2 12 -#define GFX_ARG_MODE_RANDOM 13 -#define GFX_ARG_MODE_REVERSE 14 +#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_OFFSET 6 +#define GFX_ARG_VERTICAL 7 +#define GFX_ARG_XOFFSET 8 +#define GFX_ARG_YOFFSET 9 +#define GFX_ARG_FRAMES 10 +#define GFX_ARG_FRAMES_PER_LINE 11 +#define GFX_ARG_START_FRAME 12 +#define GFX_ARG_DELAY 13 +#define GFX_ARG_ANIM_MODE 14 #define GFX_ARG_GLOBAL_SYNC 15 +#define GFX_ARG_STEP_OFFSET 16 +#define GFX_ARG_STEP_DELAY 17 +#define GFX_ARG_DIRECTION 18 +#define GFX_ARG_POSITION 19 +#define GFX_ARG_DRAW_XOFFSET 20 +#define GFX_ARG_DRAW_YOFFSET 21 +#define GFX_ARG_FORMAT 22 +#define GFX_ARG_NAME 23 -#define NUM_GFX_ARGS 16 +#define NUM_GFX_ARGS 24 /* values for sound configuration suffixes */ @@ -831,6 +804,34 @@ #define NUM_SND_ARGS 1 +/* values for font configuration */ + +#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 6 +#define FONT_MENU_2 7 +#define FONT_TEXT_1 8 +#define FONT_TEXT_2 9 +#define FONT_TEXT_3 10 +#define FONT_TEXT_4 11 +#define FONT_INPUT 12 +#define FONT_INPUT_ACTIVE 13 +#define FONT_OPTION_OFF 14 +#define FONT_OPTION_ON 15 +#define FONT_VALUE_1 16 +#define FONT_VALUE_2 17 +#define FONT_VALUE_OLD 18 +#define FONT_TAPE_RECORDER 19 +#define FONT_LEVEL_NUMBER 20 + +#define NUM_FONTS 21 +#define NUM_INITIAL_FONTS 4 + + /* values for game_status */ #define EXITGAME 0 #define MAINMENU 1 @@ -841,11 +842,13 @@ #define TYPENAME 6 #define HALLOFFAME 7 #define SETUP 8 +#define PSEUDO_PREVIEW 9 +#define PSEUDO_DOOR 10 #define PROGRAM_VERSION_MAJOR 2 #define PROGRAM_VERSION_MINOR 2 #define PROGRAM_VERSION_PATCH 0 -#define PROGRAM_VERSION_STRING "2.2.0rc3" +#define PROGRAM_VERSION_STRING "2.2.0rc4" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" @@ -917,8 +920,13 @@ struct PlayerInfo through doors); overrides other actions */ int jx,jy, last_jx,last_jy; - int MovDir, MovPos, GfxPos; - int Frame; + int MovDir, MovPos, GfxDir, GfxPos; + int Frame, StepFrame; + + int GfxAction; + + boolean use_murphy_graphic; + boolean use_disk_red_graphic; boolean Pushing; boolean Switching; @@ -926,7 +934,10 @@ struct PlayerInfo boolean snapped; int last_move_dir; - int is_moving; + boolean is_moving; + + boolean is_digging; + boolean is_waiting; unsigned long move_delay; int move_delay_value; @@ -934,8 +945,6 @@ struct PlayerInfo unsigned long push_delay; unsigned long push_delay_value; - int frame_reset_delay; - unsigned long actual_frame_counter; int score; @@ -1039,6 +1048,8 @@ struct GlobalInfo char *autoplay_leveldir; int autoplay_level_nr; + int num_toons; + float frames_per_second; boolean fps_slowdown; int fps_slowdown_factor; @@ -1046,24 +1057,36 @@ struct GlobalInfo struct ElementInfo { - char *token_name; /* element token prefix used in config files */ - char *sound_class_name; /* classification for custom sound effects */ + 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 */ int graphic[NUM_ACTIONS]; /* default graphics for several actions */ - /* special graphics for left/right/up/down */ int direction_graphic[NUM_ACTIONS][NUM_DIRECTIONS]; - - int editor_graphic; /* graphic displayed in level editor */ + /* special graphics for left/right/up/down */ + int special_graphic[NUM_SPECIAL_GFX_ARGS]; + /* special graphics for certain screens */ int sound[NUM_ACTIONS]; /* default sounds for several actions */ }; +struct FontInfo +{ + char *token_name; /* font token used in config files */ + + int graphic; /* default graphic for this font */ + int special_graphic[NUM_SPECIAL_GFX_ARGS]; + /* special graphics for certain screens */ + int special_bitmap_id[NUM_SPECIAL_GFX_ARGS]; + /* internal bitmap ID for special graphics */ +}; + struct GraphicInfo { Bitmap *bitmap; - int src_x, src_y; /* derived from (tile sized) .xpos/.ypos */ + int src_x, src_y; /* start position of animation frames */ + int width, height; /* width/height of each animation frame */ int offset_x, offset_y; /* x/y offset to next animation frame */ int anim_frames; int anim_start_frame; @@ -1071,6 +1094,11 @@ struct GraphicInfo int anim_mode; boolean anim_global_sync; + int step_offset; /* optional step offset of toon animations */ + int step_delay; /* optional step delay of toon animations */ + + int draw_x, draw_y; /* optional offset for drawing fonts chars */ + #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) Pixmap clip_mask; /* single-graphic-only clip mask for X11 */ GC clip_gc; /* single-graphic-only clip gc for X11 */ @@ -1142,6 +1170,7 @@ extern unsigned long Properties2[MAX_NUM_ELEMENTS]; extern int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern int lev_fieldx, lev_fieldy; extern int scroll_x, scroll_y; @@ -1178,6 +1207,7 @@ 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 FontInfo font_info[]; extern struct GraphicInfo *graphic_info; extern struct SoundInfo *sound_info; extern struct ConfigInfo image_config[], sound_config[];