direction == MV_RIGHT ? MV_LEFT :
direction == MV_HORIZONTAL ? MV_NONE : direction);
+ if (direction == MV_NONE)
+ return EL_EMPTY;
+
return getBeltElementFromBeltNrAndBeltDir(nr, belt_dir);
}
+static int getBeltFromNrAndOpenDirectionNotEmpty(int nr, int direction,
+ int element_old)
+{
+ int element_new = getBeltFromNrAndOpenDirection(nr, direction);
+
+ return (element_new != EL_EMPTY ? element_new : element_old);
+}
+
static int getOpenDirectionFromPool(int element)
{
switch (element)
return EL_EMPTY;
}
-static int getPoolFromOpenDirection2(int direction, int help_element)
+static int getPoolFromOpenDirectionExt(int direction, int help_element)
{
int element = getPoolFromOpenDirection(direction);
int help_direction = getOpenDirectionFromPool(help_element);
static int getPoolFromOpenDirectionNotEmpty(int direction, int element_old)
{
- int element_new = getPoolFromOpenDirection2(direction, element_old);
+ int element_new = getPoolFromOpenDirectionExt(direction, element_old);
+
+ return (element_new != EL_EMPTY ? element_new : element_old);
+}
+
+static int getOpenDirectionFromPillar(int element)
+{
+ switch (element)
+ {
+ case EL_EMC_WALL_1: return (MV_DOWN);
+ case EL_EMC_WALL_2: return (MV_VERTICAL);
+ case EL_EMC_WALL_3: return (MV_UP);
+ }
+
+ return MV_NONE;
+}
+
+static int getPillarFromOpenDirection(int direction)
+{
+ switch (direction)
+ {
+ case (MV_DOWN): return EL_EMC_WALL_1;
+ case (MV_VERTICAL): return EL_EMC_WALL_2;
+ case (MV_UP): return EL_EMC_WALL_3;
+ }
+
+ return EL_EMPTY;
+}
+
+static int getPillarFromOpenDirectionNotEmpty(int direction, int element_old)
+{
+ int element_new = getPillarFromOpenDirection(direction);
+
+ return (element_new != EL_EMPTY ? element_new : element_old);
+}
+
+static int getOpenDirectionFromSteel2(int element)
+{
+ switch (element)
+ {
+ case EL_DC_STEELWALL_2_LEFT: return (MV_RIGHT);
+ case EL_DC_STEELWALL_2_RIGHT: return (MV_LEFT);
+ case EL_DC_STEELWALL_2_TOP: return (MV_DOWN);
+ case EL_DC_STEELWALL_2_BOTTOM: return (MV_UP);
+ case EL_DC_STEELWALL_2_HORIZONTAL: return (MV_HORIZONTAL);
+ case EL_DC_STEELWALL_2_VERTICAL: return (MV_VERTICAL);
+ case EL_DC_STEELWALL_2_MIDDLE: return (MV_ANY_DIRECTION);
+ case EL_DC_STEELWALL_2_SINGLE: return (MV_NONE);
+ }
+
+ return MV_NONE;
+}
+
+static int getSteel2FromOpenDirection(int direction)
+{
+ switch (direction)
+ {
+ case (MV_RIGHT): return EL_DC_STEELWALL_2_LEFT;
+ case (MV_LEFT): return EL_DC_STEELWALL_2_RIGHT;
+ case (MV_DOWN): return EL_DC_STEELWALL_2_TOP;
+ case (MV_UP): return EL_DC_STEELWALL_2_BOTTOM;
+ case (MV_HORIZONTAL): return EL_DC_STEELWALL_2_HORIZONTAL;
+ case (MV_VERTICAL): return EL_DC_STEELWALL_2_VERTICAL;
+ case (MV_ANY_DIRECTION): return EL_DC_STEELWALL_2_MIDDLE;
+ case (MV_NONE): return EL_DC_STEELWALL_2_SINGLE;
+ }
+
+ return EL_EMPTY;
+}
+
+static int getSteel2FromOpenDirectionNotEmpty(int direction, int element_old)
+{
+ int element_new = getSteel2FromOpenDirection(direction);
+
+ return (element_new != EL_EMPTY ? element_new : element_old);
+}
+
+static int getOpenDirectionFromChip(int element)
+{
+ switch (element)
+ {
+ case EL_SP_CHIP_SINGLE: return (MV_NONE);
+ case EL_SP_CHIP_LEFT: return (MV_RIGHT);
+ case EL_SP_CHIP_RIGHT: return (MV_LEFT);
+ case EL_SP_CHIP_TOP: return (MV_DOWN);
+ case EL_SP_CHIP_BOTTOM: return (MV_UP);
+ }
+
+ return MV_NONE;
+}
+
+static int getChipFromOpenDirection(int direction)
+{
+ switch (direction)
+ {
+ case (MV_NONE): return EL_SP_CHIP_SINGLE;
+ case (MV_LEFT): return EL_SP_CHIP_RIGHT;
+ case (MV_RIGHT): return EL_SP_CHIP_LEFT;
+ case (MV_UP): return EL_SP_CHIP_BOTTOM;
+ case (MV_DOWN): return EL_SP_CHIP_TOP;
+ }
+
+ return EL_EMPTY;
+}
+
+static int getChipFromOpenDirectionNotEmpty(int direction, int element_old)
+{
+ int element_new = getChipFromOpenDirection(direction);
return (element_new != EL_EMPTY ? element_new : element_old);
}
{ 0, +1 }
};
int element_old = IntelliDrawBuffer[x][y];
- int tube_direction_old = getOpenDirectionFromTube(element_old);
- int tube_direction_new = MV_NONE;
+ int direction_old = getOpenDirectionFromTube(element_old);
+ int direction_new = MV_NONE;
int i;
for (i = 0; i < NUM_DIRECTIONS; i++)
int dir_opposite = MV_DIR_OPPOSITE(dir);
if (IN_LEV_FIELD(xx, yy) && IS_TUBE(IntelliDrawBuffer[xx][yy]) &&
- (tube_direction_old & dir) &&
+ (direction_old & dir) &&
(getOpenDirectionFromTube(IntelliDrawBuffer[xx][yy]) & dir_opposite))
- tube_direction_new |= dir;
+ direction_new |= dir;
}
- return getTubeFromOpenDirectionNotEmpty(tube_direction_new, element_old);
+ return getTubeFromOpenDirectionNotEmpty(direction_new, element_old);
}
static int getClosedBelt(int x, int y)
{
- static int xy[2][2] =
+ static int xy[4][2] =
{
{ -1, 0 },
{ +1, 0 },
+ { 0, -1 },
+ { 0, +1 }
};
int element_old = IntelliDrawBuffer[x][y];
- int belt_nr = getBeltNrFromBeltElement(element_old);
- int belt_direction_old = getOpenDirectionFromBelt(element_old);
- int belt_direction_new = MV_NONE;
+ int nr = getBeltNrFromBeltElement(element_old);
+ int direction_old = getOpenDirectionFromBelt(element_old);
+ int direction_new = MV_NONE;
int i;
- for (i = 0; i < 2; i++)
+ for (i = MV_BIT_LEFT; i <= MV_BIT_RIGHT; i++)
{
int xx = x + xy[i][0];
int yy = y + xy[i][1];
int dir_opposite = MV_DIR_OPPOSITE(dir);
if (IN_LEV_FIELD(xx, yy) && IS_BELT(IntelliDrawBuffer[xx][yy]) &&
- (belt_direction_old & dir) &&
+ (direction_old & dir) &&
(getOpenDirectionFromBelt(IntelliDrawBuffer[xx][yy]) & dir_opposite))
- belt_direction_new |= dir;
+ direction_new |= dir;
}
- return getBeltFromNrAndOpenDirection(belt_nr, belt_direction_new);
+ return getBeltFromNrAndOpenDirection(nr, direction_new);
}
static int getClosedPool(int x, int y)
{ 0, +1 }
};
int element_old = IntelliDrawBuffer[x][y];
- int pool_direction_old = getOpenDirectionFromPool(element_old);
- int pool_direction_new = MV_NONE;
+ int direction_old = getOpenDirectionFromPool(element_old);
+ int direction_new = MV_NONE;
int i;
for (i = 0; i < NUM_DIRECTIONS; i++)
if (IN_LEV_FIELD(xx, yy) &&
IS_ACID_POOL_OR_ACID(IntelliDrawBuffer[xx][yy]) &&
- (pool_direction_old & dir) &&
+ (direction_old & dir) &&
(getOpenDirectionFromPool(IntelliDrawBuffer[xx][yy]) & dir_opposite))
- pool_direction_new |= dir;
+ direction_new |= dir;
+ }
+
+ return getPoolFromOpenDirectionNotEmpty(direction_new, element_old);
+}
+
+static int getClosedPillar(int x, int y)
+{
+ static int xy[4][2] =
+ {
+ { -1, 0 },
+ { +1, 0 },
+ { 0, -1 },
+ { 0, +1 }
+ };
+ int element_old = IntelliDrawBuffer[x][y];
+ int direction_old = getOpenDirectionFromPillar(element_old);
+ int direction_new = MV_NONE;
+ int i;
+
+ for (i = MV_BIT_UP; i <= MV_BIT_DOWN; i++)
+ {
+ int xx = x + xy[i][0];
+ int yy = y + xy[i][1];
+ int dir = MV_DIR_FROM_BIT(i);
+ int dir_opposite = MV_DIR_OPPOSITE(dir);
+
+ if (IN_LEV_FIELD(xx, yy) && IS_EMC_PILLAR(IntelliDrawBuffer[xx][yy]) &&
+ (direction_old & dir) &&
+ (getOpenDirectionFromPillar(IntelliDrawBuffer[xx][yy]) & dir_opposite))
+ direction_new |= dir;
+ }
+
+ return getPillarFromOpenDirectionNotEmpty(direction_new, element_old);
+}
+
+static int getClosedSteel2(int x, int y)
+{
+ static int xy[4][2] =
+ {
+ { -1, 0 },
+ { +1, 0 },
+ { 0, -1 },
+ { 0, +1 }
+ };
+ int element_old = IntelliDrawBuffer[x][y];
+ int direction_old = getOpenDirectionFromSteel2(element_old);
+ int direction_new = MV_NONE;
+ int i;
+
+ for (i = 0; i < NUM_DIRECTIONS; i++)
+ {
+ int xx = x + xy[i][0];
+ int yy = y + xy[i][1];
+ int dir = MV_DIR_FROM_BIT(i);
+ int dir_opposite = MV_DIR_OPPOSITE(dir);
+
+ if (IN_LEV_FIELD(xx, yy) && IS_DC_STEELWALL_2(IntelliDrawBuffer[xx][yy]) &&
+ (direction_old & dir) &&
+ (getOpenDirectionFromSteel2(IntelliDrawBuffer[xx][yy]) & dir_opposite))
+ direction_new |= dir;
+ }
+
+ return getSteel2FromOpenDirectionNotEmpty(direction_new, element_old);
+}
+
+static int getClosedChip(int x, int y)
+{
+ static int xy[4][2] =
+ {
+ { -1, 0 },
+ { +1, 0 },
+ { 0, -1 },
+ { 0, +1 }
+ };
+ int element_old = IntelliDrawBuffer[x][y];
+ int direction_old = getOpenDirectionFromChip(element_old);
+ int direction_new = MV_NONE;
+ int i;
+
+ for (i = 0; i < NUM_DIRECTIONS; i++)
+ {
+ int xx = x + xy[i][0];
+ int yy = y + xy[i][1];
+ int dir = MV_DIR_FROM_BIT(i);
+ int dir_opposite = MV_DIR_OPPOSITE(dir);
+
+ if (IN_LEV_FIELD(xx, yy) && IS_SP_CHIP(IntelliDrawBuffer[xx][yy]) &&
+ (direction_old & dir) &&
+ (getOpenDirectionFromChip(IntelliDrawBuffer[xx][yy]) & dir_opposite))
+ direction_new |= dir;
}
- return getPoolFromOpenDirectionNotEmpty(pool_direction_new, element_old);
+ return getChipFromOpenDirectionNotEmpty(direction_new, element_old);
}
static void SetElementSimple(int x, int y, int element, boolean change_level)
DrawMiniElement(sx, sy, element);
}
+static void MergeAndCloseNeighbourElements(int x1, int y1, int *element1,
+ int x2, int y2, int *element2,
+ int (*close_function)(int, int),
+ boolean change_level)
+{
+ /* set neighbour elements to newly determined connections */
+ SetElementSimple(x1, y1, *element1, change_level);
+ SetElementSimple(x2, y2, *element2, change_level);
+
+ /* remove all open connections of neighbour elements */
+ *element1 = close_function(x1, y1);
+ *element2 = close_function(x2, y2);
+
+ /* set neighbour elements to new, minimized connections */
+ SetElementSimple(x1, y1, *element1, change_level);
+ SetElementSimple(x2, y2, *element2, change_level);
+}
+
static void SetElementIntelliDraw(int x, int y, int new_element,
boolean change_level)
{
+ static int xy[4][2] =
+ {
+ { -1, 0 },
+ { +1, 0 },
+ { 0, -1 },
+ { 0, +1 }
+ };
static int last_x = -1;
static int last_y = -1;
int old_element = IntelliDrawBuffer[x][y];
if (IS_TUBE(new_element))
{
- static int xy[4][2] =
- {
- { -1, 0 },
- { +1, 0 },
- { 0, -1 },
- { 0, +1 }
- };
int last_element_new = EL_UNDEFINED;
int direction = MV_NONE;
int i;
- /* if existing element is tube, keep all existing tube directions */
+ /* if old element is of same kind, keep all existing directions */
if (IS_TUBE(old_element))
direction |= getOpenDirectionFromTube(old_element);
new_element = getTubeFromOpenDirectionNotEmpty(direction, new_element);
- /* reduce connections of neighbour tube elements to minimal connections */
if (last_element_new != EL_UNDEFINED)
+ MergeAndCloseNeighbourElements(x, y, &new_element,
+ last_x, last_y, &last_element_new,
+ getClosedTube, change_level);
+ }
+ else if (IS_BELT(new_element))
+ {
+ int belt_nr = getBeltNrFromBeltElement(new_element);
+ int last_element_new = EL_UNDEFINED;
+ int direction = MV_NONE;
+ int i;
+
+ /* if old element is of same kind, keep all existing directions */
+ if (IS_BELT(old_element))
+ direction |= getOpenDirectionFromBelt(old_element);
+
+ for (i = MV_BIT_LEFT; i <= MV_BIT_RIGHT; i++)
{
- /* set neighbour tube elements to newly determined tube connections */
- SetElementSimple(x, y, new_element, change_level);
- SetElementSimple(last_x, last_y, last_element_new, change_level);
+ int xx = x + xy[i][0];
+ int yy = y + xy[i][1];
- /* remove all open tube connections of neighbour tube elements */
- new_element = getClosedTube(x, y);
- last_element_new = getClosedTube(last_x, last_y);
+ if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
+ IS_BELT(IntelliDrawBuffer[last_x][last_y]))
+ {
+ int dir = MV_DIR_FROM_BIT(i);
+ int dir_opposite = MV_DIR_OPPOSITE(dir);
+ int last_element_old = IntelliDrawBuffer[last_x][last_y];
+ int last_belt_nr = getBeltNrFromBeltElement(last_element_old);
+ int last_direction_old = getOpenDirectionFromBelt(last_element_old);
+ int last_direction_new = last_direction_old | dir_opposite;
- /* set neighbour tube elements to new, minimized tube connections */
- SetElementSimple(x, y, new_element, change_level);
- SetElementSimple(last_x, last_y, last_element_new, change_level);
+ last_element_new = getBeltFromNrAndOpenDirection(last_belt_nr,
+ last_direction_new);
+ direction |= dir;
+ }
}
+
+ new_element = getBeltFromNrAndOpenDirectionNotEmpty(belt_nr, direction,
+ new_element);
+ if (last_element_new != EL_UNDEFINED)
+ MergeAndCloseNeighbourElements(x, y, &new_element,
+ last_x, last_y, &last_element_new,
+ getClosedBelt, change_level);
}
else if (IS_ACID_POOL_OR_ACID(new_element))
{
- static int xy[4][2] =
- {
- { -1, 0 },
- { +1, 0 },
- { 0, -1 },
- { 0, +1 }
- };
int last_element_new = EL_UNDEFINED;
int direction = MV_NONE;
int i;
- /* if existing element is pool, keep all existing pool directions */
+ /* if old element is of same kind, keep all existing directions */
if (IS_ACID_POOL_OR_ACID(old_element))
direction |= getOpenDirectionFromPool(old_element);
}
}
-#if 1
+ /* special corrections needed for intuitively correct acid pool drawing */
if (last_element_new == EL_EMPTY)
- last_element_new = EL_ACID;
-#endif
+ last_element_new = new_element;
+ else if (last_element_new != EL_UNDEFINED)
+ new_element = last_element_new;
-#if 1
- if (last_element_new != EL_UNDEFINED)
- new_element = getPoolFromOpenDirectionNotEmpty(direction,
- last_element_new);
- else
- new_element = getPoolFromOpenDirectionNotEmpty(direction, new_element);
-#else
new_element = getPoolFromOpenDirectionNotEmpty(direction, new_element);
-#endif
- /* reduce connections of neighbour pool elements to minimal connections */
if (last_element_new != EL_UNDEFINED)
- {
- /* set neighbour pool elements to newly determined pool connections */
- SetElementSimple(x, y, new_element, change_level);
- SetElementSimple(last_x, last_y, last_element_new, change_level);
-
- /* remove all open pool connections of neighbour pool elements */
- new_element = getClosedPool(x, y);
- last_element_new = getClosedPool(last_x, last_y);
-
- /* set neighbour pool elements to new, minimized pool connections */
- SetElementSimple(x, y, new_element, change_level);
- SetElementSimple(last_x, last_y, last_element_new, change_level);
- }
+ MergeAndCloseNeighbourElements(x, y, &new_element,
+ last_x, last_y, &last_element_new,
+ getClosedPool, change_level);
}
- else if (IS_BELT(new_element))
+ else if (IS_EMC_PILLAR(new_element))
{
int last_element_new = EL_UNDEFINED;
+ int direction = MV_NONE;
+ int i;
- if (((last_x == x - 1 && last_y == y) ||
- (last_x == x + 1 && last_y == y)) && IN_LEV_FIELD(last_x, last_y) &&
- IS_BELT(IntelliDrawBuffer[last_x][last_y]))
+ /* if old element is of same kind, keep all existing directions */
+ if (IS_EMC_PILLAR(old_element))
+ direction |= getOpenDirectionFromPillar(old_element);
+
+ for (i = MV_BIT_UP; i <= MV_BIT_DOWN; i++)
{
- int belt_nr = getBeltNrFromBeltElement(new_element);
- int belt_middle = getBeltElementFromBeltNrAndBeltDir(belt_nr, MV_NONE);
+ int xx = x + xy[i][0];
+ int yy = y + xy[i][1];
- new_element = belt_middle;
- last_element_new = belt_middle;
+ if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
+ IS_EMC_PILLAR(IntelliDrawBuffer[last_x][last_y]))
+ {
+ int dir = MV_DIR_FROM_BIT(i);
+ int dir_opposite = MV_DIR_OPPOSITE(dir);
+ int last_element_old = IntelliDrawBuffer[last_x][last_y];
+ int last_direction_old = getOpenDirectionFromPillar(last_element_old);
+ int last_direction_new = last_direction_old | dir_opposite;
+
+ last_element_new = getPillarFromOpenDirection(last_direction_new);
+
+ direction |= dir;
+ }
}
- /* reduce connections of neighbour belt elements to minimal connections */
+ new_element = getPillarFromOpenDirectionNotEmpty(direction, new_element);
+
if (last_element_new != EL_UNDEFINED)
+ MergeAndCloseNeighbourElements(x, y, &new_element,
+ last_x, last_y, &last_element_new,
+ getClosedPillar, change_level);
+ }
+ else if (IS_DC_STEELWALL_2(new_element))
+ {
+ int last_element_new = EL_UNDEFINED;
+ int direction = MV_NONE;
+ int i;
+
+ /* if old element is of same kind, keep all existing directions */
+ if (IS_DC_STEELWALL_2(old_element))
+ direction |= getOpenDirectionFromSteel2(old_element);
+
+ for (i = 0; i < NUM_DIRECTIONS; i++)
{
- /* set neighbour belt elements to newly determined belt connections */
- SetElementSimple(x, y, new_element, change_level);
- SetElementSimple(last_x, last_y, last_element_new, change_level);
+ int xx = x + xy[i][0];
+ int yy = y + xy[i][1];
+
+ if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
+ IS_DC_STEELWALL_2(IntelliDrawBuffer[last_x][last_y]))
+ {
+ int dir = MV_DIR_FROM_BIT(i);
+ int dir_opposite = MV_DIR_OPPOSITE(dir);
+ int last_element_old = IntelliDrawBuffer[last_x][last_y];
+ int last_direction_old = getOpenDirectionFromSteel2(last_element_old);
+ int last_direction_new = last_direction_old | dir_opposite;
- /* remove all open belt connections of neighbour belt elements */
- new_element = getClosedBelt(x, y);
- last_element_new = getClosedBelt(last_x, last_y);
+ last_element_new = getSteel2FromOpenDirection(last_direction_new);
- /* set neighbour belt elements to new, minimized belt connections */
- SetElementSimple(x, y, new_element, change_level);
- SetElementSimple(last_x, last_y, last_element_new, change_level);
+ direction |= dir;
+ }
}
+
+ new_element = getSteel2FromOpenDirectionNotEmpty(direction, new_element);
+
+ if (last_element_new != EL_UNDEFINED)
+ MergeAndCloseNeighbourElements(x, y, &new_element,
+ last_x, last_y, &last_element_new,
+ getClosedSteel2, change_level);
}
- else if (new_element == EL_EMC_WALL_1 ||
- new_element == EL_EMC_WALL_2 ||
- new_element == EL_EMC_WALL_3)
+ else if (IS_SP_CHIP(new_element))
{
int last_element_new = EL_UNDEFINED;
+ int direction = MV_NONE;
+ int i;
- if (last_x == x && last_y == y - 1 && IN_LEV_FIELD(last_x, last_y) &&
- (IntelliDrawBuffer[last_x][last_y] == EL_EMC_WALL_1 ||
- IntelliDrawBuffer[last_x][last_y] == EL_EMC_WALL_2 ||
- IntelliDrawBuffer[last_x][last_y] == EL_EMC_WALL_3))
- {
- if (IN_LEV_FIELD(last_x, last_y - 1))
- {
- if (IntelliDrawBuffer[last_x][last_y - 1] != EL_EMC_WALL_1 &&
- IntelliDrawBuffer[last_x][last_y - 1] != EL_EMC_WALL_2)
- last_element_new = EL_EMC_WALL_1;
- else if (IntelliDrawBuffer[last_x][last_y - 1] == EL_EMC_WALL_1 ||
- IntelliDrawBuffer[last_x][last_y - 1] == EL_EMC_WALL_2)
- last_element_new = EL_EMC_WALL_2;
- }
+ /* (do not keep existing directions, regardless of kind of old element) */
- new_element = EL_EMC_WALL_3;
- }
- else if (last_x == x && last_y == y + 1 && IN_LEV_FIELD(last_x, last_y) &&
- (IntelliDrawBuffer[last_x][last_y] == EL_EMC_WALL_1 ||
- IntelliDrawBuffer[last_x][last_y] == EL_EMC_WALL_2 ||
- IntelliDrawBuffer[last_x][last_y] == EL_EMC_WALL_3))
+ for (i = 0; i < NUM_DIRECTIONS; i++)
{
- if (IN_LEV_FIELD(last_x, last_y + 1))
+ int xx = x + xy[i][0];
+ int yy = y + xy[i][1];
+
+ if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
+ IS_SP_CHIP(IntelliDrawBuffer[last_x][last_y]))
{
- if (IntelliDrawBuffer[last_x][last_y + 1] != EL_EMC_WALL_2 &&
- IntelliDrawBuffer[last_x][last_y + 1] != EL_EMC_WALL_3)
- last_element_new = EL_EMC_WALL_3;
- else if (IntelliDrawBuffer[last_x][last_y + 1] == EL_EMC_WALL_2 ||
- IntelliDrawBuffer[last_x][last_y + 1] == EL_EMC_WALL_3)
- last_element_new = EL_EMC_WALL_2;
- }
+ int dir = MV_DIR_FROM_BIT(i);
+ int dir_opposite = MV_DIR_OPPOSITE(dir);
+ int last_element_old = IntelliDrawBuffer[last_x][last_y];
+ int last_direction_old = getOpenDirectionFromChip(last_element_old);
+ int last_direction_new = last_direction_old | dir_opposite;
- new_element = EL_EMC_WALL_1;
+ if (last_direction_old == MV_NONE)
+ {
+ last_element_new = getChipFromOpenDirection(last_direction_new);
+ direction |= dir;
+ }
+ else if (last_direction_old & (dir | dir_opposite))
+ {
+ direction |= MV_DIR_OPPOSITE(last_direction_old);
+ }
+ else
+ {
+ direction |= MV_DIR_OPPOSITE(dir);
+ }
+ }
}
+ new_element = getChipFromOpenDirectionNotEmpty(direction, new_element);
+
if (last_element_new != EL_UNDEFINED)
- SetElementSimple(last_x, last_y, last_element_new, change_level);
+ MergeAndCloseNeighbourElements(x, y, &new_element,
+ last_x, last_y, &last_element_new,
+ getClosedChip, change_level);
+ }
+ else if (IS_SP_HARDWARE_BASE(new_element))
+ {
+ int nr = GetSimpleRandom(6);
+
+ new_element = (nr == 0 ? EL_SP_HARDWARE_BASE_1 :
+ nr == 1 ? EL_SP_HARDWARE_BASE_2 :
+ nr == 2 ? EL_SP_HARDWARE_BASE_3 :
+ nr == 3 ? EL_SP_HARDWARE_BASE_4 :
+ nr == 4 ? EL_SP_HARDWARE_BASE_5 : EL_SP_HARDWARE_BASE_6);
+ }
+ else if (new_element == EL_SP_HARDWARE_GREEN ||
+ new_element == EL_SP_HARDWARE_BLUE ||
+ new_element == EL_SP_HARDWARE_RED)
+ {
+ int nr = GetSimpleRandom(3);
+
+ new_element = (nr == 0 ? EL_SP_HARDWARE_GREEN :
+ nr == 1 ? EL_SP_HARDWARE_BLUE : EL_SP_HARDWARE_RED);
}
else if (IS_BELT_SWITCH(old_element))
{
{
while (num_elements > 0)
{
- x = RND(lev_fieldx);
- y = RND(lev_fieldy);
+ x = GetSimpleRandom(lev_fieldx);
+ y = GetSimpleRandom(lev_fieldy);
/* don't place element at the same position twice */
if (free_position[x][y])