File diff r13297:221c8d555eb9 → r13298:ddbc752190f3
src/water_cmd.cpp
Show inline comments
 
@@ -162,13 +162,13 @@ void MakeWaterKeepingClass(TileIndex til
 
	uint z;
 
	if (GetTileSlope(tile, &z) != SLOPE_FLAT) wc = WATER_CLASS_INVALID;
 

	
 
	if (wc == WATER_CLASS_SEA && z > 0) wc = WATER_CLASS_CANAL;
 

	
 
	switch (wc) {
 
		case WATER_CLASS_SEA:   MakeWater(tile);              break;
 
		case WATER_CLASS_SEA:   MakeSea(tile);                break;
 
		case WATER_CLASS_CANAL: MakeCanal(tile, o, Random()); break;
 
		case WATER_CLASS_RIVER: MakeRiver(tile, Random());    break;
 
		default:                DoClearSquare(tile);          break;
 
	}
 
}
 

	
 
@@ -334,13 +334,13 @@ CommandCost CmdBuildCanal(TileIndex tile
 
		ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 
		if (CmdFailed(ret)) return ret;
 
		cost.AddCost(ret);
 

	
 
		if (flags & DC_EXEC) {
 
			if (TileHeight(tile) == 0 && p2 == 1) {
 
				MakeWater(tile);
 
				MakeSea(tile);
 
			} else if (p2 == 2) {
 
				MakeRiver(tile, Random());
 
			} else {
 
				MakeCanal(tile, _current_company, Random());
 
			}
 
			MarkTileDirtyByTile(tile);
 
@@ -944,13 +944,13 @@ void DoFloodTile(TileIndex target)
 
	} else {
 
		/* Flood vehicles */
 
		FloodVehicles(target);
 

	
 
		/* flood flat tile */
 
		if (CmdSucceeded(DoCommand(target, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR))) {
 
			MakeWater(target);
 
			MakeSea(target);
 
			MarkTileDirtyByTile(target);
 
			flooded = true;
 
		}
 
	}
 

	
 
	if (flooded) {
 
@@ -1064,13 +1064,13 @@ void ConvertGroundTilesIntoWaterTiles()
 
		if (IsTileType(tile, MP_CLEAR) && z == 0) {
 
			/* Make both water for tiles at level 0
 
			 * and make shore, as that looks much better
 
			 * during the generation. */
 
			switch (slope) {
 
				case SLOPE_FLAT:
 
					MakeWater(tile);
 
					MakeSea(tile);
 
					break;
 

	
 
				case SLOPE_N:
 
				case SLOPE_E:
 
				case SLOPE_S:
 
				case SLOPE_W: