summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-03-21 15:20:31 +0100
committerMattes D <github@xoft.cz>2015-03-21 15:20:31 +0100
commite9b8be25f96e9e62d7d8e33c701769830c5a1e45 (patch)
tree13efe4ca661c13272dbc3d24a52911d40267974b /src/World.h
parentFixed trailing whitespace. (diff)
downloadcuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar
cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.gz
cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.bz2
cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.lz
cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.xz
cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.zst
cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.zip
Diffstat (limited to '')
-rw-r--r--src/World.h31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/World.h b/src/World.h
index f7d5cdc60..ffc10a9e4 100644
--- a/src/World.h
+++ b/src/World.h
@@ -674,14 +674,14 @@ public:
bool ShouldBroadcastAchievementMessages(void) const { return m_BroadcastAchievementMessages; }
- AString GetNetherWorldName(void) const { return m_NetherWorldName; }
- void SetNetherWorldName(const AString & a_Name) { m_NetherWorldName = a_Name; }
+ AString GetLinkedNetherWorldName(void) const { return m_LinkedNetherWorldName; }
+ void SetLinkedNetherWorldName(const AString & a_Name) { m_LinkedNetherWorldName = a_Name; }
- AString GetEndWorldName(void) const { return m_EndWorldName; }
- void SetEndWorldName(const AString & a_Name) { m_EndWorldName = a_Name; }
+ AString GetLinkedEndWorldName(void) const { return m_LinkedEndWorldName; }
+ void SetLinkedEndWorldName(const AString & a_Name) { m_LinkedEndWorldName = a_Name; }
- AString GetLinkedOverworldName(void) const { return m_OverworldName; }
- void SetLinkedOverworldName(const AString & a_Name) { m_OverworldName = a_Name; }
+ AString GetLinkedOverworldName(void) const { return m_LinkedOverworldName; }
+ void SetLinkedOverworldName(const AString & a_Name) { m_LinkedOverworldName = a_Name; }
// tolua_end
@@ -885,10 +885,9 @@ private:
AString m_WorldName;
- /** The name of the world that a portal in this world should link to
- Only has effect if this world is a nether or end world, as it is used by entities to see which world to teleport to when in a portal
- */
- AString m_OverworldName;
+ /** The name of the overworld that portals in this world should link to.
+ Only has effect if this world is a Nether or End world. */
+ AString m_LinkedOverworldName;
AString m_IniFileName;
@@ -981,11 +980,13 @@ private:
/** The maximum view distance that a player can have in this world. */
int m_MaxViewDistance;
- /** Name of the nether world */
- AString m_NetherWorldName;
+ /** Name of the nether world - where Nether portals should teleport.
+ Only used when this world is an Overworld. */
+ AString m_LinkedNetherWorldName;
- /** Name of the end world */
- AString m_EndWorldName;
+ /** Name of the End world - where End portals should teleport.
+ Only used when this world is an Overworld. */
+ AString m_LinkedEndWorldName;
cChunkGenerator m_Generator;
@@ -1045,7 +1046,7 @@ private:
cSetChunkDataPtrs m_SetChunkDataQueue;
- cWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_OverworldName = "");
+ cWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_LinkedOverworldName = "");
virtual ~cWorld();
void Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_LastTickDurationMSec);