diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-23 22:12:59 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-23 22:12:59 +0200 |
| commit | 1156914dd60b4949116e57ec1480f81c39b6f292 (patch) | |
| tree | af5e5db060f819ba4f92e84aa2c6b096e334a704 /src/World.cpp | |
| parent | Speed improvements, crash fixes, & self-suggestions (diff) | |
| download | cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.gz cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.bz2 cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.lz cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.xz cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.zst cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/World.cpp b/src/World.cpp index 9cbaf48fb..bcb2fa88d 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -66,9 +66,6 @@ const int TIME_NIGHT_END = 22812; const int TIME_SUNRISE = 23999; const int TIME_SPAWN_DIVISOR = 148; -#define DEFAULT_NETHER_NAME GetName() + "_nether" -#define DEFAULT_END_NAME GetName() + "_end" - @@ -255,7 +252,7 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin m_Scoreboard(this), m_MapManager(this), m_GeneratorCallbacks(*this), - m_TickThread(*this) + m_TickThread(*this) { LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str()); @@ -580,8 +577,8 @@ void cWorld::Start(void) if (GetDimension() == dimOverworld) { - m_NetherWorldName = IniFile.GetValueSet("LinkedWorlds", "NetherWorldName", DEFAULT_NETHER_NAME); - m_EndWorldName = IniFile.GetValueSet("LinkedWorlds", "EndWorldName", DEFAULT_END_NAME); + m_NetherWorldName = IniFile.GetValueSet("LinkedWorlds", "NetherWorldName", GetName() + "_nether"); + m_EndWorldName = IniFile.GetValueSet("LinkedWorlds", "EndWorldName", GetName() + "_end"); } else { |