Windy/cubiomes
1
0
Fork 0
mirror of https://github.com/Cubitect/cubiomes.git synced 2025-04-04 22:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up formatting for mapOceanMix a little.

Browse Source
This commit is contained in:
Cubitect 2018-07-08 17:35:42 +01:00
parent f46bd35bc6
commit fb526d1403
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
layers.c
View File

@ -1365,7 +1365,7 @@ void mapOceanTemp(Layer *l, int * __restrict out, int areaX, int areaZ, int area
}
}
/* Warning: this function is horribly slow compared to other layers! */
void mapOceanMix(Layer *l, int * __restrict out, int areaX, int areaZ, int areaWidth, int areaHeight)
{
int landX = areaX-8, landZ = areaZ-8;
@ -1402,13 +1402,13 @@ void mapOceanMix(Layer *l, int * __restrict out, int areaX, int areaZ, int areaW
continue;
}
for(int i2 = -8; i2 <= 8; i2 += 4)
for(int i = -8; i <= 8; i += 4)
{
for(int i3 = -8; i3 <= 8; i3 += 4)
for(int j = -8; j <= 8; j += 4)
{
int n8 = map1[(x+i2+8) + (z+i3+8)*landWidth];
int nearbyID = map1[(x+i+8) + (z+j+8)*landWidth];
if(isOceanic(n8)) continue;
if(isOceanic(nearbyID)) continue;
if(oceanID == warmOcean)
{
@ -1416,27 +1416,33 @@ void mapOceanMix(Layer *l, int * __restrict out, int areaX, int areaZ, int areaW
goto loop_x;
}
if(oceanID != frozenOcean) continue;
out[x + z*areaWidth] = coldOcean;
goto loop_x;
if(oceanID == frozenOcean)
{
out[x + z*areaWidth] = coldOcean;
goto loop_x;
}
}
}
if (landID == deepOcean) {
if (oceanID == lukewarmOcean) {
if(landID == deepOcean)
{
if(oceanID == lukewarmOcean)
{
out[x + z*areaWidth] = lukewarmDeepOcean;
continue;
}
if (oceanID == ocean) {
if(oceanID == ocean)
{
out[x + z*areaWidth] = deepOcean;
continue;
}
if (oceanID == coldOcean) {
if(oceanID == coldOcean)
{
out[x + z*areaWidth] = coldDeepOcean;
continue;
}
if (oceanID == frozenOcean) {
if(oceanID == frozenOcean)
{
out[x + z*areaWidth] = frozenDeepOcean;
continue;
}