From: Holger Schemel Date: Thu, 23 Feb 2023 12:57:21 +0000 (+0100) Subject: removed unused code X-Git-Tag: 4.3.5.2~37 X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=0703af7954d64f643865647bfef8749cd01ab268 removed unused code --- diff --git a/src/game_mm/main_mm.h b/src/game_mm/main_mm.h index 27cec727..94ee023e 100644 --- a/src/game_mm/main_mm.h +++ b/src/game_mm/main_mm.h @@ -35,6 +35,10 @@ extern int TILESIZE_VAR; #define TILEX_VAR TILESIZE_VAR #define TILEY_VAR TILESIZE_VAR +#define MINI_TILESIZE (TILESIZE / 2) +#define MINI_TILEX (TILEX / 2) +#define MINI_TILEY (TILEY / 2) + extern int SCR_FIELDX, SCR_FIELDY; #define MAX_BUF_XSIZE SCR_FIELDX diff --git a/src/game_mm/mm_main.h b/src/game_mm/mm_main.h index 6d66ea08..fb0b029f 100644 --- a/src/game_mm/mm_main.h +++ b/src/game_mm/mm_main.h @@ -143,20 +143,6 @@ #define WALL_BASE(e) ((e) & 0xfff0) #define WALL_BITS(e) ((e) & 0x000f) -// Bitmaps with graphic file -#define PIX_BACK 0 -#define PIX_DOOR 1 -#define PIX_TOONS 2 -#define PIX_DF 3 -#define PIX_BIGFONT 4 -#define PIX_SMALLFONT 5 -#define PIX_MEDIUMFONT 6 -// Bitmaps without graphic file -#define PIX_DB_DOOR 7 - -#define NUM_PICTURES 7 -#define NUM_BITMAPS 8 - // boundaries of arrays etc. #define MAX_PLAYER_NAME_LEN 10 #define MAX_LEVEL_NAME_LEN 32 @@ -254,61 +240,6 @@ extern short Sign[16]; extern char *element_info[]; extern int num_element_info; -// often used screen positions -#define DX 534 -#define DY 60 -#define EX DX -#define EY (DY + 178) -#define TILEX TILESIZE -#define TILEY TILESIZE -#define MINI_TILESIZE (TILESIZE / 2) -#define MINI_TILEX (TILEX / 2) -#define MINI_TILEY (TILEY / 2) -#define MICRO_TILEX (TILEX / 4) -#define MICRO_TILEY (TILEY / 4) -#define MICRO_WALLX (TILEX / 8) -#define MICRO_WALLY (TILEY / 8) -#define MIDPOSX (SCR_FIELDX / 2) -#define MIDPOSY (SCR_FIELDY / 2) -#define DXSIZE 100 -#define DYSIZE 280 -#define VXSIZE DXSIZE -#define VYSIZE 100 -#define EXSIZE DXSIZE -#define EYSIZE (VXSIZE + 44) -#define FULL_SXSIZE (2 + SXSIZE + 2) -#define FULL_SYSIZE (2 + SYSIZE + 2) -#define MICROLEV_XPOS (SX + 12 * TILEX) -#define MICROLEV_YPOS (SY + 6 * TILEY) -#define MICROLEV_XSIZE (STD_LEV_FIELDX * MICRO_TILEX) -#define MICROLEV_YSIZE (STD_LEV_FIELDY * MICRO_TILEY) -#define MICROLABEL_XPOS (SY) -#define MICROLABEL_YPOS (SY + 352) -#define MICROLABEL_XSIZE (SXSIZE) -#define MICROLABEL_YSIZE (FONT4_YSIZE) - -#define GFX_STARTX SX -#define GFX_STARTY SY -#define MINI_GFX_STARTX (SX + 8 * TILEX) -#define MINI_GFX_STARTY (SY + 6 * TILEY) -#define MICRO_GFX_STARTX (MINI_GFX_STARTX + 8 * MINI_TILEX) -#define MICRO_GFX_STARTY (MINI_GFX_STARTY + 6 * MINI_TILEY) -#define GFX_PER_LINE 16 -#define MINI_GFX_PER_LINE GFX_PER_LINE -#define MICRO_GFX_PER_LINE GFX_PER_LINE - -#define MINI_DF_STARTX (8 * TILEX) -#define MINI_DF_STARTY (8 * TILEY) -#define MICRO_DF_STARTX (MINI_DF_STARTX + 8 * MINI_TILEX) -#define MICRO_DF_STARTY (MINI_DF_STARTY + 8 * MINI_TILEY) -#define DF_PER_LINE 16 -#define MINI_DF_PER_LINE DF_PER_LINE -#define MICRO_DF_PER_LINE DF_PER_LINE - -#define MICRO_FONT_STARTX (MICRO_DF_STARTX + 8 * MICRO_TILEX) -#define MICRO_FONT_STARTY (MICRO_DF_STARTY + 8 * MICRO_TILEY) -#define MICRO_FONT_PER_LINE 8 - // wall positions (that can be OR'ed together) #define WALL_TOPLEFT 1 #define WALL_TOPRIGHT 2 @@ -697,324 +628,6 @@ extern int num_element_info; #define IMG_EMPTY IMG_EMPTY_SPACE -#define GFX_START_MIRRORSCREEN 0 -#define GFX_END_MIRRORSCREEN 191 -#define GFX_START_PSEUDO 192 -#define GFX_END_PSEUDO 255 -#define GFX_START_MIRRORFONT 256 -#define GFX_END_MIRRORFONT 511 -#define GFX_START_MIRRORDF 512 -#define GFX_END_MIRRORDF 767 - -#define NUM_TILES 512 - -// graphics from "MirrorScreen" -#define GFX_EMPTY (-1) -// row 0 (0) -#define GFX_MIRROR_START 0 -#define GFX_MIRROR GFX_MIRROR_START -#define GFX_MIRROR_00 (GFX_MIRROR_START + 0) -#define GFX_MIRROR_01 (GFX_MIRROR_START + 1) -#define GFX_MIRROR_02 (GFX_MIRROR_START + 2) -#define GFX_MIRROR_03 (GFX_MIRROR_START + 3) -#define GFX_MIRROR_04 (GFX_MIRROR_START + 4) -#define GFX_MIRROR_05 (GFX_MIRROR_START + 5) -#define GFX_MIRROR_06 (GFX_MIRROR_START + 6) -#define GFX_MIRROR_07 (GFX_MIRROR_START + 7) -#define GFX_MIRROR_08 (GFX_MIRROR_START + 8) -#define GFX_MIRROR_09 (GFX_MIRROR_START + 9) -#define GFX_MIRROR_10 (GFX_MIRROR_START + 10) -#define GFX_MIRROR_11 (GFX_MIRROR_START + 11) -#define GFX_MIRROR_12 (GFX_MIRROR_START + 12) -#define GFX_MIRROR_13 (GFX_MIRROR_START + 13) -#define GFX_MIRROR_14 (GFX_MIRROR_START + 14) -#define GFX_MIRROR_15 (GFX_MIRROR_START + 15) -#define GFX_MIRROR_END GFX_MIRROR_15 -// row 1 (16) -#define GFX_GRID_STEEL_START 16 -#define GFX_GRID_STEEL GFX_GRID_STEEL_START -#define GFX_GRID_STEEL_00 (GFX_GRID_STEEL_START + 0) -#define GFX_GRID_STEEL_01 (GFX_GRID_STEEL_START + 1) -#define GFX_GRID_STEEL_02 (GFX_GRID_STEEL_START + 2) -#define GFX_GRID_STEEL_03 (GFX_GRID_STEEL_START + 3) -#define GFX_MCDUFFIN_START 20 -#define GFX_MCDUFFIN GFX_MCDUFFIN_START -#define GFX_MCDUFFIN_RIGHT (GFX_MCDUFFIN_START + 0) -#define GFX_MCDUFFIN_UP (GFX_MCDUFFIN_START + 1) -#define GFX_MCDUFFIN_LEFT (GFX_MCDUFFIN_START + 2) -#define GFX_MCDUFFIN_DOWN (GFX_MCDUFFIN_START + 3) -#define GFX_EXIT_CLOSED 24 -#define GFX_EXIT_OPENING_1 25 -#define GFX_EXIT_OPENING_2 26 -#define GFX_EXIT_OPEN 27 -#define GFX_KETTLE 28 -#define GFX_EXPLOSION_KETTLE 29 -// row 2 (32) -#define GFX_PRISM 32 -#define GFX_WALL_SEVERAL 33 -#define GFX_WALL_ANIMATION 34 -#define GFX_BLOCK_WOOD 36 -#define GFX_BOMB 37 -#define GFX_FUSE_ON 38 -#define GFX_FUSE_OFF 39 -#define GFX_GATE_STONE 40 -#define GFX_KEY 41 -#define GFX_LIGHTBULB_OFF 42 -#define GFX_LIGHTBULB_ON 43 -#define GFX_BALL_RED 44 -#define GFX_BALL_BLUE 45 -#define GFX_BALL_YELLOW 46 -#define GFX_BALL_GRAY 47 -// row 3 (48) -#define GFX_BEAMER_START 48 -#define GFX_BEAMER_END 63 -// row 4 (64) -#define GFX_PACMAN_START 64 -#define GFX_PACMAN GFX_PACMAN_START -#define GFX_PACMAN_RIGHT (GFX_PACMAN_START + 0) -#define GFX_PACMAN_UP (GFX_PACMAN_START + 1) -#define GFX_PACMAN_LEFT (GFX_PACMAN_START + 2) -#define GFX_PACMAN_DOWN (GFX_PACMAN_START + 3) -#define GFX_EXPLOSION_START 72 -#define GFX_EXPLOSION_SHORT 76 -#define GFX_EXPLOSION_LAST 78 -// row 5 (80) -#define GFX_POLAR_START 80 -#define GFX_POLAR_END 95 -// row 6 (96) -#define GFX_POLAR_CROSS_START 96 -#define GFX_POLAR_CROSS GFX_POLAR_CROSS_START -#define GFX_POLAR_CROSS_00 (GFX_POLAR_CROSS_START + 0) -#define GFX_POLAR_CROSS_01 (GFX_POLAR_CROSS_START + 1) -#define GFX_POLAR_CROSS_02 (GFX_POLAR_CROSS_START + 2) -#define GFX_POLAR_CROSS_03 (GFX_POLAR_CROSS_START + 3) -#define GFX_MIRROR_FIXED_START 100 -#define GFX_MIRROR_FIXED GFX_MIRROR_FIXED_START -#define GFX_MIRROR_FIXED_00 (GFX_MIRROR_FIXED_START + 0) -#define GFX_MIRROR_FIXED_01 (GFX_MIRROR_FIXED_START + 1) -#define GFX_MIRROR_FIXED_02 (GFX_MIRROR_FIXED_START + 2) -#define GFX_MIRROR_FIXED_03 (GFX_MIRROR_FIXED_START + 3) -// row 7 (112) -#define GFX_BLOCK_STONE 112 -#define GFX_GATE_WOOD 113 -#define GFX_FUEL_FULL 114 -#define GFX_FUEL_EMPTY 115 -#define GFX_GRID_WOOD_00 116 -#define GFX_GRID_WOOD_01 117 -#define GFX_GRID_WOOD_02 118 -#define GFX_GRID_WOOD_03 119 -// row 8 (128) -#define GFX_ARROW_BLUE_LEFT 128 -#define GFX_ARROW_BLUE_RIGHT 129 -#define GFX_ARROW_BLUE_UP 130 -#define GFX_ARROW_BLUE_DOWN 131 -#define GFX_ARROW_RED_LEFT 132 -#define GFX_ARROW_RED_RIGHT 133 -#define GFX_ARROW_RED_UP 134 -#define GFX_ARROW_RED_DOWN 135 -// row 9 (144) -#define GFX_SCROLLBAR_BLUE 144 -#define GFX_SCROLLBAR_RED 145 -// row 10 (160) -#define GFX_MASK_CIRCLE 160 -#define GFX_MASK_RECTANGLE 161 -#define GFX_MASK_RECTANGLE2 162 -#define GFX_MASK_RECTANGLE3 163 -#define GFX_MASK_GRID_00 164 -#define GFX_MASK_GRID_01 165 -#define GFX_MASK_GRID_02 166 -#define GFX_MASK_GRID_03 167 -// row 11 (176) -#define GFX_MASK_MCDUFFIN_00 176 -#define GFX_MASK_MCDUFFIN_01 177 -#define GFX_MASK_MCDUFFIN_02 178 -#define GFX_MASK_MCDUFFIN_03 179 - -// pseudo-graphics; will be mapped to other graphics -#define GFX_WALL_STEEL 192 -#define GFX_WALL_WOOD 193 -#define GFX_WALL_ICE 194 -#define GFX_WALL_AMOEBA 195 -#define GFX_DF_WALL_STEEL 196 -#define GFX_DF_WALL_WOOD 197 - -#define GFX_KUGEL_ROT GFX_BALL_RED -#define GFX_KUGEL_BLAU GFX_BALL_BLUE -#define GFX_KUGEL_GELB GFX_BALL_YELLOW -#define GFX_KUGEL_GRAU GFX_BALL_GRAY - -// graphics from "MirrorFont" -#define GFX_CHAR_START (GFX_START_MIRRORFONT) -#define GFX_CHAR_ASCII0 (GFX_CHAR_START - 32) -#define GFX_CHAR_AUSRUF (GFX_CHAR_ASCII0 + 33) -#define GFX_CHAR_ZOLL (GFX_CHAR_ASCII0 + 34) -#define GFX_CHAR_DOLLAR (GFX_CHAR_ASCII0 + 36) -#define GFX_CHAR_PROZ (GFX_CHAR_ASCII0 + 37) -#define GFX_CHAR_APOSTR (GFX_CHAR_ASCII0 + 39) -#define GFX_CHAR_KLAMM1 (GFX_CHAR_ASCII0 + 40) -#define GFX_CHAR_KLAMM2 (GFX_CHAR_ASCII0 + 41) -#define GFX_CHAR_PLUS (GFX_CHAR_ASCII0 + 43) -#define GFX_CHAR_KOMMA (GFX_CHAR_ASCII0 + 44) -#define GFX_CHAR_MINUS (GFX_CHAR_ASCII0 + 45) -#define GFX_CHAR_PUNKT (GFX_CHAR_ASCII0 + 46) -#define GFX_CHAR_SLASH (GFX_CHAR_ASCII0 + 47) -#define GFX_CHAR_0 (GFX_CHAR_ASCII0 + 48) -#define GFX_CHAR_9 (GFX_CHAR_ASCII0 + 57) -#define GFX_CHAR_DOPPEL (GFX_CHAR_ASCII0 + 58) -#define GFX_CHAR_SEMIKL (GFX_CHAR_ASCII0 + 59) -#define GFX_CHAR_LT (GFX_CHAR_ASCII0 + 60) -#define GFX_CHAR_GLEICH (GFX_CHAR_ASCII0 + 61) -#define GFX_CHAR_GT (GFX_CHAR_ASCII0 + 62) -#define GFX_CHAR_FRAGE (GFX_CHAR_ASCII0 + 63) -#define GFX_CHAR_AT (GFX_CHAR_ASCII0 + 64) -#define GFX_CHAR_A (GFX_CHAR_ASCII0 + 65) -#define GFX_CHAR_Z (GFX_CHAR_ASCII0 + 90) -#define GFX_CHAR_AE (GFX_CHAR_ASCII0 + 91) -#define GFX_CHAR_OE (GFX_CHAR_ASCII0 + 92) -#define GFX_CHAR_UE (GFX_CHAR_ASCII0 + 93) -#define GFX_CHAR_COPY (GFX_CHAR_ASCII0 + 94) -#define GFX_CHAR_END (GFX_CHAR_START + 79) - -// graphics from "MirrorDF" -#define GFX_DF_MIRROR_00 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 0) -#define GFX_DF_MIRROR_01 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 1) -#define GFX_DF_MIRROR_02 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 2) -#define GFX_DF_MIRROR_03 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 3) -#define GFX_DF_MIRROR_04 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 4) -#define GFX_DF_MIRROR_05 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 5) -#define GFX_DF_MIRROR_06 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 6) -#define GFX_DF_MIRROR_07 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 7) -#define GFX_DF_MIRROR_08 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 8) -#define GFX_DF_MIRROR_09 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 9) -#define GFX_DF_MIRROR_10 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 10) -#define GFX_DF_MIRROR_11 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 11) -#define GFX_DF_MIRROR_12 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 12) -#define GFX_DF_MIRROR_13 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 13) -#define GFX_DF_MIRROR_14 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 14) -#define GFX_DF_MIRROR_15 (GFX_START_MIRRORDF + 0 * DF_PER_LINE + 15) - -#define GFX_DF_MIRROR_AUTO_00 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 0) -#define GFX_DF_MIRROR_AUTO_01 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 1) -#define GFX_DF_MIRROR_AUTO_02 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 2) -#define GFX_DF_MIRROR_AUTO_03 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 3) -#define GFX_DF_MIRROR_AUTO_04 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 4) -#define GFX_DF_MIRROR_AUTO_05 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 5) -#define GFX_DF_MIRROR_AUTO_06 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 6) -#define GFX_DF_MIRROR_AUTO_07 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 7) -#define GFX_DF_MIRROR_AUTO_08 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 8) -#define GFX_DF_MIRROR_AUTO_09 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 9) -#define GFX_DF_MIRROR_AUTO_10 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 10) -#define GFX_DF_MIRROR_AUTO_11 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 11) -#define GFX_DF_MIRROR_AUTO_12 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 12) -#define GFX_DF_MIRROR_AUTO_13 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 13) -#define GFX_DF_MIRROR_AUTO_14 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 14) -#define GFX_DF_MIRROR_AUTO_15 (GFX_START_MIRRORDF + 1 * DF_PER_LINE + 15) - -#define GFX_GRID_STEEL_FIXED_00 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 0) -#define GFX_GRID_STEEL_FIXED_01 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 1) -#define GFX_GRID_STEEL_FIXED_02 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 2) -#define GFX_GRID_STEEL_FIXED_03 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 3) -#define GFX_GRID_STEEL_FIXED_04 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 4) -#define GFX_GRID_STEEL_FIXED_05 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 5) -#define GFX_GRID_STEEL_FIXED_06 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 6) -#define GFX_GRID_STEEL_FIXED_07 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 7) -#define GFX_GRID_STEEL_FIXED GFX_GRID_STEEL_FIXED_00 - -#define GFX_GRID_WOOD_FIXED_00 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 8) -#define GFX_GRID_WOOD_FIXED_01 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 9) -#define GFX_GRID_WOOD_FIXED_02 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 10) -#define GFX_GRID_WOOD_FIXED_03 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 11) -#define GFX_GRID_WOOD_FIXED_04 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 12) -#define GFX_GRID_WOOD_FIXED_05 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 13) -#define GFX_GRID_WOOD_FIXED_06 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 14) -#define GFX_GRID_WOOD_FIXED_07 (GFX_START_MIRRORDF + 2 * DF_PER_LINE + 15) -#define GFX_GRID_WOOD_FIXED GFX_GRID_WOOD_FIXED_00 - -#define GFX_GRID_STEEL_AUTO_00 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 0) -#define GFX_GRID_STEEL_AUTO_01 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 1) -#define GFX_GRID_STEEL_AUTO_02 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 2) -#define GFX_GRID_STEEL_AUTO_03 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 3) -#define GFX_GRID_STEEL_AUTO_04 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 4) -#define GFX_GRID_STEEL_AUTO_05 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 5) -#define GFX_GRID_STEEL_AUTO_06 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 6) -#define GFX_GRID_STEEL_AUTO_07 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 7) -#define GFX_GRID_STEEL_AUTO GFX_GRID_STEEL_AUTO_00 - -#define GFX_GRID_WOOD_AUTO_00 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 8) -#define GFX_GRID_WOOD_AUTO_01 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 9) -#define GFX_GRID_WOOD_AUTO_02 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 10) -#define GFX_GRID_WOOD_AUTO_03 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 11) -#define GFX_GRID_WOOD_AUTO_04 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 12) -#define GFX_GRID_WOOD_AUTO_05 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 13) -#define GFX_GRID_WOOD_AUTO_06 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 14) -#define GFX_GRID_WOOD_AUTO_07 (GFX_START_MIRRORDF + 3 * DF_PER_LINE + 15) -#define GFX_GRID_WOOD_AUTO GFX_GRID_WOOD_AUTO_00 - -#define GFX_BEAMER_RED_START (GFX_START_MIRRORDF + 4 * DF_PER_LINE + 0) -#define GFX_BEAMER_RED_END (GFX_START_MIRRORDF + 4 * DF_PER_LINE + 15) -#define GFX_BEAMER_YELLOW_START (GFX_START_MIRRORDF + 5 * DF_PER_LINE + 0) -#define GFX_BEAMER_YELLOW_END (GFX_START_MIRRORDF + 5 * DF_PER_LINE + 15) -#define GFX_BEAMER_GREEN_START (GFX_START_MIRRORDF + 6 * DF_PER_LINE + 0) -#define GFX_BEAMER_GREEN_END (GFX_START_MIRRORDF + 6 * DF_PER_LINE + 15) -#define GFX_BEAMER_BLUE_START (GFX_START_MIRRORDF + 7 * DF_PER_LINE + 0) -#define GFX_BEAMER_BLUE_END (GFX_START_MIRRORDF + 7 * DF_PER_LINE + 15) - -#define GFX_DF_WALL_SEVERAL (GFX_START_MIRRORDF + 8 * DF_PER_LINE + 0) -#define GFX_REFRACTOR (GFX_START_MIRRORDF + 8 * DF_PER_LINE + 1) -#define GFX_CELL (GFX_START_MIRRORDF + 8 * DF_PER_LINE + 2) -#define GFX_MINE (GFX_START_MIRRORDF + 8 * DF_PER_LINE + 4) - -#define GFX_LASER_RIGHT (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 0) -#define GFX_LASER_UP (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 1) -#define GFX_LASER_LEFT (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 2) -#define GFX_LASER_DOWN (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 3) -#define GFX_RECEIVER_RIGHT (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 4) -#define GFX_RECEIVER_UP (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 5) -#define GFX_RECEIVER_LEFT (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 6) -#define GFX_RECEIVER_DOWN (GFX_START_MIRRORDF + 9 * DF_PER_LINE + 7) - -#define GFX_FIBRE_OPTIC_00 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 0) -#define GFX_FIBRE_OPTIC_01 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 1) -#define GFX_FIBRE_OPTIC_02 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 2) -#define GFX_FIBRE_OPTIC_03 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 3) -#define GFX_FIBRE_OPTIC_04 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 4) -#define GFX_FIBRE_OPTIC_05 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 5) -#define GFX_FIBRE_OPTIC_06 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 6) -#define GFX_FIBRE_OPTIC_07 (GFX_START_MIRRORDF + 10 * DF_PER_LINE + 7) - -#define GFX_FIBRE_OPTIC_ED_00 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 0) -#define GFX_FIBRE_OPTIC_ED_01 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 1) -#define GFX_FIBRE_OPTIC_ED_02 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 2) -#define GFX_FIBRE_OPTIC_ED_03 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 3) -#define GFX_FIBRE_OPTIC_ED_04 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 4) -#define GFX_FIBRE_OPTIC_ED_05 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 5) -#define GFX_FIBRE_OPTIC_ED_06 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 6) -#define GFX_FIBRE_OPTIC_ED_07 (GFX_START_MIRRORDF + 11 * DF_PER_LINE + 7) - -// the names of the sounds -#define SND_AMOEBE 0 -#define SND_ANTIGRAV 1 -#define SND_AUTSCH 2 -#define SND_BONG 3 -#define SND_FUEL 4 -#define SND_HALLOFFAME 5 -#define SND_HOLZ 6 -#define SND_HUI 7 -#define SND_KABUMM 8 -#define SND_KINK 9 -#define SND_KLING 10 -#define SND_LASER 11 -#define SND_OEFFNEN 12 -#define SND_QUIEK 13 -#define SND_RHYTHMLOOP 14 -#define SND_ROAAAR 15 -#define SND_SIRR 16 -#define SND_SLURP 17 -#define SND_WARNTON 18 -#define SND_WHOOSH 19 - -#define NUM_SOUNDS 20 - // values for graphics/sounds action types #define MM_ACTION_DEFAULT 0 #define MM_ACTION_WAITING 1 @@ -1123,29 +736,11 @@ extern int num_element_info; #define GAME_OVER_BOMB 3 #define GAME_OVER_DELAYED 4 -// values for color_status -#define STATIC_COLORS 0 -#define DYNAMIC_COLORS 1 - #define PROGRAM_VERSION_MAJOR 2 #define PROGRAM_VERSION_MINOR 0 #define PROGRAM_VERSION_PATCH 2 #define PROGRAM_VERSION_STRING "2.0.2" -#define PROGRAM_TITLE_STRING "Mirror Magic II" -#define PROGRAM_AUTHOR_STRING "Holger Schemel" -#define PROGRAM_RIGHTS_STRING "Copyright ^1994-2001" -#define PROGRAM_DOS_PORT_STRING "DOS port based on code by Guido Schulz" -#define PROGRAM_IDENT_STRING PROGRAM_VERSION_STRING " " TARGET_STRING -#define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING -#define WINDOW_SUBTITLE_STRING PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING -#define ICON_TITLE_STRING PROGRAM_TITLE_STRING -#define UNIX_USERDATA_DIRECTORY ".mirrormagic" - -#define X11_ICON_FILENAME "mirrormagic_icon.xbm" -#define X11_ICONMASK_FILENAME "mirrormagic_iconmask.xbm" -#define MSDOS_POINTER_FILENAME "mouse.pcx" - // functions for version handling #define MM_VERSION_IDENT(x,y,z) VERSION_IDENT(x,y,z,0) #define MM_VERSION_MAJOR(x) VERSION_PART_1(x) @@ -1169,8 +764,4 @@ extern int num_element_info; PROGRAM_VERSION_MINOR, \ PROGRAM_VERSION_PATCH) -// sound control - -#define ST(x) (((x) - 8) * 16) - #endif // MM_MAIN_H diff --git a/src/game_mm/mm_tools.c b/src/game_mm/mm_tools.c index 6a9e3a8a..02eb5dfb 100644 --- a/src/game_mm/mm_tools.c +++ b/src/game_mm/mm_tools.c @@ -133,13 +133,6 @@ void DrawMiniGraphic_MM(int x, int y, int graphic) MarkTileDirty(x / 2, y / 2); } -#if 0 -static void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) -{ - getSizedGraphicSource(graphic, 0, TILESIZE / 4, bitmap, x, y); -} -#endif - void DrawMiniGraphicExt_MM(DrawBuffer *d, int x, int y, int graphic) { Bitmap *bitmap; @@ -536,64 +529,6 @@ void DrawElement_MM(int x, int y, int element) DrawGraphic_MM(x, y, el2gfx(element)); } -#if 0 -static void DrawMicroWalls_MM(int x, int y, int element) -{ - Bitmap *bitmap; - int graphic = el2gfx(WALL_BASE(element)); - int gx, gy; - int i; - - getMicroGraphicSource(graphic, &bitmap, &gx, &gy); - - for (i = 0; i < 4; i++) - { - int xpos = MICROLEV_XPOS + x * MICRO_TILEX + MICRO_WALLX * (i % 2); - int ypos = MICROLEV_YPOS + y * MICRO_TILEY + MICRO_WALLY * (i / 2); - - if (element & (1 << i)) - BlitBitmap(bitmap, drawto, gx, gy, MICRO_WALLX, MICRO_WALLY, xpos, ypos); - else - ClearRectangle(drawto, xpos, ypos, MICRO_WALLX, MICRO_WALLY); - } -} - -static void DrawMicroElement_MM(int x, int y, int element) -{ - Bitmap *bitmap; - int graphic = el2gfx(element); - int gx, gy; - - if (element == EL_EMPTY) - return; - - if (IS_WALL(element)) - { - DrawMicroWalls_MM(x, y, element); - - return; - } - - getMicroGraphicSource(graphic, &bitmap, &gx, &gy); - - BlitBitmap(bitmap, drawto, gx, gy, MICRO_TILEX, MICRO_TILEY, - MICROLEV_XPOS + x * MICRO_TILEX, MICROLEV_YPOS + y * MICRO_TILEY); -} - -static void DrawMicroLevelExt_MM(int xpos, int ypos) -{ - int x, y; - - ClearRectangle(drawto, xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE); - - for (x = 0; x < STD_LEV_FIELDX; x++) - for (y = 0; y < STD_LEV_FIELDY; y++) - DrawMicroElement_MM(x, y, Ur[x][y]); - - redraw_mask |= REDRAW_FIELD; -} -#endif - // ---------------------------------------------------------------------------- // XSN @@ -1159,21 +1094,6 @@ void DrawTileCursor_MM(int draw_target, boolean tile_cursor_active) dst_x, dst_y); } -#if 0 -static int REQ_in_range(int x, int y) -{ - if (y > DY + 249 && y < DY + 278) - { - if (x > DX + 1 && x < DX + 48) - return 1; - else if (x > DX + 51 && x < DX + 98) - return 2; - } - - return 0; -} -#endif - Pixel ReadPixel(DrawBuffer *bitmap, int x, int y) { return GetPixel(bitmap, x, y);