Merge pull request #3084 from cuberite/seadragon91-patch-1
Fixed misuse of comma.
This commit is contained in:
commit
8fc9cfa411
|
@ -917,7 +917,7 @@ void cBioGenTwoLevel::InitializeBiomeGen(cIniFile & a_IniFile)
|
||||||
m_AmpX1 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave1Amp", 80));
|
m_AmpX1 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave1Amp", 80));
|
||||||
m_FreqX2 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave2Freq", 0.05));
|
m_FreqX2 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave2Freq", 0.05));
|
||||||
m_AmpX2 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave2Amp", 20));
|
m_AmpX2 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave2Amp", 20));
|
||||||
m_FreqX3 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave3Freq", 0.1)),
|
m_FreqX3 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave3Freq", 0.1));
|
||||||
m_AmpX3 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave3Amp", 8));
|
m_AmpX3 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortXOctave3Amp", 8));
|
||||||
m_FreqZ1 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortZOctave1Freq", 0.01));
|
m_FreqZ1 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortZOctave1Freq", 0.01));
|
||||||
m_AmpZ1 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortZOctave1Amp", 80));
|
m_AmpZ1 = static_cast<float>(a_IniFile.GetValueSetF("Generator", "TwoLevelDistortZOctave1Amp", 80));
|
||||||
|
|
|
@ -430,7 +430,7 @@ void cNoise3DComposable::Initialize(cIniFile & a_IniFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add octaves for the density noises:
|
// Add octaves for the density noises:
|
||||||
wavlen = 1, ampl = 1;
|
wavlen = 1; ampl = 1;
|
||||||
for (int i = 0; i < NumDensityOctaves; i++)
|
for (int i = 0; i < NumDensityOctaves; i++)
|
||||||
{
|
{
|
||||||
m_DensityNoiseA.AddOctave(wavlen, ampl);
|
m_DensityNoiseA.AddOctave(wavlen, ampl);
|
||||||
|
@ -440,7 +440,7 @@ void cNoise3DComposable::Initialize(cIniFile & a_IniFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add octaves for the base noise:
|
// Add octaves for the base noise:
|
||||||
wavlen = 1, ampl = BaseNoiseAmplitude;
|
wavlen = 1; ampl = BaseNoiseAmplitude;
|
||||||
for (int i = 0; i < NumBaseOctaves; i++)
|
for (int i = 0; i < NumBaseOctaves; i++)
|
||||||
{
|
{
|
||||||
m_BaseNoise.AddOctave(wavlen, ampl);
|
m_BaseNoise.AddOctave(wavlen, ampl);
|
||||||
|
@ -590,7 +590,7 @@ void cBiomalNoise3DComposable::Initialize(cIniFile & a_IniFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add octaves for the density noises:
|
// Add octaves for the density noises:
|
||||||
wavlen = 1, ampl = 1;
|
wavlen = 1; ampl = 1;
|
||||||
for (int i = 0; i < NumDensityOctaves; i++)
|
for (int i = 0; i < NumDensityOctaves; i++)
|
||||||
{
|
{
|
||||||
m_DensityNoiseA.AddOctave(wavlen, ampl);
|
m_DensityNoiseA.AddOctave(wavlen, ampl);
|
||||||
|
@ -600,7 +600,7 @@ void cBiomalNoise3DComposable::Initialize(cIniFile & a_IniFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add octaves for the base noise:
|
// Add octaves for the base noise:
|
||||||
wavlen = 1, ampl = BaseNoiseAmplitude;
|
wavlen = 1; ampl = BaseNoiseAmplitude;
|
||||||
for (int i = 0; i < NumBaseOctaves; i++)
|
for (int i = 0; i < NumBaseOctaves; i++)
|
||||||
{
|
{
|
||||||
m_BaseNoise.AddOctave(wavlen, ampl);
|
m_BaseNoise.AddOctave(wavlen, ampl);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user