(svn r5155) - Remove the bridge branch merge (revision r5070)

This commit is contained in:
tron
2006-06-07 19:35:21 +00:00
parent ace071529e
commit be88e269b9
33 changed files with 1004 additions and 778 deletions

View File

@@ -2,7 +2,6 @@
#include "stdafx.h"
#include "openttd.h"
#include "bridge_map.h"
#include "clear_map.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -82,20 +81,11 @@ static void GenerateRockyArea(TileIndex end, TileIndex start)
size_y = (ey - sy) + 1;
BEGIN_TILE_LOOP(tile, size_x, size_y, TileXY(sx, sy)) {
switch (GetTileType(tile)) {
case MP_CLEAR:
MakeClear(tile, CLEAR_ROCKS, 3);
break;
case MP_TREES:
MakeClear(tile, CLEAR_ROCKS, 3);
ClearBridgeMiddle(tile);
break;
default: continue;
if (IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) {
MakeClear(tile, CLEAR_ROCKS, 3);
MarkTileDirtyByTile(tile);
success = true;
}
MarkTileDirtyByTile(tile);
success = true;
} END_TILE_LOOP(tile, size_x, size_y, 0);
if (success) SndPlayTileFx(SND_1F_SPLAT, end);