empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fairland: Drop unused elevation band for coastal mountains

Browse source 
Elevations 34 and 35 are reserved for coastal mountains.  When an
elevation computed for a non-mountain falls in that band, it's
adjusted to 36.

This is unnecessary since the previous commit; drop.  Test output
shows the dropped elevation adjustment.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-19 13:44:00 +02:00
parent aed94594f1
commit 7ce7440a34
3 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/util/fairland.c
View file

@ -100,8 +100,6 @@
* In between, elevate the remaining land one by one, working from
* mountains towards the sea, and from the elevation just below "high"
* elevation linearly down to 1.
* TODO This still avoids the elevations formerly reserved for coastal
* mountains. Don't.
*
* This gives islands of the same size the same set of elevations.
*
@ -151,9 +149,8 @@
/* lower URAN_MIN for more uranium */
#define URAN_MIN 56
/* do not change these 4 defines */
/* do not change these defines */
#define LANDMIN 1 /* plate altitude for normal land */
#define HILLMIN 34 /* plate altitude for hills */
#define PLATMIN 36 /* plate altitude for plateau */
#define HIGHMIN 98 /* plate altitude for mountains */
@ -1364,8 +1361,6 @@ elevate_land(void)
if (where == -1)
break;
newk = k / 100;
if (newk >= HILLMIN && newk < PLATMIN)
newk = PLATMIN;
if (newk < LANDMIN)
newk = LANDMIN;
elev[sectx[c][where]][secty[c][where]] = newk;
@ -1386,7 +1381,7 @@ elevate_land(void)
* tests/fairland/ churn:
*/
if (dsea[i] == 1)
roll0(PLATMIN - HILLMIN);
roll0(2);
else {
roll0((256 - HIGHMIN) / 2);
roll0((256 - HIGHMIN) / 2);
@ -1419,10 +1414,6 @@ elev_to_sct_type(int elevation)
{
if (elevation < LANDMIN)
return SCT_WATER;
if (elevation < HILLMIN)
return SCT_RURAL;
if (elevation < PLATMIN)
return SCT_MOUNT;
if (elevation < HIGHMIN)
return SCT_RURAL;
return SCT_MOUNT;