Anonymous avatar Anonymous committed 1d5297a

Brought back dark sand.

Comments (0)

Files changed (2)

Terrain/CPage.cpp

     //Sand is only for coastal regions
     if (low <= 2.0f && (region.climate == CLIMATE_COAST))
       c->surface = SURFACE_SAND;
+    if (low <= 2.0f && (region.climate == CLIMATE_OCEAN))
+      c->surface = SURFACE_SAND;
     //Forests are for... forests?
     if (c->detail < 0.75f && c->detail > 0.25f && (region.climate == CLIMATE_FOREST))
       c->surface = SURFACE_FOREST;
       if ((1.0f - c->detail) > fade)
         c->surface = SURFACE_SNOW;
     }
+    if (low <= 2.5f && (region.climate == CLIMATE_OCEAN))
+      c->surface = SURFACE_SAND;
+    if (low <= 2.5f && (region.climate == CLIMATE_COAST))
+      c->surface = SURFACE_SAND;
     //dirt touched by water is dark
     if (region.climate != CLIMATE_SWAMP) {
       if (c->surface == SURFACE_SAND && low <= 0)
       if (low <= c->water_level)
         c->surface = SURFACE_DIRT_DARK;
     }
-    if (low <= 2.5f && (region.climate == CLIMATE_OCEAN))
-      c->surface = SURFACE_SAND;
-    if (low <= 2.5f && (region.climate == CLIMATE_COAST))
-      c->surface = SURFACE_SAND;
     if (delta > 4.0f && region.temperature > 0.0f)
       c->surface = SURFACE_ROCK;
     if ((region.climate == CLIMATE_DESERT) && c->surface != SURFACE_ROCK)

Terrain/CTerrain.cpp

   {7,     0.8f,  0.3f,   1.2f,  SURFACE_SAND,       SURFACE_COLOR_SAND},
   {7,     1.0f,  1.0f,   1.1f,  SURFACE_SAND,       SURFACE_COLOR_SAND},
 
-  {7,     0.6f,  1.0f,   1.5f,  SURFACE_SAND_DARK,  SURFACE_COLOR_SAND},
+  {4,     0.6f,  1.0f,   1.5f,  SURFACE_SAND_DARK,  SURFACE_COLOR_SAND},
   {4,    1.0f,  1.0f,   1.4f,   SURFACE_DIRT,       SURFACE_COLOR_DIRT},
   {4,    0.6f,  1.0f,   1.6f,   SURFACE_DIRT_DARK,  SURFACE_COLOR_DIRT},
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.