summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2020-04-13 18:38:06 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-16 22:07:48 +0200
commit9ee47e59995f858ec531b3ee467f131594e4ba1f (patch)
treef005d8af4a0362d7eab8a96a71aca0d73275f8e1 /src/WorldStorage
parentPrevent crash when breeding (diff)
downloadcuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.gz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.bz2
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.lz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.xz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.zst
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.zip
Diffstat (limited to 'src/WorldStorage')
-rwxr-xr-xsrc/WorldStorage/WSSAnvil.cpp2
-rwxr-xr-xsrc/WorldStorage/WSSAnvil.h4
-rw-r--r--src/WorldStorage/WorldStorage.cpp4
-rw-r--r--src/WorldStorage/WorldStorage.h6
4 files changed, 8 insertions, 8 deletions
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 9915e9eb7..96b8874a1 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -80,7 +80,7 @@ Since only the header is actually in the memory, this number can be high, but st
// cWSSAnvil:
cWSSAnvil::cWSSAnvil(cWorld * a_World, int a_CompressionFactor) :
- super(a_World),
+ Super(a_World),
m_CompressionFactor(a_CompressionFactor)
{
// Create a level.dat file for mapping tools, if it doesn't already exist:
diff --git a/src/WorldStorage/WSSAnvil.h b/src/WorldStorage/WSSAnvil.h
index caee4ade2..8c3fda2d7 100755
--- a/src/WorldStorage/WSSAnvil.h
+++ b/src/WorldStorage/WSSAnvil.h
@@ -44,10 +44,10 @@ enum
-class cWSSAnvil :
+class cWSSAnvil:
public cWSSchema
{
- typedef cWSSchema super;
+ using Super = cWSSchema;
public:
diff --git a/src/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp
index d1f9abf74..63e6e9625 100644
--- a/src/WorldStorage/WorldStorage.cpp
+++ b/src/WorldStorage/WorldStorage.cpp
@@ -38,7 +38,7 @@ protected:
// cWorldStorage:
cWorldStorage::cWorldStorage(void) :
- super("cWorldStorage"),
+ Super("cWorldStorage"),
m_World(nullptr),
m_SaveSchema(nullptr)
{
@@ -94,7 +94,7 @@ void cWorldStorage::WaitForFinish(void)
// Wait for the thread to finish:
m_ShouldTerminate = true;
m_Event.Set(); // Wake up the thread if waiting
- super::Stop();
+ Super::Stop();
LOGD("World storage thread finished");
}
diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h
index a7d3bb1d4..1cdf75542 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -51,14 +51,14 @@ typedef std::list<cWSSchema *> cWSSchemaList;
/** The actual world storage class */
-class cWorldStorage :
+class cWorldStorage:
public cIsThread
{
- typedef cIsThread super;
+ using Super = cIsThread;
public:
- cWorldStorage(void);
+ cWorldStorage();
virtual ~cWorldStorage() override;
/** Queues a chunk to be loaded, asynchronously.