summaryrefslogtreecommitdiffstats
path: root/source/cRoot.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-08 13:36:54 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-08 13:36:54 +0100
commit32880153ab76830311d8a1db3a157cd5ac6e5d9c (patch)
treec7c77a8c5b6bf86f3f18655e8ec976c30a5c8c15 /source/cRoot.cpp
parentcSocketThreads plugged in for cClientHandle reading. Sending still kept the old way. Please help me test this commit thoroughly, this is a change that can break on subtleties. (diff)
downloadcuberite-32880153ab76830311d8a1db3a157cd5ac6e5d9c.tar
cuberite-32880153ab76830311d8a1db3a157cd5ac6e5d9c.tar.gz
cuberite-32880153ab76830311d8a1db3a157cd5ac6e5d9c.tar.bz2
cuberite-32880153ab76830311d8a1db3a157cd5ac6e5d9c.tar.lz
cuberite-32880153ab76830311d8a1db3a157cd5ac6e5d9c.tar.xz
cuberite-32880153ab76830311d8a1db3a157cd5ac6e5d9c.tar.zst
cuberite-32880153ab76830311d8a1db3a157cd5ac6e5d9c.zip
Diffstat (limited to '')
-rw-r--r--source/cRoot.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/cRoot.cpp b/source/cRoot.cpp
index 0ccee5f20..273bbe318 100644
--- a/source/cRoot.cpp
+++ b/source/cRoot.cpp
@@ -162,7 +162,7 @@ void cRoot::LoadWorlds()
cIniFile IniFile("settings.ini"); IniFile.ReadFile();
// First get the default world
- std::string DefaultWorldName = IniFile.GetValue("Worlds", "DefaultWorld", "world");
+ AString DefaultWorldName = IniFile.GetValue("Worlds", "DefaultWorld", "world");
m_pState->pDefaultWorld = new cWorld( DefaultWorldName.c_str() );
m_pState->pDefaultWorld->InitializeSpawn();
m_pState->WorldsByName[ DefaultWorldName ] = m_pState->pDefaultWorld;