Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Commit

Permalink
remove shallow water
Browse files Browse the repository at this point in the history
  • Loading branch information
malytomas committed Jun 16, 2024
1 parent a45a898 commit 9efaa53
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion externals/cage
8 changes: 3 additions & 5 deletions sources/coloringModes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions sources/enums.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>";
Expand Down
3 changes: 1 addition & 2 deletions sources/generator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
3 changes: 1 addition & 2 deletions sources/planets.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ namespace unnatural
Flat = 1,
Rough = 2,
Cliffs = 3,
ShallowWater = 4,
DeepWater = 5,
Water = 4,
_Total
};

Expand Down

0 comments on commit 9efaa53

Please sign in to comment.