diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-22 16:35:10 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-22 16:35:10 +0100 |
| commit | d9c25a161e62ffd04353fbdb10e2ffa1cfe98039 (patch) | |
| tree | 686cf865711b7bca0148433f4b799400a6587dbd /source/cRoot.cpp | |
| parent | Added a CriticalSection to cPlugin_NewLua. Lua plugins are not threadsafe but they ARE accessed by multiple threads, this can create some hard to find errors, but I fixed it now :P (diff) | |
| download | cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.gz cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.bz2 cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.lz cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.xz cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.zst cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/cRoot.cpp | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/source/cRoot.cpp b/source/cRoot.cpp index db5c20bd1..4178a4569 100644 --- a/source/cRoot.cpp +++ b/source/cRoot.cpp @@ -13,6 +13,8 @@ #include "cSleep.h"
#include "cThread.h"
#include "cFileFormatUpdater.h"
+#include "cGenSettings.h"
+#include "cRedstone.h"
#include "../iniFile/iniFile.h"
@@ -92,6 +94,8 @@ void cRoot::Start() {
m_bRestart = false;
+ LoadGlobalSettings();
+
cFileFormatUpdater::UpdateFileFormat();
LOG("Creating new server instance...");
@@ -182,6 +186,44 @@ void cRoot::Start() +void cRoot::LoadGlobalSettings()
+{
+ cIniFile IniFile("settings.ini");
+ if( IniFile.ReadFile() )
+ {
+ cRedstone::s_UseRedstone = IniFile.GetValueB("Redstone", "SimulateRedstone", true );
+ }
+
+
+ // I think this should be removed? I can't believe anybody is using it anyway
+ cIniFile GenSettings("terrain.ini");
+ if( GenSettings.ReadFile() )
+ {
+#define READ_INI_TERRAIN_VAL( var, type ) cGenSettings::var = (type)GenSettings.GetValueF("Terrain", #var, cGenSettings::var )
+ READ_INI_TERRAIN_VAL( HeightFreq1, float );
+ READ_INI_TERRAIN_VAL( HeightFreq2, float );
+ READ_INI_TERRAIN_VAL( HeightFreq3, float );
+ READ_INI_TERRAIN_VAL( HeightAmp1, float );
+ READ_INI_TERRAIN_VAL( HeightAmp2, float );
+ READ_INI_TERRAIN_VAL( HeightAmp3, float );
+ }
+ else
+ {
+#define SET_INI_TERRAIN_VAL( var ) GenSettings.SetValueF("Terrain", #var, cGenSettings::var )
+ SET_INI_TERRAIN_VAL( HeightFreq1 );
+ SET_INI_TERRAIN_VAL( HeightFreq2 );
+ SET_INI_TERRAIN_VAL( HeightFreq3 );
+ SET_INI_TERRAIN_VAL( HeightAmp1 );
+ SET_INI_TERRAIN_VAL( HeightAmp2 );
+ SET_INI_TERRAIN_VAL( HeightAmp3 );
+ GenSettings.WriteFile();
+ }
+}
+
+
+
+
+
void cRoot::LoadWorlds()
{
cIniFile IniFile("settings.ini"); IniFile.ReadFile();
|