summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2013-10-14 23:32:40 +0200
committerSamuel Barney <samjbarney@gmail.com>2013-10-14 23:32:40 +0200
commit02baff662964303f080113e21c1e50d759ee9988 (patch)
tree687a83f27ccc19e55afcd3c520a43a4baf1d570c /source
parentGeneral fixes to get the new Monster spawning code working. (diff)
downloadcuberite-02baff662964303f080113e21c1e50d759ee9988.tar
cuberite-02baff662964303f080113e21c1e50d759ee9988.tar.gz
cuberite-02baff662964303f080113e21c1e50d759ee9988.tar.bz2
cuberite-02baff662964303f080113e21c1e50d759ee9988.tar.lz
cuberite-02baff662964303f080113e21c1e50d759ee9988.tar.xz
cuberite-02baff662964303f080113e21c1e50d759ee9988.tar.zst
cuberite-02baff662964303f080113e21c1e50d759ee9988.zip
Diffstat (limited to '')
-rw-r--r--source/World.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/source/World.cpp b/source/World.cpp
index 3a4469c99..967cd8f59 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -444,12 +444,6 @@ void cWorld::Start(void)
m_SpawnY = cChunkDef::Height;
m_SpawnZ = (double)((m_TickRand.randInt() % 1000) - 500);
m_GameMode = eGameMode_Creative;
- static AString SettingsName = "settings.ini";
- cIniFile Settings(SettingsName);
- if (!Settings.ReadFile())
- {
- LOGWARNING("Cannot read world settings from \"%s\", defaults will be used.", SettingsName.c_str());
- }
cIniFile IniFile(m_IniFileName);
if (!IniFile.ReadFile())
@@ -495,11 +489,8 @@ void cWorld::Start(void)
m_GameMode = (eGameMode)IniFile.GetValueSetI("GameMode", "GameMode", m_GameMode);
- m_bAnimals = Settings.GetValueB("Monsters", "AnimalsOn", true);
- m_bAnimals = IniFile.GetValueB("Monsters", "AnimalsOn", m_bAnimals);
+ m_bAnimals = IniFile.GetValueB("Monsters", "AnimalsOn", true);
AString sAllMonsters = IniFile.GetValue("Monsters", "Types");
- if (!sAllMonsters.size())
- sAllMonsters = Settings.GetValue("Monsters", "Types");
AStringVector SplitList = StringSplit(sAllMonsters, ",");
for (unsigned int i = 0; i < SplitList.size(); ++i)
{