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

Merge pull request #1581 from mc-server/redstone

Browse Source 
Resplit redstone .inc file and provided improvements
This commit is contained in:
Mattes D
2014-12-17 08:38:23 +01:00
parent aff32ba27b 8d9049603b
commit 4947880a5d
25 changed files with 2645 additions and 2864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/World.cpp
View File

@@ -3386,7 +3386,7 @@ void cWorld::SetChunkAlwaysTicked(int a_ChunkX, int a_ChunkZ, bool a_AlwaysTicke
cRedstoneSimulator<cChunk, cWorld> * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile)
cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile)
{
AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", "Incremental");
@@ -3396,11 +3396,11 @@ cRedstoneSimulator<cChunk, cWorld> * cWorld::InitializeRedstoneSimulator(cIniFil
SimulatorName = "Incremental";
}
cRedstoneSimulator<cChunk, cWorld> * res = nullptr;
cRedstoneSimulator * res = nullptr;
if (NoCaseCompare(SimulatorName, "Incremental") == 0)
{
res = MakeIncrementalRedstoneSimulator(*this);
res = new cIncrementalRedstoneSimulator(*this);
}
else if (NoCaseCompare(SimulatorName, "noop") == 0)
{