summaryrefslogtreecommitdiffstats
path: root/source/Generating/BioGen.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-12 23:11:25 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-12 23:11:25 +0200
commit0a08ae14f69f5179c5d8990c41d1d8dbb63be346 (patch)
tree52a80f3a7b77f1bb0fdf6bcd225c9d1e68270383 /source/Generating/BioGen.cpp
parentTemporarily set all pickups to spawn in the middle of the block from which they fall. (diff)
downloadcuberite-0a08ae14f69f5179c5d8990c41d1d8dbb63be346.tar
cuberite-0a08ae14f69f5179c5d8990c41d1d8dbb63be346.tar.gz
cuberite-0a08ae14f69f5179c5d8990c41d1d8dbb63be346.tar.bz2
cuberite-0a08ae14f69f5179c5d8990c41d1d8dbb63be346.tar.lz
cuberite-0a08ae14f69f5179c5d8990c41d1d8dbb63be346.tar.xz
cuberite-0a08ae14f69f5179c5d8990c41d1d8dbb63be346.tar.zst
cuberite-0a08ae14f69f5179c5d8990c41d1d8dbb63be346.zip
Diffstat (limited to 'source/Generating/BioGen.cpp')
-rw-r--r--source/Generating/BioGen.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/Generating/BioGen.cpp b/source/Generating/BioGen.cpp
index 13e7c88ae..1afa93e07 100644
--- a/source/Generating/BioGen.cpp
+++ b/source/Generating/BioGen.cpp
@@ -340,8 +340,8 @@ void cBioGenDistortedVoronoi::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::B
Distort(BaseX + x * 4, BaseZ + z * 4, DistortX[4 * x][4 * z], DistortZ[4 * x][4 * z]);
}
- ArrayLinearUpscale2D(&DistortX[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
- ArrayLinearUpscale2D(&DistortZ[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
+ ArrayLinearUpscale2DInPlace(&DistortX[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
+ ArrayLinearUpscale2DInPlace(&DistortZ[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
for (int z = 0; z < cChunkDef::Width; z++)
{
@@ -447,8 +447,8 @@ void cBioGenMultiStepMap::DecideOceanLandMushroom(int a_ChunkX, int a_ChunkZ, cC
{
Distort(BaseX + x * 4, BaseZ + z * 4, DistortX[4 * x][4 * z], DistortZ[4 * x][4 * z], DistortSize);
}
- ArrayLinearUpscale2D(&DistortX[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
- ArrayLinearUpscale2D(&DistortZ[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
+ ArrayLinearUpscale2DInPlace(&DistortX[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
+ ArrayLinearUpscale2DInPlace(&DistortZ[0][0], cChunkDef::Width + 1, cChunkDef::Width + 1, 4, 4);
// Prepare a 9x9 area of neighboring cell seeds
// (assuming that 7x7 cell area is larger than a chunk being generated)
@@ -621,8 +621,8 @@ void cBioGenMultiStepMap::BuildTemperatureHumidityMaps(int a_ChunkX, int a_Chunk
HumidityMap[x + 17 * z] = NoiseH;
} // for x
} // for z
- ArrayLinearUpscale2D(TemperatureMap, 17, 17, 8, 8);
- ArrayLinearUpscale2D(HumidityMap, 17, 17, 8, 8);
+ ArrayLinearUpscale2DInPlace(TemperatureMap, 17, 17, 8, 8);
+ ArrayLinearUpscale2DInPlace(HumidityMap, 17, 17, 8, 8);
// Re-map into integral values in [0 .. 255] range:
for (int idx = 0; idx < ARRAYCOUNT(a_TemperatureMap); idx++)