diff options
author | Alexander Harkness <bearbin@gmail.com> | 2013-08-07 19:37:03 +0200 |
---|---|---|
committer | Alexander Harkness <bearbin@gmail.com> | 2013-08-07 19:37:03 +0200 |
commit | be7a6d7a6679fd17e88e9f5131036d69978e4151 (patch) | |
tree | 8e1b46a9b8ac8d3d47a65f903a63e063e5550e94 /source/Root.cpp | |
parent | Drag in the latest core changes. (diff) | |
parent | Merge pull request #48 from mc-server/BlockTracing (diff) | |
download | cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.gz cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.bz2 cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.lz cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.xz cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.zst cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.zip |
Diffstat (limited to 'source/Root.cpp')
-rw-r--r-- | source/Root.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/source/Root.cpp b/source/Root.cpp index 59242c60d..f12ccc832 100644 --- a/source/Root.cpp +++ b/source/Root.cpp @@ -112,10 +112,7 @@ void cRoot::Start(void) cIniFile IniFile("settings.ini"); if (!IniFile.ReadFile()) { - LOGINFO("settings.ini inaccessible, using settings.example.ini for defaults!"); - IniFile.Path("settings.example.ini"); - IniFile.ReadFile(); - IniFile.Path("settings.ini"); + LOGWARNING("settings.ini inaccessible, all settings are reset to default values"); } m_PrimaryServerVersion = IniFile.GetValueI("Server", "PrimaryServerVersion", 0); if (m_PrimaryServerVersion == 0) @@ -139,23 +136,19 @@ void cRoot::Start(void) cIniFile WebIniFile("webadmin.ini"); if (!WebIniFile.ReadFile()) { - LOGINFO("webadmin.ini inaccessible, using webadmin.example.ini for defaults!"); - WebIniFile.Path("webadmin.example.ini"); - WebIniFile.ReadFile(); - WebIniFile.Path("webadmin.ini"); - WebIniFile.WriteFile(); + LOGWARNING("webadmin.ini inaccessible, wabadmin is disabled"); } - if (WebIniFile.GetValueB("WebAdmin", "Enabled", false )) + if (WebIniFile.GetValueB("WebAdmin", "Enabled", false)) { LOG("Creating WebAdmin..."); m_WebAdmin = new cWebAdmin(8080); } LOG("Loading settings..."); - m_GroupManager = new cGroupManager(); + m_GroupManager = new cGroupManager(); m_CraftingRecipes = new cCraftingRecipes; - m_FurnaceRecipe = new cFurnaceRecipe(); + m_FurnaceRecipe = new cFurnaceRecipe(); LOG("Loading worlds..."); LoadWorlds(); |