flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

IntGen: Attempt at fixing Linux compilation.

Browse Source
This commit is contained in:
Mattes D 2014-10-26 22:59:59 +01:00
parent 74df4618de
commit 7d6db6f33d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Generating/IntGen.h
View File

@ -131,7 +131,7 @@ public:
int BaseZ = a_MinZ + z; int BaseZ = a_MinZ + z;
for (int x = 0; x < SizeX; x++) for (int x = 0; x < SizeX; x++)
{ {
a_Values[x + SizeX * z] = (m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % Range; a_Values[x + SizeX * z] = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % Range;
} }
} // for z } // for z
} }
@ -159,7 +159,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
for (int z = 0; z < SizeZ; z++) for (int z = 0; z < SizeZ; z++)
{ {
@ -207,7 +207,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Generate the underlying data with half the resolution: // Generate the underlying data with half the resolution:
int lowerMinX = a_MinX >> 1; int lowerMinX = a_MinX >> 1;
@ -276,7 +276,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Generate the underlying values: // Generate the underlying values:
int Cache[(SizeX + 2) * (SizeZ + 2)]; int Cache[(SizeX + 2) * (SizeZ + 2)];
@ -350,7 +350,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Map for biome -> its beach: // Map for biome -> its beach:
static const int ToBeach[] = static const int ToBeach[] =
@ -450,7 +450,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
m_Underlying->GetInts(a_MinX, a_MinZ, a_Values); m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
for (int z = 0; z < SizeZ; z++) for (int z = 0; z < SizeZ; z++)
@ -499,7 +499,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values)
{ {
// Generate the underlying biome groups: // Generate the underlying biome groups:
int Cache[m_UnderlyingSizeX * m_UnderlyingSizeZ]; int Cache[m_UnderlyingSizeX * m_UnderlyingSizeZ];
@ -602,7 +602,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Define the per-biome-group biomes: // Define the per-biome-group biomes:
static const int OceanBiomes[] = static const int OceanBiomes[] =
@ -699,7 +699,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Generate the underlying values: // Generate the underlying values:
m_Underlying->GetInts(a_MinX, a_MinZ, a_Values); m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
@ -754,11 +754,11 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Generate the underlying data: // Generate the underlying data:
m_Biomes->GetInts(a_MinX, a_MinZ, a_Values); m_Biomes->GetInts(a_MinX, a_MinZ, a_Values);
Values Rivers; typename super::Values Rivers;
m_Rivers->GetInts(a_MinX, a_MinZ, Rivers); m_Rivers->GetInts(a_MinX, a_MinZ, Rivers);
// Mix the values: // Mix the values:
@ -823,7 +823,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Generate the underlying data: // Generate the underlying data:
int Cache[UnderlyingSizeX * UnderlyingSizeZ]; int Cache[UnderlyingSizeX * UnderlyingSizeZ];
@ -884,7 +884,7 @@ public:
} }
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
{ {
// Generate the underlying data: // Generate the underlying data:
int Cache[UnderlyingSizeX * UnderlyingSizeZ]; int Cache[UnderlyingSizeX * UnderlyingSizeZ];