diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 89375dbd3..756b2221d 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -241,9 +241,16 @@ void DRLG_Init_Globals()
 	memset(dMissile, 0, sizeof(dMissile));
 	memset(dArch, 0, sizeof(dArch));
 	if (!lightflag)
-		c = (light4flag) ? 3 : 15;
+	{
+		if (light4flag)
+			c = 3;
+		else
+			c = 15;
+	}
 	else
+	{
 		c = 0;
+	}
 	memset(dLight, c, sizeof(dLight));
 }
 
@@ -948,16 +955,12 @@ void drlg_l1_crypt_lavafloor()
 					dungeon[i][j - 1] = 205;
 				break;
 			case 7:
-			case 15:
-			case 17:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 206;
 				if ( dungeon[i - 1][j - 1] == 13 )
 					dungeon[i - 1][j - 1] = 207;
 				break;
 			case 8:
-			case 11:
-			case 14:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 203;
 				if ( dungeon[i - 1][j - 1] == 13 )
@@ -972,10 +975,37 @@ void drlg_l1_crypt_lavafloor()
 					dungeon[i][j - 1] = 205;
 				break;
 			case 10:
+				if ( dungeon[i][j - 1] == 13 )
+					dungeon[i][j - 1] = 205;
+				break;
+			case 11:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
 			case 12:
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 205;
 				break;
+			case 14:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
+			case 15:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 206;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 207;
+				break;
+			case 17:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 206;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 207;
+				break;
 			case 95:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 203;
@@ -983,7 +1013,6 @@ void drlg_l1_crypt_lavafloor()
 					dungeon[i - 1][j - 1] = 204;
 				break;
 			case 96:
-			case 187:
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 208;
 				break;
@@ -996,25 +1025,12 @@ void drlg_l1_crypt_lavafloor()
 					dungeon[i][j - 1] = 205;
 				break;
 			case 118:
-			case 126:
-			case 128:
-			case 135:
-			case 152:
-			case 160:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 206;
 				if ( dungeon[i - 1][j - 1] == 13 )
 					dungeon[i - 1][j - 1] = 207;
 				break;
 			case 119:
-			case 125:
-			case 136:
-			case 142:
-			case 153:
-			case 156:
-			case 159:
-			case 185:
-			case 186:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 203;
 				if ( dungeon[i - 1][j - 1] == 13 )
@@ -1029,9 +1045,6 @@ void drlg_l1_crypt_lavafloor()
 					dungeon[i][j - 1] = 205;
 				break;
 			case 121:
-			case 123:
-			case 138:
-			case 155:
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 205;
 				break;
@@ -1041,6 +1054,28 @@ void drlg_l1_crypt_lavafloor()
 				if ( dungeon[i - 1][j - 1] == 13 )
 					dungeon[i - 1][j - 1] = 212;
 				break;
+			case 123:
+				if ( dungeon[i][j - 1] == 13 )
+					dungeon[i][j - 1] = 205;
+				break;
+			case 125:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
+			case 126:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 206;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 207;
+				break;
+			case 128:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 206;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 207;
+				break;
 			case 133:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 203;
@@ -1049,6 +1084,18 @@ void drlg_l1_crypt_lavafloor()
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 205;
 				break;
+			case 135:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 206;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 207;
+				break;
+			case 136:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
 			case 137:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 213;
@@ -1057,6 +1104,10 @@ void drlg_l1_crypt_lavafloor()
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 205;
 				break;
+			case 138:
+				if ( dungeon[i][j - 1] == 13 )
+					dungeon[i][j - 1] = 205;
+				break;
 			case 139:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 215;
@@ -1064,11 +1115,21 @@ void drlg_l1_crypt_lavafloor()
 					dungeon[i - 1][j - 1] = 216;
 				break;
 			case 140:
-			case 157:
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 217;
 				break;
+			case 142:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
 			case 143:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 213;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 214;
+				break;
 			case 145:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 213;
@@ -1083,6 +1144,18 @@ void drlg_l1_crypt_lavafloor()
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 217;
 				break;
+			case 152:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 206;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 207;
+				break;
+			case 153:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
 			case 154:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 206;
@@ -1091,8 +1164,60 @@ void drlg_l1_crypt_lavafloor()
 				if ( dungeon[i][j - 1] == 13 )
 					dungeon[i][j - 1] = 205;
 				break;
+			case 155:
+				if ( dungeon[i][j - 1] == 13 )
+					dungeon[i][j - 1] = 205;
+				break;
+			case 156:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
+			case 157:
+				if ( dungeon[i][j - 1] == 13 )
+					dungeon[i][j - 1] = 217;
+				break;
+			case 159:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
+			case 160:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 206;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 207;
+				break;
 			case 162:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 209;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 210;
+				break;
 			case 167:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 209;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 210;
+				break;
+			case 187:
+				if ( dungeon[i][j - 1] == 13 )
+					dungeon[i][j - 1] = 208;
+				break;
+			case 185:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
+			case 186:
+				if ( dungeon[i - 1][j] == 13 )
+					dungeon[i - 1][j] = 203;
+				if ( dungeon[i - 1][j - 1] == 13 )
+					dungeon[i - 1][j - 1] = 204;
+				break;
 			case 192:
 				if ( dungeon[i - 1][j] == 13 )
 					dungeon[i - 1][j] = 209;