Place Anvil from the .dun rather then a hardcoded array

Source/drlg_l3.cpp

@@ -453,36 +453,6 @@ const BYTE L3ISLE5[] = {
 	7, 7,
 	// clang-format on
 };
-/** Miniset: Anvil of Fury island. */
-const BYTE L3ANVIL[] = {
-	// clang-format off
-	11, 11, // width, height
-
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // search
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-
-	0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, // replace
-	0,  0, 29, 26, 26, 26, 26, 26, 30,  0, 0,
-	0, 29, 34, 33, 33, 37, 36, 33, 35, 30, 0,
-	0, 25, 33, 37, 27, 32, 31, 36, 33, 28, 0,
-	0, 25, 37, 32,  7,  7,  7, 31, 27, 32, 0,
-	0, 25, 28,  7,  7,  7,  7,  2,  2,  2, 0,
-	0, 25, 35, 30,  7,  7,  7, 29, 26, 30, 0,
-	0, 25, 33, 35, 26, 30, 29, 34, 33, 28, 0,
-	0, 31, 36, 33, 33, 35, 34, 33, 37, 32, 0,
-	0,  0, 31, 27, 27, 27, 27, 27, 32,  0, 0,
-	0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0,
-	// clang-format on
-};
 const BYTE HivePattern9[] = {
 	// clang-format off
 	3, 3, // width, height
@@ -2020,58 +1990,68 @@ void Fence()
 
 bool PlaceAnvil()
 {
-	int sw = L3ANVIL[0];
+	auto dunData = LoadFileInMem<uint16_t>("Levels\\L3Data\\Anvil.DUN");
-	int sh = L3ANVIL[1];
+	int width = SDL_SwapLE16(dunData[0]);
-	int sx = GenerateRnd(DMAXX - sw);
+	int height = SDL_SwapLE16(dunData[1]);
-	int sy = GenerateRnd(DMAXY - sh);
+	int sx = GenerateRnd(DMAXX - width - 2) - 1;
+	int sy = GenerateRnd(DMAXY - height - 2);
 
-	bool found = false;
+	for (int trys = 0;; trys++) {
-	int trys = 0;
+		if (trys > 198)
-	while (!found && trys < 200) {
+			return false;
-		trys++;
+
-		found = true;
+		sx++;
-		int ii = 2;
+		if (sx == DMAXX - width - 2) {
-		for (int yy = 0; yy < sh && found; yy++) {
+			sx = 0;
-			for (int xx = 0; xx < sw && found; xx++) {
+			sy++;
-				if (L3ANVIL[ii] != 0 && dungeon[xx + sx][yy + sy] != L3ANVIL[ii]) {
+			if (sy == DMAXY - height - 2) {
+				sy = 0;
+			}
+		}
+
+		bool found = true;
+		for (int yy = 0; yy < height + 2 && found; yy++) {
+			for (int xx = 0; xx < width + 2 && found; xx++) {
+				if (dungeon[xx + sx][yy + sy] != 7) {
 					found = false;
 				}
 				if (Protected[xx + sx][yy + sy]) {
 					found = false;
 				}
-				ii++;
-			}
-		}
-		if (!found) {
-			sx++;
-			if (sx == DMAXX - sw) {
-				sx = 0;
-				sy++;
-				if (sy == DMAXY - sh) {
-					sy = 0;
-				}
 			}
 		}
+		if (found)
+			break;
 	}
-	if (trys >= 200) {
+
-		return false;
+	setpc_x = sx;
+	setpc_y = sy;
+	setpc_w = width + 2;
+	setpc_h = height + 2;
+
+	for (int yy = 0; yy < setpc_h; yy++) {
+		for (int xx = 0; xx < setpc_w; xx++) {
+			Protected[xx + sx][yy + sy] = true;
+		}
 	}
 
-	int ii = sw * sh + 2;
+	sx++;
-	for (int yy = 0; yy < sh; yy++) {
+	sy++;
-		for (int xx = 0; xx < sw; xx++) {
+
-			if (L3ANVIL[ii] != 0) {
+	const uint16_t *tileLayer = &dunData[2];
-				dungeon[xx + sx][yy + sy] = L3ANVIL[ii];
+	for (int yy = 0; yy < height; yy++) {
+		for (int xx = 0; xx < width; xx++) {
+			int tileId = tileLayer[xx + yy * width];
+			if (tileId != 0) {
+				dungeon[xx + sx][yy + sy] = tileId;
 			}
-			Protected[xx + sx][yy + sy] = true;
-			ii++;
 		}
 	}
 
-	setpc_x = sx;
+	// Hack to avoid rivers entering the island, reversed later
-	setpc_y = sy;
+	dungeon[setpc_x + 7][setpc_y + 5] = 2;
-	setpc_w = sw;
+	dungeon[setpc_x + 8][setpc_y + 5] = 2;
-	setpc_h = sh;
+	dungeon[setpc_x + 9][setpc_y + 5] = 2;
 
 	return true;
 }

Source/gendung.h

@@ -294,8 +294,8 @@ constexpr bool IsTileLit(Point position)
 struct Miniset {
 	Size size;
 	/* these are indexed as [y][x] */
-	unsigned char search[5][5];
+	uint8_t search[5][5];
-	unsigned char replace[5][5];
+	uint8_t replace[5][5];
 
 	bool matches(Point position) const
 	{

test/Fixtures.cmake

@@ -51,6 +51,7 @@ set(devilutionx_fixtures
   Levels/L2Data/Blood2.DUN
   Levels/L2Data/Bonestr1.DUN
   Levels/L2Data/Bonestr2.DUN
+  Levels/L3Data/Anvil.DUN
   Levels/L4Data/diab1.DUN
   Levels/L4Data/diab2a.DUN
   Levels/L4Data/diab2b.DUN