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

Merge branch 'master' into GeneratingBenchmark2

Browse Source 
Conflicts:
	src/World.h
This commit is contained in:
Tycho
2014-01-31 15:31:05 -08:00
parent 25ec7750aa f9a4c49fd4
commit fec17409d2
46 changed files with 931 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/World.cpp
View File

@@ -1,4 +1,3 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "BlockID.h"
@@ -234,7 +233,7 @@ cWorld::cWorld(const AString & a_WorldName) :
m_WorldName(a_WorldName),
m_IniFileName(m_WorldName + "/world.ini"),
m_StorageSchema("Default"),
#ifdef _arm_
#ifdef __arm__
m_StorageCompressionFactor(0),
#else
m_StorageCompressionFactor(6),
@@ -547,6 +546,7 @@ void cWorld::Start(void)
m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", false);
m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true);
m_bCommandBlocksEnabled = IniFile.GetValueSetB("Mechanics", "CommandBlocksEnabled", false);
m_VillagersShouldHarvestCrops = IniFile.GetValueSetB("Monsters", "VillagersShouldHarvestCrops", true);
m_GameMode = (eGameMode)IniFile.GetValueSetI("GameMode", "GameMode", m_GameMode);