summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-09-22 17:55:42 +0200
committerMattes D <github@xoft.cz>2017-10-21 19:33:22 +0200
commit1537ebed6fa880ca8f9df92e5ac99324375b91a5 (patch)
tree0f141da47761e94a64331584b3924b9436777f51 /src/World.h
parentFix tool builds on AppleClang (diff)
downloadcuberite-1537ebed6fa880ca8f9df92e5ac99324375b91a5.tar
cuberite-1537ebed6fa880ca8f9df92e5ac99324375b91a5.tar.gz
cuberite-1537ebed6fa880ca8f9df92e5ac99324375b91a5.tar.bz2
cuberite-1537ebed6fa880ca8f9df92e5ac99324375b91a5.tar.lz
cuberite-1537ebed6fa880ca8f9df92e5ac99324375b91a5.tar.xz
cuberite-1537ebed6fa880ca8f9df92e5ac99324375b91a5.tar.zst
cuberite-1537ebed6fa880ca8f9df92e5ac99324375b91a5.zip
Diffstat (limited to '')
-rw-r--r--src/World.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/World.h b/src/World.h
index 5f18f7a39..5b26ec197 100644
--- a/src/World.h
+++ b/src/World.h
@@ -731,9 +731,8 @@ public:
void InitializeSpawn(void);
- /** Starts threads that belong to this world.
- a_DeadlockDetect is used for tracking this world's age, detecting a possible deadlock. */
- void Start(cDeadlockDetect & a_DeadlockDetect);
+ /** Starts threads that belong to this world. */
+ void Start();
/** Stops threads that belong to this world (part of deinit).
a_DeadlockDetect is used for tracking this world's age, detecting a possible deadlock. */
@@ -1066,8 +1065,15 @@ private:
/** Queue for the chunk data to be set into m_ChunkMap by the tick thread. Protected by m_CSSetChunkDataQueue */
cSetChunkDataPtrs m_SetChunkDataQueue;
-
- cWorld(const AString & a_WorldName, const AString & a_DataPath, eDimension a_Dimension = dimOverworld, const AString & a_LinkedOverworldName = "");
+ /** Construct the world and read settings from its ini file.
+ @param a_DeadlockDetect is used for tracking this world's age, detecting a possible deadlock.
+ @param a_WorldNames is a list of all world names, used to validate linked worlds
+ */
+ cWorld(
+ const AString & a_WorldName, const AString & a_DataPath,
+ cDeadlockDetect & a_DeadlockDetect, const AStringVector & a_WorldNames,
+ eDimension a_Dimension = dimOverworld, const AString & a_LinkedOverworldName = {}
+ );
virtual ~cWorld() override;
void Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_LastTickDurationMSec);