remove shallow water

Author: malytomas

externals/cage

@@ -191,10 +191,8 @@ namespace unnatural
 
 		void generateType(Tile &tile)
 		{
-			if (tile.elevation < -20)
-				tile.type = TerrainTypeEnum::DeepWater;
-			else if (tile.elevation < 0)
-				tile.type = TerrainTypeEnum::ShallowWater;
+			if (tile.elevation < 0)
+				tile.type = TerrainTypeEnum::Water;
 			else if (tile.slope > Degs(20))
 				tile.type = TerrainTypeEnum::Cliffs;
 			else
@@ -938,7 +936,7 @@ namespace unnatural
 		if (tile.meshPurpose == MeshPurposeEnum::Water)
 		{
 			tile.biome = TerrainBiomeEnum::Water;
-			tile.type = TerrainTypeEnum::ShallowWater;
+			tile.type = TerrainTypeEnum::Water;
 			generateWater(tile);
 		}
 		else

sources/coloringModes.cpp

@@ -65,11 +65,8 @@ namespace unnatural
 			case TerrainTypeEnum::Cliffs:
 				str + "cliffs";
 				break;
-			case TerrainTypeEnum::ShallowWater:
-				str + "shallow water";
-				break;
-			case TerrainTypeEnum::DeepWater:
-				str + "deep water";
+			case TerrainTypeEnum::Water:
+				str + "water";
 				break;
 			default:
 				str + "<unknown>";

sources/enums.cpp

@@ -266,8 +266,7 @@ namespace unnatural
 				f->writeLine("flat");
 				f->writeLine("rough");
 				f->writeLine("cliffs");
-				f->writeLine("shallow_water");
-				f->writeLine("deep_water");
+				f->writeLine("water");
 				f->close();
 			}
 

sources/generator.cpp

@@ -43,8 +43,7 @@ namespace unnatural
 		Flat = 1,
 		Rough = 2,
 		Cliffs = 3,
-		ShallowWater = 4,
-		DeepWater = 5,
+		Water = 4,
 		_Total
 	};