Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crashfix terraform w/ oldterrain==NULL

This commit is contained in:
Enno Rehling 2005-11-14 18:58:09 +00:00
parent 29b84b640e
commit 2380573d77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/kernel/region.c
View File

@ -971,7 +971,7 @@ terraform_region(region * r, const terrain_type * terrain)
else { else {
rsetherbtype(r, NULL); rsetherbtype(r, NULL);
} }
if (!fval(oldterrain, LAND_REGION)) { if (oldterrain==NULL || !fval(oldterrain, LAND_REGION)) {
if (rand() % 100 < 3) fset(r, RF_MALLORN); if (rand() % 100 < 3) fset(r, RF_MALLORN);
else freset(r, RF_MALLORN); else freset(r, RF_MALLORN);
if (rand() % 100 < ENCCHANCE) { if (rand() % 100 < ENCCHANCE) {
@ -980,7 +980,7 @@ terraform_region(region * r, const terrain_type * terrain)
} }
} }
if (terrain->size!=oldterrain->size) { if (oldterrain==NULL || terrain->size!=oldterrain->size) {
if (terrain==newterrain(T_PLAIN)) { if (terrain==newterrain(T_PLAIN)) {
rsethorses(r, rand() % (terrain->size / 50)); rsethorses(r, rand() % (terrain->size / 50));
if(rand()%100 < 40) { if(rand()%100 < 40) {