#include "cartoons.h"
#include "config.h"
+#include "conf_e2g.c" /* include auto-generated data structure definitions */
+
+
static char *image_filename[NUM_PICTURES] =
{
+#if 0
+ "RocksScreen.pcx",
+ "RocksDoor.pcx",
+ "RocksToons.pcx",
+ "RocksFontBig.pcx",
+ "RocksFontSmall.pcx",
+ "RocksFontMedium.pcx",
+ "RocksFontEM.pcx"
+#else
"RocksScreen.pcx",
"RocksElements.pcx",
"RocksDoor.pcx",
"RocksFontSmall.pcx",
"RocksFontMedium.pcx",
"RocksFontEM.pcx"
+#endif
};
static void InitSetup(void);
InitLevelInfo();
InitLevelArtworkInfo();
- InitGadgets(); /* needs to know number of level series */
InitImages(); /* needs to know current level directory */
InitSound(); /* needs to know current level directory */
+ InitGadgets(); /* needs images + number of level series */
InitGfxBackground();
InitToons();
unsigned long clip_gc_valuemask;
#if defined(TARGET_X11_NATIVE)
+
+#if 0
GC copy_clipmask_gc;
static struct
{ GFX2_SHIELD_ACTIVE, 3 },
{ -1, 0 }
};
+#endif
+
#endif /* TARGET_X11_NATIVE */
#endif /* TARGET_X11 */
int i;
/* initialize pixmap array for special X11 tile clipping to Pixmap 'None' */
- for(i=0; i<NUM_TILES; i++)
+ for (i=0; i<NUM_TILES; i++)
tile_clipmask[i] = None;
#if defined(TARGET_X11)
tile_clip_gc = XCreateGC(display, window->drawable,
clip_gc_valuemask, &clip_gc_values);
- for(i=0; i<NUM_BITMAPS; i++)
+ for (i=0; i<NUM_BITMAPS; i++)
{
if (pix[i]->clip_mask)
{
#if defined(TARGET_X11_NATIVE)
+#if 0
/* create graphic context structures needed for clipping */
clip_gc_values.graphics_exposures = False;
clip_gc_valuemask = GCGraphicsExposures;
clip_gc_valuemask, &clip_gc_values);
/* create only those clipping Pixmaps we really need */
- for(i=0; tile_needs_clipping[i].start>=0; i++)
+ for (i=0; tile_needs_clipping[i].start>=0; i++)
{
int j;
- for(j=0; j<tile_needs_clipping[i].count; j++)
+ for (j=0; j<tile_needs_clipping[i].count; j++)
{
int tile = tile_needs_clipping[i].start + j;
int graphic = tile;
}
XFreeGC(display, copy_clipmask_gc);
+#endif
#endif /* TARGET_X11_NATIVE */
#endif /* TARGET_X11 */
#if defined(TARGET_X11)
int i;
- for(i=0; i<NUM_TILES; i++)
+ for (i=0; i<NUM_TILES; i++)
{
if (tile_clipmask[i] != None)
{
XFreeGC(display, tile_clip_gc);
tile_clip_gc = None;
- for(i=0; i<NUM_BITMAPS; i++)
+ for (i=0; i<NUM_BITMAPS; i++)
{
if (pix[i] != NULL && pix[i]->stored_clip_gc)
{
DrawInitText("Loading graphics:", 120, FC_GREEN);
- for(i=0; i<NUM_PICTURES; i++)
+ for (i=0; i<NUM_PICTURES; i++)
{
if (i != PIX_FONT_SMALL)
{
ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
ClearRectangle(pix[PIX_DB_DOOR], 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
- for(x=0; x<MAX_BUF_XSIZE; x++)
- for(y=0; y<MAX_BUF_YSIZE; y++)
+ for (x=0; x<MAX_BUF_XSIZE; x++)
+ for (y=0; y<MAX_BUF_YSIZE; y++)
redraw[x][y] = 0;
redraw_tiles = 0;
redraw_mask = REDRAW_ALL;
ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
- for(i=0; i<NUM_PICTURES; i++)
+ for (i=0; i<NUM_PICTURES; i++)
{
DrawInitText(image_filename[i], 150, FC_YELLOW);
ReloadCustomImage(pix[i], image_filename[i]);
void InitElementInfo()
{
- int i, j;
-
+#if 0
static struct
{
int element;
{ EL_WALL, GFX_MAUERWERK },
{ EL_WALL_CRUMBLED, GFX_FELSBODEN },
{ EL_ROCK, GFX_FELSBROCKEN },
- { EL_KEY, GFX_SCHLUESSEL },
{ EL_EMERALD, GFX_EDELSTEIN },
{ EL_EXIT_CLOSED, GFX_AUSGANG_ZU },
- { EL_AUSGANG_ACT, GFX_AUSGANG_ACT },
+ { EL_EXIT_OPENING, GFX_AUSGANG_ACT },
{ EL_EXIT_OPEN, GFX_AUSGANG_AUF },
{ EL_SP_EXIT_OPEN, GFX_SP_EXIT },
- { EL_PLAYER, GFX_SPIELFIGUR },
{ EL_PLAYER1, GFX_SPIELER1 },
{ EL_PLAYER2, GFX_SPIELER2 },
{ EL_PLAYER3, GFX_SPIELER3 },
{ EL_SPACESHIP_UP, GFX_FLIEGER_UP },
{ EL_SPACESHIP_LEFT, GFX_FLIEGER_LEFT },
{ EL_SPACESHIP_DOWN, GFX_FLIEGER_DOWN },
- { EL_BUTTERFLY, GFX_BUTTERFLY },
- { EL_BUTTERFLY_RIGHT, GFX_BUTTERFLY_RIGHT },
- { EL_BUTTERFLY_UP, GFX_BUTTERFLY_UP },
- { EL_BUTTERFLY_LEFT, GFX_BUTTERFLY_LEFT },
- { EL_BUTTERFLY_DOWN, GFX_BUTTERFLY_DOWN },
- { EL_FIREFLY, GFX_FIREFLY },
- { EL_FIREFLY_RIGHT, GFX_FIREFLY_RIGHT },
- { EL_FIREFLY_UP, GFX_FIREFLY_UP },
- { EL_FIREFLY_LEFT, GFX_FIREFLY_LEFT },
- { EL_FIREFLY_DOWN, GFX_FIREFLY_DOWN },
+ { EL_BD_BUTTERFLY, GFX_BUTTERFLY },
+ { EL_BD_BUTTERFLY_RIGHT, GFX_BUTTERFLY_RIGHT },
+ { EL_BD_BUTTERFLY_UP, GFX_BUTTERFLY_UP },
+ { EL_BD_BUTTERFLY_LEFT, GFX_BUTTERFLY_LEFT },
+ { EL_BD_BUTTERFLY_DOWN, GFX_BUTTERFLY_DOWN },
+ { EL_BD_FIREFLY, GFX_FIREFLY },
+ { EL_BD_FIREFLY_RIGHT, GFX_FIREFLY_RIGHT },
+ { EL_BD_FIREFLY_UP, GFX_FIREFLY_UP },
+ { EL_BD_FIREFLY_LEFT, GFX_FIREFLY_LEFT },
+ { EL_BD_FIREFLY_DOWN, GFX_FIREFLY_DOWN },
{ EL_YAMYAM, GFX_MAMPFER },
{ EL_ROBOT, GFX_ROBOT },
{ EL_STEELWALL, GFX_BETON },
{ EL_AMOEBA_DROP, GFX_TROPFEN },
{ EL_BOMB, GFX_BOMBE },
{ EL_MAGIC_WALL, GFX_MAGIC_WALL_OFF },
- { EL_MAGIC_WALL_EMPTY, GFX_MAGIC_WALL_EMPTY },
+ { EL_MAGIC_WALL_ACTIVE, GFX_MAGIC_WALL_EMPTY },
{ EL_MAGIC_WALL_EMPTYING, GFX_MAGIC_WALL_EMPTY },
{ EL_MAGIC_WALL_FULL, GFX_MAGIC_WALL_FULL },
{ EL_MAGIC_WALL_DEAD, GFX_MAGIC_WALL_DEAD },
{ EL_PACMAN_LEFT, GFX_PACMAN_LEFT },
{ EL_PACMAN_DOWN, GFX_PACMAN_DOWN },
{ EL_INVISIBLE_WALL, GFX_UNSICHTBAR },
+ { EL_INVISIBLE_WALL_ACTIVE, GFX_UNSICHTBAR_ON },
{ EL_WALL_EMERALD, GFX_ERZ_EDEL },
{ EL_WALL_DIAMOND, GFX_ERZ_DIAM },
{ EL_LAMP, GFX_BIRNE_AUS },
{ EL_WALL_EMERALD_RED, GFX_ERZ_EDEL_ROT },
{ EL_WALL_EMERALD_PURPLE, GFX_ERZ_EDEL_LILA },
{ EL_DARK_YAMYAM, GFX_MAMPFER2 },
- { EL_MAGIC_WALL_BD_OFF, GFX_MAGIC_WALL_BD_OFF },
- { EL_MAGIC_WALL_BD_EMPTY, GFX_MAGIC_WALL_BD_EMPTY },
- { EL_MAGIC_WALL_BD_EMPTYING, GFX_MAGIC_WALL_BD_EMPTY },
- { EL_MAGIC_WALL_BD_FULL, GFX_MAGIC_WALL_BD_FULL },
- { EL_MAGIC_WALL_BD_DEAD, GFX_MAGIC_WALL_BD_DEAD },
- { EL_DYNABOMB_ACTIVE_1, GFX_DYNABOMB },
- { EL_DYNABOMB_ACTIVE_2, GFX_DYNABOMB },
- { EL_DYNABOMB_ACTIVE_3, GFX_DYNABOMB },
- { EL_DYNABOMB_ACTIVE_4, GFX_DYNABOMB },
+ { EL_BD_MAGIC_WALL, GFX_MAGIC_WALL_BD_OFF },
+ { EL_BD_MAGIC_WALL_ACTIVE, GFX_MAGIC_WALL_BD_EMPTY },
+ { EL_BD_MAGIC_WALL_EMPTYING, GFX_MAGIC_WALL_BD_EMPTY },
+ { EL_BD_MAGIC_WALL_FULL, GFX_MAGIC_WALL_BD_FULL },
+ { EL_BD_MAGIC_WALL_DEAD, GFX_MAGIC_WALL_BD_DEAD },
+ { EL_DYNABOMB_PLAYER1_ACTIVE, GFX_DYNABOMB },
+ { EL_DYNABOMB_PLAYER2_ACTIVE, GFX_DYNABOMB },
+ { EL_DYNABOMB_PLAYER3_ACTIVE, GFX_DYNABOMB },
+ { EL_DYNABOMB_PLAYER4_ACTIVE, GFX_DYNABOMB },
{ EL_DYNABOMB_NR, GFX_DYNABOMB_NR },
{ EL_DYNABOMB_SZ, GFX_DYNABOMB_SZ },
{ EL_DYNABOMB_XL, GFX_DYNABOMB_XL },
- { EL_SOKOBAN_OBJEKT, GFX_SOKOBAN_OBJEKT },
- { EL_SOKOBAN_FELD_LEER, GFX_SOKOBAN_FELD_LEER },
- { EL_SOKOBAN_FELD_VOLL, GFX_SOKOBAN_FELD_VOLL },
+ { EL_SOKOBAN_OBJECT, GFX_SOKOBAN_OBJEKT },
+ { EL_SOKOBAN_FIELD_EMPTY, GFX_SOKOBAN_FELD_LEER },
+ { EL_SOKOBAN_FIELD_FULL, GFX_SOKOBAN_FELD_VOLL },
{ EL_MOLE, GFX_MOLE },
{ EL_PENGUIN, GFX_PINGUIN },
{ EL_PIG, GFX_SCHWEIN },
{ EL_DRAGON, GFX_DRACHE },
{ EL_SATELLITE, GFX_SONDE },
- { EL_ARROW_LEFT, GFX_PFEIL_LEFT },
- { EL_ARROW_RIGHT, GFX_PFEIL_RIGHT },
- { EL_ARROW_UP, GFX_PFEIL_UP },
- { EL_ARROW_DOWN, GFX_PFEIL_DOWN },
+ { EL_ARROW_BLUE_LEFT, GFX_PFEIL_LEFT },
+ { EL_ARROW_BLUE_RIGHT, GFX_PFEIL_RIGHT },
+ { EL_ARROW_BLUE_UP, GFX_PFEIL_UP },
+ { EL_ARROW_BLUE_DOWN, GFX_PFEIL_DOWN },
{ EL_SPEED_PILL, GFX_SPEED_PILL },
{ EL_SP_TERMINAL_ACTIVE, GFX_SP_TERMINAL },
- { EL_SP_BUG_ACTIVE, GFX_SP_BUG_ACTIVE },
+ { EL_SP_BUGGY_BASE_ACTIVE, GFX_SP_BUG_ACTIVE },
{ EL_SP_ZONK, GFX_SP_ZONK },
{ EL_INVISIBLE_STEELWALL, GFX_INVISIBLE_STEEL },
+ { EL_INVISIBLE_STEELWALL_ACTIVE, GFX_INVISIBLE_STEEL_ON },
{ EL_BLACK_ORB, GFX_BLACK_ORB },
{ EL_EM_GATE1, GFX_EM_GATE_1 },
{ EL_EM_GATE2, GFX_EM_GATE_2 },
{ EL_DOOR_WHITE_GRAY, GFX_DOOR_WHITE_GRAY },
{ EL_KEY_WHITE, GFX_KEY_WHITE },
{ EL_SHIELD_NORMAL, GFX_SHIELD_PASSIVE },
- { EL_SHIELD_ACTIVE, GFX_SHIELD_ACTIVE },
+ { EL_SHIELD_DEADLY, GFX_SHIELD_ACTIVE },
{ EL_EXTRA_TIME, GFX_EXTRA_TIME },
{ EL_SWITCHGATE_OPEN, GFX_SWITCHGATE_OPEN },
{ EL_SWITCHGATE_CLOSED, GFX_SWITCHGATE_CLOSED },
{ EL_CONVEYOR_BELT1_LEFT, GFX_BELT1_LEFT },
{ EL_CONVEYOR_BELT1_MIDDLE, GFX_BELT1_MIDDLE },
{ EL_CONVEYOR_BELT1_RIGHT, GFX_BELT1_RIGHT },
+ { EL_CONVEYOR_BELT1_LEFT_ACTIVE, GFX_BELT1_LEFT },
+ { EL_CONVEYOR_BELT1_MIDDLE_ACTIVE, GFX_BELT1_MIDDLE },
+ { EL_CONVEYOR_BELT1_RIGHT_ACTIVE, GFX_BELT1_RIGHT },
{ EL_CONVEYOR_BELT1_SWITCH_LEFT, GFX_BELT1_SWITCH_LEFT },
{ EL_CONVEYOR_BELT1_SWITCH_MIDDLE, GFX_BELT1_SWITCH_MIDDLE },
{ EL_CONVEYOR_BELT1_SWITCH_RIGHT, GFX_BELT1_SWITCH_RIGHT },
{ EL_CONVEYOR_BELT2_LEFT, GFX_BELT2_LEFT },
{ EL_CONVEYOR_BELT2_MIDDLE, GFX_BELT2_MIDDLE },
{ EL_CONVEYOR_BELT2_RIGHT, GFX_BELT2_RIGHT },
+ { EL_CONVEYOR_BELT2_LEFT_ACTIVE, GFX_BELT2_LEFT },
+ { EL_CONVEYOR_BELT2_MIDDLE_ACTIVE, GFX_BELT2_MIDDLE },
+ { EL_CONVEYOR_BELT2_RIGHT_ACTIVE, GFX_BELT2_RIGHT },
{ EL_CONVEYOR_BELT2_SWITCH_LEFT, GFX_BELT2_SWITCH_LEFT },
{ EL_CONVEYOR_BELT2_SWITCH_MIDDLE, GFX_BELT2_SWITCH_MIDDLE },
{ EL_CONVEYOR_BELT2_SWITCH_RIGHT, GFX_BELT2_SWITCH_RIGHT },
{ EL_CONVEYOR_BELT3_LEFT, GFX_BELT3_LEFT },
{ EL_CONVEYOR_BELT3_MIDDLE, GFX_BELT3_MIDDLE },
{ EL_CONVEYOR_BELT3_RIGHT, GFX_BELT3_RIGHT },
+ { EL_CONVEYOR_BELT3_LEFT_ACTIVE, GFX_BELT3_LEFT },
+ { EL_CONVEYOR_BELT3_MIDDLE_ACTIVE, GFX_BELT3_MIDDLE },
+ { EL_CONVEYOR_BELT3_RIGHT_ACTIVE, GFX_BELT3_RIGHT },
{ EL_CONVEYOR_BELT3_SWITCH_LEFT, GFX_BELT3_SWITCH_LEFT },
{ EL_CONVEYOR_BELT3_SWITCH_MIDDLE, GFX_BELT3_SWITCH_MIDDLE },
{ EL_CONVEYOR_BELT3_SWITCH_RIGHT, GFX_BELT3_SWITCH_RIGHT },
{ EL_CONVEYOR_BELT4_LEFT, GFX_BELT4_LEFT },
{ EL_CONVEYOR_BELT4_MIDDLE, GFX_BELT4_MIDDLE },
{ EL_CONVEYOR_BELT4_RIGHT, GFX_BELT4_RIGHT },
+ { EL_CONVEYOR_BELT4_LEFT_ACTIVE, GFX_BELT4_LEFT },
+ { EL_CONVEYOR_BELT4_MIDDLE_ACTIVE, GFX_BELT4_MIDDLE },
+ { EL_CONVEYOR_BELT4_RIGHT_ACTIVE, GFX_BELT4_RIGHT },
{ EL_CONVEYOR_BELT4_SWITCH_LEFT, GFX_BELT4_SWITCH_LEFT },
{ EL_CONVEYOR_BELT4_SWITCH_MIDDLE, GFX_BELT4_SWITCH_MIDDLE },
{ EL_CONVEYOR_BELT4_SWITCH_RIGHT, GFX_BELT4_SWITCH_RIGHT },
{ EL_MOLE_UP, GFX_MOLE_UP },
{ EL_MOLE_DOWN, GFX_MOLE_DOWN },
{ EL_STEELWALL_SLANTED, GFX_STEEL_SLANTED },
- { EL_SAND_INVISIBLE, GFX_SAND_INVISIBLE },
+ { EL_INVISIBLE_SAND, GFX_SAND_INVISIBLE },
+ { EL_INVISIBLE_SAND_ACTIVE, GFX_SAND_INVISIBLE_ON },
{ EL_DX_UNKNOWN_15, GFX_DX_UNKNOWN_15 },
{ EL_DX_UNKNOWN_42, GFX_DX_UNKNOWN_42 },
{ EL_TIMEGATE_OPEN, GFX_TIMEGATE_OPEN },
{ EL_TIMEGATE_CLOSED, GFX_TIMEGATE_CLOSED },
- { EL_TIMEGATE_SWITCH_ON, GFX_TIMEGATE_SWITCH },
- { EL_TIMEGATE_SWITCH_OFF, GFX_TIMEGATE_SWITCH },
+ { EL_TIMEGATE_SWITCH_ACTIVE, GFX_TIMEGATE_SWITCH },
+ { EL_TIMEGATE_SWITCH, GFX_TIMEGATE_SWITCH },
{ EL_BALLOON, GFX_BALLOON },
{ EL_BALLOON_SEND_LEFT, GFX_BALLOON_SEND_LEFT },
{ EL_BALLOON_SEND_RIGHT, GFX_BALLOON_SEND_RIGHT },
{ EL_BALLOON_SEND_UP, GFX_BALLOON_SEND_UP },
{ EL_BALLOON_SEND_DOWN, GFX_BALLOON_SEND_DOWN },
- { EL_BALLOON_SEND_ANY, GFX_BALLOON_SEND_ANY },
+ { EL_BALLOON_SEND_ANY_DIRECTION, GFX_BALLOON_SEND_ANY },
{ EL_EMC_STEELWALL1, GFX_EMC_STEEL_WALL_1 },
{ EL_EMC_STEELWALL2, GFX_EMC_STEEL_WALL_2 },
{ EL_EMC_STEELWALL3, GFX_EMC_STEEL_WALL_3 },
{ EL_EMC_WALL6, GFX_EMC_WALL_6 },
{ EL_EMC_WALL7, GFX_EMC_WALL_7 },
{ EL_EMC_WALL8, GFX_EMC_WALL_8 },
- { EL_TUBE_CROSS, GFX_TUBE_CROSS },
+ { EL_TUBE_ALL, GFX_TUBE_CROSS },
{ EL_TUBE_VERTICAL, GFX_TUBE_VERTICAL },
{ EL_TUBE_HORIZONTAL, GFX_TUBE_HORIZONTAL },
- { EL_TUBE_VERT_LEFT, GFX_TUBE_VERT_LEFT },
- { EL_TUBE_VERT_RIGHT, GFX_TUBE_VERT_RIGHT },
- { EL_TUBE_HORIZ_UP, GFX_TUBE_HORIZ_UP },
- { EL_TUBE_HORIZ_DOWN, GFX_TUBE_HORIZ_DOWN },
+ { EL_TUBE_VERTICAL_LEFT, GFX_TUBE_VERT_LEFT },
+ { EL_TUBE_VERTICAL_RIGHT, GFX_TUBE_VERT_RIGHT },
+ { EL_TUBE_HORIZONTAL_UP, GFX_TUBE_HORIZ_UP },
+ { EL_TUBE_HORIZONTAL_DOWN, GFX_TUBE_HORIZ_DOWN },
{ EL_TUBE_LEFT_UP, GFX_TUBE_LEFT_UP },
{ EL_TUBE_LEFT_DOWN, GFX_TUBE_LEFT_DOWN },
{ EL_TUBE_RIGHT_UP, GFX_TUBE_RIGHT_UP },
{ EL_TUBE_RIGHT_DOWN, GFX_TUBE_RIGHT_DOWN },
{ EL_SPRING, GFX_SPRING },
{ EL_SPRING_MOVING, GFX_SPRING },
- { EL_TRAP_INACTIVE, GFX_TRAP_INACTIVE },
+ { EL_TRAP, GFX_TRAP_INACTIVE },
{ EL_TRAP_ACTIVE, GFX_TRAP_ACTIVE },
{ EL_BD_WALL, GFX_BD_WALL },
{ EL_BD_ROCK, GFX_BD_ROCK },
}
element_to_direction_graphic[] =
{
- {
- EL_SPACESHIP,
- IMG_SPACESHIP_LEFT, IMG_SPACESHIP_RIGHT,
- IMG_SPACESHIP_UP, IMG_SPACESHIP_DOWN
- },
- {
- EL_BUG,
- IMG_BUG_LEFT, IMG_BUG_RIGHT,
- IMG_BUG_UP, IMG_BUG_DOWN
- },
- {
- EL_PACMAN,
- IMG_PACMAN_LEFT, IMG_PACMAN_RIGHT,
- IMG_PACMAN_UP, IMG_PACMAN_DOWN
- },
{
EL_PLAYER1,
IMG_PLAYER1_LEFT, IMG_PLAYER1_RIGHT,
IMG_PLAYER4_UP, IMG_PLAYER4_DOWN
},
{
- EL_PIG,
- IMG_PIG_LEFT, IMG_PIG_RIGHT,
- IMG_PIG_UP, IMG_PIG_DOWN
+ EL_SP_MURPHY,
+ IMG_SP_MURPHY_LEFT, IMG_SP_MURPHY_RIGHT,
+ IMG_SP_MURPHY_UP, IMG_SP_MURPHY_DOWN
},
{
- EL_DRAGON,
- IMG_DRAGON_LEFT, IMG_DRAGON_RIGHT,
- IMG_DRAGON_UP, IMG_DRAGON_DOWN
+ EL_SP_SNIKSNAK,
+ IMG_SP_SNIKSNAK_LEFT, IMG_SP_SNIKSNAK_RIGHT,
+ IMG_SP_SNIKSNAK_UP, IMG_SP_SNIKSNAK_DOWN
+ },
+ {
+ EL_BUG,
+ IMG_BUG_LEFT, IMG_BUG_RIGHT,
+ IMG_BUG_UP, IMG_BUG_DOWN
+ },
+ {
+ EL_SPACESHIP,
+ IMG_SPACESHIP_LEFT, IMG_SPACESHIP_RIGHT,
+ IMG_SPACESHIP_UP, IMG_SPACESHIP_DOWN
+ },
+ {
+ EL_PACMAN,
+ IMG_PACMAN_LEFT, IMG_PACMAN_RIGHT,
+ IMG_PACMAN_UP, IMG_PACMAN_DOWN
},
{
EL_MOLE,
IMG_PENGUIN_UP, IMG_PENGUIN_DOWN
},
{
- EL_SP_MURPHY,
- IMG_SP_MURPHY_LEFT, IMG_SP_MURPHY_RIGHT,
- IMG_SP_MURPHY_UP, IMG_SP_MURPHY_DOWN
+ EL_PIG,
+ IMG_PIG_LEFT, IMG_PIG_RIGHT,
+ IMG_PIG_UP, IMG_PIG_DOWN
},
{
- EL_SP_SNIKSNAK,
- IMG_SP_SNIKSNAK_LEFT, IMG_SP_SNIKSNAK_RIGHT,
- IMG_SP_SNIKSNAK_UP, IMG_SP_SNIKSNAK_DOWN
+ EL_DRAGON,
+ IMG_DRAGON_LEFT, IMG_DRAGON_RIGHT,
+ IMG_DRAGON_UP, IMG_DRAGON_DOWN
},
{
-1,
-1, -1
}
};
+#endif
+
+ int i, act, dir;
- /* always start with reliable default values */
- for(i=0; i<MAX_ELEMENTS; i++)
+ /* set values to -1 to identify later as "uninitialized" values */
+ for (i=0; i<MAX_ELEMENTS; i++)
{
- for(j=0; j<NUM_GFX_ACTIONS_MAPPED; j++)
+ for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
{
- element_info[i].graphic[j] = GFX_LEERRAUM;
- element_info[i].has_direction_graphic[j] = FALSE;
+ element_info[i].graphic[act] = -1;
+
+ for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+ element_info[i].direction_graphic[act][dir] = -1;
}
}
+#if 0
for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
element_info[i].graphic[GFX_ACTION_DEFAULT] =
GFX_CHAR_START + (i - EL_CHAR_START);
+#else
+ for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+ element_info[i].graphic[GFX_ACTION_DEFAULT] =
+ IMG_CHAR_START + (i - EL_CHAR_START);
+#endif
+#if 0
for (i=EL_SP_START; i<=EL_SP_END; i++)
{
int nr_element = i - EL_SP_START;
element_info[i].graphic[GFX_ACTION_DEFAULT] =
GFX_START_ROCKSSP + nr_graphic;
}
+#endif
+#if 0
/* this overrides some of the above default settings (GFX_SP_ZONK etc.) */
i = 0;
while (element_to_graphic[i].element > -1)
element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT] = TRUE;
i++;
}
+#else
+
+ i = 0;
+ while (element_to_graphic[i].element > -1)
+ {
+ int element = element_to_graphic[i].element;
+ int direction = element_to_graphic[i].direction;
+ int action = element_to_graphic[i].action;
+ int graphic = element_to_graphic[i].graphic;
+
+ if (action > -1)
+ action = graphics_action_mapping[action];
+ else
+ action = GFX_ACTION_DEFAULT;
+
+ if (direction > -1)
+ {
+ direction = MV_DIR_BIT(direction);
+
+ element_info[element].direction_graphic[action][direction] = graphic;
+ }
+ else
+ element_info[element].graphic[action] = graphic;
+
+ i++;
+ }
+
+ /* now set all '-1' values to element specific default values */
+ for (i=0; i<MAX_ELEMENTS; i++)
+ {
+ int default_action_graphic = element_info[i].graphic[GFX_ACTION_DEFAULT];
+ int default_action_direction_graphic[NUM_MV_DIRECTIONS];
+
+ if (default_action_graphic == -1)
+ default_action_graphic = IMG_CHAR_QUESTION;
+
+ for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+ {
+ default_action_direction_graphic[dir] =
+ element_info[i].direction_graphic[GFX_ACTION_DEFAULT][dir];
+
+ if (default_action_direction_graphic[dir] == -1)
+ default_action_direction_graphic[dir] = default_action_graphic;
+ }
+
+ for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+ {
+ for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
+ {
+ int default_direction_graphic = element_info[i].graphic[act];
+
+ /* no graphic for current action -- use default direction graphic */
+ if (default_direction_graphic == -1)
+ default_direction_graphic = default_action_direction_graphic[dir];
+
+ if (element_info[i].direction_graphic[act][dir] == -1)
+ element_info[i].direction_graphic[act][dir] =
+ default_direction_graphic;
+ }
+
+ /* no graphic for this specific action -- use default action graphic */
+ if (element_info[i].graphic[act] == -1)
+ element_info[i].graphic[act] = default_action_graphic;
+ }
+ }
+
+#endif
}
static void InitGraphicInfo()
{
+ static int gfx_action[NUM_IMAGE_FILES];
+ Bitmap *src_bitmap;
+ int src_x, src_y;
+ int last_frame;
int i;
image_files = getCurrentImageList();
- for(i=0; i<MAX_GRAPHICS; i++)
+#if 0
+ for (i=0; i<MAX_GRAPHICS; i++)
{
/* always start with reliable default values */
graphic_info[i].bitmap = NULL;
getGraphicSource(i, &graphic_info[i].bitmap,
&graphic_info[i].src_x, &graphic_info[i].src_y);
}
+#endif
+
+ /* set temporary graphics action field to default value */
+ for (i=0; i<NUM_IMAGE_FILES; i++)
+ gfx_action[i] = GFX_ACTION_DEFAULT;
+
+ /* set temporary graphics action field from element_to_graphic list */
+ i = 0;
+ while (element_to_graphic[i].element > -1)
+ {
+ int action = element_to_graphic[i].action;
+ int graphic = element_to_graphic[i].graphic;
+
+ if (action == -1)
+ action = GFX_ACTION_DEFAULT;
+
+ gfx_action[graphic] = action;
+
+ i++;
+ }
- for(i=0; i<NUM_IMAGE_FILES; i++)
+ for (i=0; i<NUM_IMAGE_FILES; i++)
{
int *parameter = image_files[i].parameter;
- /* always start with reliable default values */
new_graphic_info[i].bitmap = getBitmapFromImageID(i);
+
new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
+ new_graphic_info[i].offset_x = parameter[GFX_ARG_OFFSET];
+ new_graphic_info[i].offset_y = 0;
+
+ /* animation frames are ordered vertically instead of horizontally */
+ if (parameter[GFX_ARG_VERTICAL])
+ {
+ new_graphic_info[i].offset_x = 0;
+ new_graphic_info[i].offset_y = parameter[GFX_ARG_OFFSET];
+ }
new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
if (new_graphic_info[i].anim_delay == 0) /* delay must be at least 1 */
new_graphic_info[i].anim_delay = 1;
- /* basically, animation can be either normal or reverse direction */
- if (parameter[GFX_ARG_REVERSE])
- new_graphic_info[i].anim_mode = ANIM_REVERSE;
+ /* set mode for animation frame order */
+ if (parameter[GFX_ARG_MODE_LOOP])
+ new_graphic_info[i].anim_mode = ANIM_LOOP;
+ else if (parameter[GFX_ARG_MODE_LINEAR])
+ new_graphic_info[i].anim_mode = ANIM_LINEAR;
+ else if (parameter[GFX_ARG_MODE_PINGPONG])
+ new_graphic_info[i].anim_mode = ANIM_PINGPONG;
+ else if (parameter[GFX_ARG_MODE_PINGPONG2])
+ new_graphic_info[i].anim_mode = ANIM_PINGPONG2;
+ else if (parameter[GFX_ARG_FRAMES] > 1)
+ new_graphic_info[i].anim_mode = ANIM_LOOP;
else
- new_graphic_info[i].anim_mode = ANIM_NORMAL;
-
- /* additionally, animation can be either pingpong or pingpong2 layout */
- if (parameter[GFX_ARG_PINGPONG])
- new_graphic_info[i].anim_mode |= ANIM_PINGPONG;
- else if (parameter[GFX_ARG_PINGPONG2])
- new_graphic_info[i].anim_mode |= ANIM_PINGPONG2;
+ new_graphic_info[i].anim_mode = ANIM_NONE;
+
+ /* set additional flag to play animation frames in reverse order */
+ if (parameter[GFX_ARG_MODE_REVERSE])
+ new_graphic_info[i].anim_mode |= ANIM_REVERSE;
+
+#if 1
+ /* set first frame of animation after determining animation mode */
+ new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
+ if (new_graphic_info[i].anim_start_frame == -1)
+ new_graphic_info[i].anim_start_frame = 0;
+ else if (new_graphic_info[i].anim_mode & ANIM_REVERSE)
+ new_graphic_info[i].anim_start_frame =
+ new_graphic_info[i].anim_frames
+ - new_graphic_info[i].anim_start_frame - 1;
+#else
+ /* set first frame of animation after determining animation mode */
+ new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
+ if (parameter[GFX_ARG_START_FRAME] == -1) /* default: start with ... */
+ {
+ if (parameter[GFX_ARG_MODE_REVERSE])
+ new_graphic_info[i].anim_start_frame =
+ new_graphic_info[i].anim_frames - 1; /* ... last frame */
+ else
+ new_graphic_info[i].anim_start_frame = 0; /* ... first frame */
+ }
+#endif
+#if 1
/* animation synchronized with global frame counter, not move position */
new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+ if (parameter[GFX_ARG_GLOBAL_SYNC] == -1)
+ new_graphic_info[i].anim_global_sync =
+ (gfx_action[i] == GFX_ACTION_DEFAULT ? TRUE : FALSE);
+#else
+ /* animation synchronized with global frame counter, not move position */
+ new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+#endif
+
+ /* now check if the loaded image is large enough for the animation */
+ last_frame = new_graphic_info[i].anim_frames - 1;
+
+ getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
+ if (src_x + TILEX > src_bitmap->width ||
+ src_y + TILEY > src_bitmap->height)
+ Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d (normal size)", src_bitmap->source_filename, i);
+
+ getMiniGraphicSource(i, &src_bitmap, &src_x, &src_y);
+ if (src_x + MINI_TILEX > src_bitmap->width ||
+ src_y + MINI_TILEY > src_bitmap->height)
+ Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d ('mini' size)", src_bitmap->source_filename, i);
+
+ getMicroGraphicSource(i, &src_bitmap, &src_x, &src_y);
+ if (src_x + MICRO_TILEX > src_bitmap->width ||
+ src_y + MICRO_TILEY > src_bitmap->height)
+ Error(ERR_EXIT, "InitGraphicInfo: image bitmap '%s' too small for graphic object %d ('micro' size)", src_bitmap->source_filename, i);
+
+
+#if 0
+ {
+ int j;
+
+ if (i == IMG_EMERALD)
+ {
+ for (j=0; j<NUM_GFX_ARGS; j++)
+ printf("%s -> %d\n", image_config_suffix[j].token, parameter[j]);
+ printf("-> %d\n", new_graphic_info[i].anim_frames);
+ printf("\n");
+ }
+ }
+#endif
- new_graphic_info[i].anim_vertical = parameter[GFX_ARG_VERTICAL];
}
+
#if 0
printf("D> %d\n", image_files[GFX_BD_DIAMOND].parameter[GFX_ARG_NUM_FRAMES]);
printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFX_ARG_NUM_FRAMES]);
EL_TIMEGATE_OPENING,
EL_TIMEGATE_CLOSED,
EL_TIMEGATE_CLOSING,
- EL_TUBE_CROSS,
+ EL_TUBE_ALL,
EL_TUBE_VERTICAL,
EL_TUBE_HORIZONTAL,
- EL_TUBE_VERT_LEFT,
- EL_TUBE_VERT_RIGHT,
- EL_TUBE_HORIZ_UP,
- EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_VERTICAL_LEFT,
+ EL_TUBE_VERTICAL_RIGHT,
+ EL_TUBE_HORIZONTAL_UP,
+ EL_TUBE_HORIZONTAL_DOWN,
EL_TUBE_LEFT_UP,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_BD_WALL,
EL_WALL_CRUMBLED,
EL_EXIT_CLOSED,
- EL_AUSGANG_ACT,
+ EL_EXIT_OPENING,
EL_EXIT_OPEN,
EL_AMOEBA_DEAD,
EL_AMOEBA_WET,
EL_QUICKSAND_FILLING,
EL_QUICKSAND_EMPTYING,
EL_MAGIC_WALL,
- EL_MAGIC_WALL_EMPTY,
+ EL_MAGIC_WALL_ACTIVE,
EL_MAGIC_WALL_EMPTYING,
EL_MAGIC_WALL_FILLING,
EL_MAGIC_WALL_FULL,
EL_MAGIC_WALL_DEAD,
- EL_MAGIC_WALL_BD_OFF,
- EL_MAGIC_WALL_BD_EMPTY,
- EL_MAGIC_WALL_BD_EMPTYING,
- EL_MAGIC_WALL_BD_FULL,
- EL_MAGIC_WALL_BD_FILLING,
- EL_MAGIC_WALL_BD_DEAD,
+ EL_BD_MAGIC_WALL,
+ EL_BD_MAGIC_WALL_ACTIVE,
+ EL_BD_MAGIC_WALL_EMPTYING,
+ EL_BD_MAGIC_WALL_FULL,
+ EL_BD_MAGIC_WALL_FILLING,
+ EL_BD_MAGIC_WALL_DEAD,
EL_GAMEOFLIFE,
EL_BIOMAZE,
EL_ACIDPOOL_TOPLEFT,
EL_SP_EXIT_CLOSED,
EL_SP_EXIT_OPEN,
EL_INVISIBLE_STEELWALL,
+ EL_INVISIBLE_STEELWALL_ACTIVE,
+ EL_INVISIBLE_WALL,
+ EL_INVISIBLE_WALL_ACTIVE,
EL_CONVEYOR_BELT1_SWITCH_LEFT,
EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
EL_CONVEYOR_BELT1_SWITCH_RIGHT,
EL_SWITCHGATE_SWITCH_DOWN,
EL_LIGHT_SWITCH,
EL_LIGHT_SWITCH_ACTIVE,
- EL_TIMEGATE_SWITCH_OFF,
- EL_TIMEGATE_SWITCH_ON,
+ EL_TIMEGATE_SWITCH,
+ EL_TIMEGATE_SWITCH_ACTIVE,
EL_SIGN_EXCLAMATION,
EL_SIGN_RADIOACTIVITY,
EL_SIGN_STOP,
EL_TIMEGATE_OPENING,
EL_TIMEGATE_CLOSED,
EL_TIMEGATE_CLOSING,
- EL_TUBE_CROSS,
+ EL_TUBE_ALL,
EL_TUBE_VERTICAL,
EL_TUBE_HORIZONTAL,
- EL_TUBE_VERT_LEFT,
- EL_TUBE_VERT_RIGHT,
- EL_TUBE_HORIZ_UP,
- EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_VERTICAL_LEFT,
+ EL_TUBE_VERTICAL_RIGHT,
+ EL_TUBE_HORIZONTAL_UP,
+ EL_TUBE_HORIZONTAL_DOWN,
EL_TUBE_LEFT_UP,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_INVISIBLE_STEELWALL,
+ EL_INVISIBLE_STEELWALL_ACTIVE,
EL_CONVEYOR_BELT1_SWITCH_LEFT,
EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
EL_CONVEYOR_BELT1_SWITCH_RIGHT,
EL_TIMEGATE_OPENING,
EL_TIMEGATE_CLOSED,
EL_TIMEGATE_CLOSING,
- EL_TUBE_CROSS,
+ EL_TUBE_ALL,
EL_TUBE_VERTICAL,
EL_TUBE_HORIZONTAL,
- EL_TUBE_VERT_LEFT,
- EL_TUBE_VERT_RIGHT,
- EL_TUBE_HORIZ_UP,
- EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_VERTICAL_LEFT,
+ EL_TUBE_VERTICAL_RIGHT,
+ EL_TUBE_HORIZONTAL_UP,
+ EL_TUBE_HORIZONTAL_DOWN,
EL_TUBE_LEFT_UP,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
{
EL_BUG,
EL_SPACESHIP,
- EL_BUTTERFLY,
- EL_FIREFLY,
+ EL_BD_BUTTERFLY,
+ EL_BD_FIREFLY,
EL_YAMYAM,
EL_DARK_YAMYAM,
EL_ROBOT,
EL_EM_GATE3_GRAY,
EL_EM_GATE4_GRAY,
EL_EXIT_CLOSED,
- EL_AUSGANG_ACT,
+ EL_EXIT_OPENING,
EL_EXIT_OPEN,
EL_WALL,
EL_WALL_CRUMBLED,
EL_WALL_GROWING_X,
EL_WALL_GROWING_Y,
EL_WALL_GROWING_XY,
- EL_MAUERND,
+ EL_WALL_GROWING_ACTIVE,
EL_BD_WALL,
EL_SP_CHIP_SINGLE,
EL_SP_CHIP_LEFT,
EL_SP_EXIT_CLOSED,
EL_SP_EXIT_OPEN,
EL_INVISIBLE_STEELWALL,
+ EL_INVISIBLE_STEELWALL_ACTIVE,
+ EL_INVISIBLE_WALL,
+ EL_INVISIBLE_WALL_ACTIVE,
EL_STEELWALL_SLANTED,
EL_EMC_STEELWALL1,
EL_EMC_STEELWALL2,
EL_AMOEBA_DROP,
EL_QUICKSAND_FULL,
EL_MAGIC_WALL_FULL,
- EL_MAGIC_WALL_BD_FULL,
+ EL_BD_MAGIC_WALL_FULL,
EL_TIME_ORB_FULL,
EL_TIME_ORB_EMPTY,
EL_SP_ZONK,
{
EL_BUG,
EL_SPACESHIP,
- EL_BUTTERFLY,
- EL_FIREFLY,
+ EL_BD_BUTTERFLY,
+ EL_BD_FIREFLY,
EL_YAMYAM,
EL_DARK_YAMYAM,
EL_ROBOT,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
EL_BALLOON,
- EL_SPRING_MOVING
+ EL_SPRING
};
static int ep_can_move_num = SIZEOF_ARRAY_INT(ep_can_move);
EL_SPACESHIP_UP,
EL_SPACESHIP_LEFT,
EL_SPACESHIP_DOWN,
- EL_BUTTERFLY_RIGHT,
- EL_BUTTERFLY_UP,
- EL_BUTTERFLY_LEFT,
- EL_BUTTERFLY_DOWN,
- EL_FIREFLY_RIGHT,
- EL_FIREFLY_UP,
- EL_FIREFLY_LEFT,
- EL_FIREFLY_DOWN,
+ EL_BD_BUTTERFLY_RIGHT,
+ EL_BD_BUTTERFLY_UP,
+ EL_BD_BUTTERFLY_LEFT,
+ EL_BD_BUTTERFLY_DOWN,
+ EL_BD_FIREFLY_RIGHT,
+ EL_BD_FIREFLY_UP,
+ EL_BD_FIREFLY_LEFT,
+ EL_BD_FIREFLY_DOWN,
EL_PACMAN_RIGHT,
EL_PACMAN_UP,
EL_PACMAN_LEFT,
{
EL_BUG,
EL_SPACESHIP,
- EL_BUTTERFLY,
- EL_FIREFLY
+ EL_BD_BUTTERFLY,
+ EL_BD_FIREFLY
};
static int ep_dont_touch_num = SIZEOF_ARRAY_INT(ep_dont_touch);
{
EL_BUG,
EL_SPACESHIP,
- EL_BUTTERFLY,
- EL_FIREFLY,
+ EL_BD_BUTTERFLY,
+ EL_BD_FIREFLY,
EL_YAMYAM,
EL_DARK_YAMYAM,
EL_ROBOT,
EL_ACID,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
- EL_SP_BUG_ACTIVE,
+ EL_SP_BUGGY_BASE_ACTIVE,
EL_TRAP_ACTIVE,
EL_LANDMINE
};
EL_SAND,
EL_BUG,
EL_SPACESHIP,
- EL_BUTTERFLY,
- EL_FIREFLY,
+ EL_BD_BUTTERFLY,
+ EL_BD_FIREFLY,
EL_YAMYAM,
EL_ROBOT,
EL_PACMAN,
EL_ROCK,
EL_BD_ROCK,
EL_BD_DIAMOND,
- EL_MAGIC_WALL_BD_OFF,
+ EL_BD_MAGIC_WALL,
EL_EXIT_CLOSED,
EL_EXIT_OPEN,
EL_STEELWALL,
- EL_PLAYER,
- EL_FIREFLY,
- EL_FIREFLY_1,
- EL_FIREFLY_2,
- EL_FIREFLY_3,
- EL_FIREFLY_4,
- EL_BUTTERFLY,
- EL_BUTTERFLY_1,
- EL_BUTTERFLY_2,
- EL_BUTTERFLY_3,
- EL_BUTTERFLY_4,
+ EL_PLAYER1,
+ EL_BD_FIREFLY,
+ EL_BD_FIREFLY_1,
+ EL_BD_FIREFLY_2,
+ EL_BD_FIREFLY_3,
+ EL_BD_FIREFLY_4,
+ EL_BD_BUTTERFLY,
+ EL_BD_BUTTERFLY_1,
+ EL_BD_BUTTERFLY_2,
+ EL_BD_BUTTERFLY_3,
+ EL_BD_BUTTERFLY_4,
EL_BD_AMOEBA,
EL_CHAR_QUESTION
};
{
EL_EMPTY,
EL_STEELWALL,
- EL_SOKOBAN_OBJEKT,
- EL_SOKOBAN_FELD_LEER,
- EL_SOKOBAN_FELD_VOLL,
- EL_PLAYER,
+ EL_SOKOBAN_OBJECT,
+ EL_SOKOBAN_FIELD_EMPTY,
+ EL_SOKOBAN_FIELD_FULL,
+ EL_PLAYER1,
EL_INVISIBLE_STEELWALL
};
static int ep_sb_element_num = SIZEOF_ARRAY_INT(ep_sb_element);
EL_WALL,
EL_BD_WALL,
EL_WALL_CRUMBLED,
- EL_KEY,
EL_STEELWALL,
EL_AMOEBA_DEAD,
EL_QUICKSAND_EMPTY,
EL_EM_GATE3_GRAY,
EL_EM_GATE4_GRAY,
EL_DYNAMITE,
+ EL_INVISIBLE_STEELWALL,
EL_INVISIBLE_WALL,
+ EL_INVISIBLE_SAND,
EL_LAMP,
EL_LAMP_ACTIVE,
EL_WALL_EMERALD,
EL_DYNABOMB_NR,
EL_DYNABOMB_SZ,
EL_DYNABOMB_XL,
- EL_SOKOBAN_OBJEKT,
- EL_SOKOBAN_FELD_LEER,
- EL_SOKOBAN_FELD_VOLL,
+ EL_SOKOBAN_OBJECT,
+ EL_SOKOBAN_FIELD_EMPTY,
+ EL_SOKOBAN_FIELD_FULL,
EL_WALL_EMERALD_RED,
EL_WALL_EMERALD_PURPLE,
EL_ACIDPOOL_TOPLEFT,
EL_ACIDPOOL_BOTTOMRIGHT,
EL_MAGIC_WALL,
EL_MAGIC_WALL_DEAD,
- EL_MAGIC_WALL_BD_OFF,
- EL_MAGIC_WALL_BD_DEAD,
+ EL_BD_MAGIC_WALL,
+ EL_BD_MAGIC_WALL_DEAD,
EL_AMOEBA_TO_DIAMOND,
EL_BLOCKED,
EL_SP_EMPTY,
EL_SP_HARD_BASE4,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
- EL_INVISIBLE_STEELWALL,
EL_CONVEYOR_BELT1_SWITCH_LEFT,
EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
EL_CONVEYOR_BELT1_SWITCH_RIGHT,
EL_BOMB,
EL_DYNAMITE_ACTIVE,
EL_DYNAMITE,
- EL_DYNABOMB_ACTIVE_1,
- EL_DYNABOMB_ACTIVE_2,
- EL_DYNABOMB_ACTIVE_3,
- EL_DYNABOMB_ACTIVE_4,
+ EL_DYNABOMB_PLAYER1_ACTIVE,
+ EL_DYNABOMB_PLAYER2_ACTIVE,
+ EL_DYNABOMB_PLAYER3_ACTIVE,
+ EL_DYNABOMB_PLAYER4_ACTIVE,
EL_DYNABOMB_NR,
EL_DYNABOMB_SZ,
EL_DYNABOMB_XL,
EL_BOMB,
EL_NUT,
EL_TIME_ORB_EMPTY,
- EL_SOKOBAN_FELD_VOLL,
- EL_SOKOBAN_OBJEKT,
+ EL_SOKOBAN_FIELD_FULL,
+ EL_SOKOBAN_OBJECT,
EL_SATELLITE,
EL_SP_ZONK,
EL_SP_DISK_ORANGE,
static int ep_player[] =
{
- EL_PLAYER,
EL_PLAYER1,
EL_PLAYER2,
EL_PLAYER3,
{
EL_SAND,
EL_SP_BASE,
- EL_SP_BUG,
- EL_TRAP_INACTIVE,
- EL_SAND_INVISIBLE
+ EL_SP_BUGGY_BASE,
+ EL_TRAP,
+ EL_INVISIBLE_SAND,
+ EL_INVISIBLE_SAND_ACTIVE
};
static int ep_eatable_num = SIZEOF_ARRAY_INT(ep_eatable);
EL_SP_PORT_X,
EL_SP_PORT_XY,
EL_SP_ELECTRON,
- EL_SP_BUG,
+ EL_SP_BUGGY_BASE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
EL_SP_HARD_BASE1,
EL_SP_PORT_X,
EL_SP_PORT_Y,
EL_SP_PORT_XY,
- EL_TUBE_CROSS,
+ EL_TUBE_ALL,
EL_TUBE_VERTICAL,
EL_TUBE_HORIZONTAL,
- EL_TUBE_VERT_LEFT,
- EL_TUBE_VERT_RIGHT,
- EL_TUBE_HORIZ_UP,
- EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_VERTICAL_LEFT,
+ EL_TUBE_VERTICAL_RIGHT,
+ EL_TUBE_HORIZONTAL_UP,
+ EL_TUBE_HORIZONTAL_DOWN,
EL_TUBE_LEFT_UP,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
static int ep_active_bomb[] =
{
EL_DYNAMITE_ACTIVE,
- EL_DYNABOMB_ACTIVE_1,
- EL_DYNABOMB_ACTIVE_2,
- EL_DYNABOMB_ACTIVE_3,
- EL_DYNABOMB_ACTIVE_4
+ EL_DYNABOMB_PLAYER1_ACTIVE,
+ EL_DYNABOMB_PLAYER2_ACTIVE,
+ EL_DYNABOMB_PLAYER3_ACTIVE,
+ EL_DYNABOMB_PLAYER4_ACTIVE
};
static int ep_active_bomb_num = SIZEOF_ARRAY_INT(ep_active_bomb);
};
static int ep_belt_num = SIZEOF_ARRAY_INT(ep_belt);
+ static int ep_belt_active[] =
+ {
+ EL_CONVEYOR_BELT1_LEFT_ACTIVE,
+ EL_CONVEYOR_BELT1_MIDDLE_ACTIVE,
+ EL_CONVEYOR_BELT1_RIGHT_ACTIVE,
+ EL_CONVEYOR_BELT2_LEFT_ACTIVE,
+ EL_CONVEYOR_BELT2_MIDDLE_ACTIVE,
+ EL_CONVEYOR_BELT2_RIGHT_ACTIVE,
+ EL_CONVEYOR_BELT3_LEFT_ACTIVE,
+ EL_CONVEYOR_BELT3_MIDDLE_ACTIVE,
+ EL_CONVEYOR_BELT3_RIGHT_ACTIVE,
+ EL_CONVEYOR_BELT4_LEFT_ACTIVE,
+ EL_CONVEYOR_BELT4_MIDDLE_ACTIVE,
+ EL_CONVEYOR_BELT4_RIGHT_ACTIVE,
+ };
+ static int ep_belt_active_num = SIZEOF_ARRAY_INT(ep_belt_active);
+
static int ep_belt_switch[] =
{
EL_CONVEYOR_BELT1_SWITCH_LEFT,
static int ep_tube[] =
{
- EL_TUBE_CROSS,
+ EL_TUBE_ALL,
EL_TUBE_VERTICAL,
EL_TUBE_HORIZONTAL,
- EL_TUBE_VERT_LEFT,
- EL_TUBE_VERT_RIGHT,
- EL_TUBE_HORIZ_UP,
- EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_VERTICAL_LEFT,
+ EL_TUBE_VERTICAL_RIGHT,
+ EL_TUBE_HORIZONTAL_UP,
+ EL_TUBE_HORIZONTAL_DOWN,
EL_TUBE_LEFT_UP,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
static long ep2_bit[] =
{
EP_BIT_BELT,
+ EP_BIT_BELT_ACTIVE,
EP_BIT_BELT_SWITCH,
EP_BIT_TUBE
};
static int *ep2_array[] =
{
ep_belt,
+ ep_belt_active,
ep_belt_switch,
ep_tube
};
static int *ep2_num[] =
{
&ep_belt_num,
+ &ep_belt_active_num,
&ep_belt_switch_num,
&ep_tube_num
};
static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
- for(i=0; i<MAX_ELEMENTS; i++)
+ for (i=0; i<MAX_ELEMENTS; i++)
{
Elementeigenschaften1[i] = 0;
Elementeigenschaften2[i] = 0;
}
- for(i=0; i<num_properties1; i++)
- for(j=0; j<*(ep1_num[i]); j++)
+ for (i=0; i<num_properties1; i++)
+ for (j=0; j<*(ep1_num[i]); j++)
Elementeigenschaften1[(ep1_array[i])[j]] |= ep1_bit[i];
- for(i=0; i<num_properties2; i++)
- for(j=0; j<*(ep2_num[i]); j++)
+ for (i=0; i<num_properties2; i++)
+ for (j=0; j<*(ep2_num[i]); j++)
Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
- for(i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+ for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
}
FreeAllImages();
FreeTileClipmasks();
- for(i=0; i<NUM_BITMAPS; i++)
+ for (i=0; i<NUM_BITMAPS; i++)
FreeBitmap(pix[i]);
CloseVideoDisplay();
projects / rocksndiamonds.git / blobdiff