AstralTransRocketries/cubiomes
1
0
Fork 0
mirror of https://github.com/Cubitect/cubiomes.git synced 2025-09-24 04:03:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Hills layer for pre-1.13 versions.

Browse Source
This commit is contained in:
Cubitect 2020-09-21 13:12:04 +02:00
parent 7f18801dac
commit 6a9c1397c5
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
finders.c
View File

@ -554,6 +554,7 @@ int areBiomesViable(
int height = z2 - z1 + 1;
int i;
int *map;
int viable;
if (l->scale != 4)
{
@ -562,20 +563,23 @@ int areBiomesViable(
}
map = cache ? cache : allocCache(l, width, height);
if (genArea(l, map, x1, z1, width, height))
return 0;
viable = !genArea(l, map, x1, z1, width, height);
for (i = 0; i < width*height; i++)
if (viable)
{
if (!biomeExists(map[i]) || !isValid[ map[i] ])
for (i = 0; i < width*height; i++)
{
if (cache == NULL) free(map);
return 0;
if (!biomeExists(map[i]) || !isValid[ map[i] ])
{
viable = 0;
break;
}
}
}
if (cache == NULL) free(map);
return 1;
if (cache == NULL)
free(map);
return viable;
}

21
layers.c
View File

@ -259,8 +259,8 @@ int mapZoom(const Layer * l, int * out, int x, int z, int w, int h)
{
int pX = x >> 1;
int pZ = z >> 1;
int pW = ((x + w) >> 1) - pX + 1;
int pH = ((z + h) >> 1) - pZ + 1;
int pW = ((x + w) >> 1) - pX + 1; // (w >> 1) + 2;
int pH = ((z + h) >> 1) - pZ + 1; // (h >> 1) + 2;
int i, j;
int err = l->p->getMap(l->p, out, pX, pZ, pW, pH);
@ -1062,16 +1062,20 @@ int mapHills(const Layer * l, int * out, int x, int z, int w, int h)
int b11 = out[i+1 + (j+1)*pW]; // river branch
int idx = i + j*w;
int var12 = (b11 - 2) % 29 == 0;
int bn = (b11 - 2) % 29 == 0;
if (a11 != 0 && b11 >= 2 && (b11 - 2) % 29 == 1 && a11 < 128)
{
out[idx] = (biomeExists(a11 + 128)) ? a11 + 128 : a11;
int m = biomes[a11].mutated;
if (m > 0)
out[idx] = m;
else
out[idx] = a11;
}
else
{
cs = getChunkSeed(ss, i + x, j + z);
if (mcFirstIsZero(cs, 3) && !var12)
if (!mcFirstIsZero(cs, 3) && !bn)
{
out[idx] = a11;
}
@ -1116,11 +1120,10 @@ int mapHills(const Layer * l, int * out, int x, int z, int w, int h)
break;
}
if (var12 && hillID != a11)
if (bn != 0 && hillID != a11)
{
if (biomeExists(hillID + 128))
hillID += 128;
else
hillID = biomes[hillID].mutated;
if (hillID < 0)
hillID = a11;
}