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

Merge pull request #1270 from Howaner/Options

Browse Source 
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator
This commit is contained in:
Mattes D 2014-07-31 23:45:01 +02:00
commit a9317ac372
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/World.cpp
View File

@ -3176,17 +3176,17 @@ void cWorld::SetChunkAlwaysTicked(int a_ChunkX, int a_ChunkZ, bool a_AlwaysTicke
cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile)
{ {
AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", ""); AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", "Incremental");
if (SimulatorName.empty()) if (SimulatorName.empty())
{ {
LOGWARNING("[Physics] RedstoneSimulator not present or empty in %s, using the default of \"incremental\".", GetIniFileName().c_str()); LOGWARNING("[Physics] RedstoneSimulator not present or empty in %s, using the default of \"Incremental\".", GetIniFileName().c_str());
SimulatorName = "incremental"; SimulatorName = "Incremental";
} }
cRedstoneSimulator * res = NULL; cRedstoneSimulator * res = NULL;
if (NoCaseCompare(SimulatorName, "incremental") == 0) if (NoCaseCompare(SimulatorName, "Incremental") == 0)
{ {
res = new cIncrementalRedstoneSimulator(*this); res = new cIncrementalRedstoneSimulator(*this);
} }
@ -3210,7 +3210,7 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c
Printf(SimulatorNameKey, "%sSimulator", a_FluidName); Printf(SimulatorNameKey, "%sSimulator", a_FluidName);
AString SimulatorSectionName; AString SimulatorSectionName;
Printf(SimulatorSectionName, "%sSimulator", a_FluidName); Printf(SimulatorSectionName, "%sSimulator", a_FluidName);
AString SimulatorName = a_IniFile.GetValueSet("Physics", SimulatorNameKey, ""); AString SimulatorName = a_IniFile.GetValueSet("Physics", SimulatorNameKey, "Vanilla");
if (SimulatorName.empty()) if (SimulatorName.empty())
{ {
LOGWARNING("[Physics] %s not present or empty in %s, using the default of \"Vanilla\".", SimulatorNameKey.c_str(), GetIniFileName().c_str()); LOGWARNING("[Physics] %s not present or empty in %s, using the default of \"Vanilla\".", SimulatorNameKey.c_str(), GetIniFileName().c_str());