--- a/landscape.c	Tue Jan 18 17:19:34 2005 +0000
+++ b/landscape.c	Tue Jan 18 18:41:56 2005 +0000
@@ -400,7 +400,7 @@
 	va_start(va, flags);
 
 	if ((i = (flags >> 8) & 0xF) != 0) {
-		_map_type_and_height[tile] = (_map_type_and_height[tile]&~0xF0)|((i-1) << 4);
+		SetTileType(tile, i - 1);
 	}
 
 	if (flags & (MP_MAP2_CLEAR | MP_MAP2)) {
@@ -510,7 +510,7 @@
 
 	while(true) {
 		if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == 0 && h == 0) {
-			_map_type_and_height[tile] = MP_WATER << 4;
+			SetTileType(tile, MP_WATER);
 			_map5[tile] = 0;
 			_map_owner[tile] = OWNER_WATER;
 		}