Clang 5.0 fixes
- Added override keyword - Removed inherited member variables
This commit is contained in:
parent
758622336e
commit
e35ac1bfb9
|
@ -64,7 +64,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
virtual ~cListAllocationPool()
|
virtual ~cListAllocationPool() override
|
||||||
{
|
{
|
||||||
while (!m_FreeList.empty())
|
while (!m_FreeList.empty())
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,7 +32,7 @@ class cLuaChunkStay
|
||||||
public:
|
public:
|
||||||
cLuaChunkStay();
|
cLuaChunkStay();
|
||||||
|
|
||||||
~cLuaChunkStay() { }
|
virtual ~cLuaChunkStay() override { }
|
||||||
|
|
||||||
/** Adds chunks in the specified Lua table.
|
/** Adds chunks in the specified Lua table.
|
||||||
Can be called only once.
|
Can be called only once.
|
||||||
|
|
|
@ -34,7 +34,7 @@ public:
|
||||||
wrapping the (listen-) callbacks that are in the specified table. */
|
wrapping the (listen-) callbacks that are in the specified table. */
|
||||||
cLuaServerHandle(UInt16 a_Port, cLuaState::cTableRefPtr && a_Callbacks);
|
cLuaServerHandle(UInt16 a_Port, cLuaState::cTableRefPtr && a_Callbacks);
|
||||||
|
|
||||||
~cLuaServerHandle();
|
virtual ~cLuaServerHandle() override;
|
||||||
|
|
||||||
/** Called by cNetwork::Listen()'s binding.
|
/** Called by cNetwork::Listen()'s binding.
|
||||||
Sets the server handle around which this instance is wrapped, and a self SharedPtr for link management. */
|
Sets the server handle around which this instance is wrapped, and a self SharedPtr for link management. */
|
||||||
|
|
|
@ -35,7 +35,7 @@ public:
|
||||||
/** Creates a new instance of the link, attached to the specified plugin and wrapping the callbacks that are in the specified referenced table. */
|
/** Creates a new instance of the link, attached to the specified plugin and wrapping the callbacks that are in the specified referenced table. */
|
||||||
cLuaTCPLink(cLuaState::cTableRefPtr && a_Callbacks, cLuaServerHandleWPtr a_Server);
|
cLuaTCPLink(cLuaState::cTableRefPtr && a_Callbacks, cLuaServerHandleWPtr a_Server);
|
||||||
|
|
||||||
~cLuaTCPLink();
|
virtual ~cLuaTCPLink() override;
|
||||||
|
|
||||||
/** Sends the data contained in the string to the remote peer.
|
/** Sends the data contained in the string to the remote peer.
|
||||||
Returns true if successful, false on immediate failure (queueing the data failed or link not available). */
|
Returns true if successful, false on immediate failure (queueing the data failed or link not available). */
|
||||||
|
|
|
@ -31,7 +31,7 @@ public:
|
||||||
/** Creates a new instance of the endpoint, wrapping the callbacks that are in the specified table. */
|
/** Creates a new instance of the endpoint, wrapping the callbacks that are in the specified table. */
|
||||||
cLuaUDPEndpoint(cLuaState::cTableRefPtr && a_Callbacks);
|
cLuaUDPEndpoint(cLuaState::cTableRefPtr && a_Callbacks);
|
||||||
|
|
||||||
~cLuaUDPEndpoint();
|
virtual ~cLuaUDPEndpoint() override;
|
||||||
|
|
||||||
/** Opens the endpoint so that it starts listening for incoming data on the specified port.
|
/** Opens the endpoint so that it starts listening for incoming data on the specified port.
|
||||||
a_Self is the shared pointer to self that the object keeps to keep itself alive for as long as it needs (for Lua). */
|
a_Self is the shared pointer to self that the object keeps to keep itself alive for as long as it needs (for Lua). */
|
||||||
|
|
|
@ -42,7 +42,7 @@ public:
|
||||||
cLuaWindow(cLuaState & a_LuaState, cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title);
|
cLuaWindow(cLuaState & a_LuaState, cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title);
|
||||||
|
|
||||||
// tolua_begin
|
// tolua_begin
|
||||||
virtual ~cLuaWindow();
|
virtual ~cLuaWindow() override;
|
||||||
|
|
||||||
/** Returns the internal representation of the contents that are manipulated by Lua */
|
/** Returns the internal representation of the contents that are manipulated by Lua */
|
||||||
cItemGrid & GetContents(void) { return m_Contents; }
|
cItemGrid & GetContents(void) { return m_Contents; }
|
||||||
|
|
|
@ -63,7 +63,7 @@ public:
|
||||||
|
|
||||||
|
|
||||||
cPluginLua(const AString & a_PluginDirectory, cDeadlockDetect & a_DeadlockDetect);
|
cPluginLua(const AString & a_PluginDirectory, cDeadlockDetect & a_DeadlockDetect);
|
||||||
~cPluginLua();
|
virtual ~cPluginLua() override;
|
||||||
|
|
||||||
virtual void OnDisable(void) override;
|
virtual void OnDisable(void) override;
|
||||||
virtual bool Load(void) override;
|
virtual bool Load(void) override;
|
||||||
|
|
|
@ -40,7 +40,7 @@ public:
|
||||||
/** Constructor used for normal operation */
|
/** Constructor used for normal operation */
|
||||||
cBrewingstandEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
|
cBrewingstandEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
|
||||||
|
|
||||||
virtual ~cBrewingstandEntity();
|
virtual ~cBrewingstandEntity() override;
|
||||||
|
|
||||||
// cBlockEntity overrides:
|
// cBlockEntity overrides:
|
||||||
virtual void SendTo(cClientHandle & a_Client) override;
|
virtual void SendTo(cClientHandle & a_Client) override;
|
||||||
|
|
|
@ -33,7 +33,7 @@ public:
|
||||||
/** Constructor used for normal operation */
|
/** Constructor used for normal operation */
|
||||||
cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World, BLOCKTYPE a_Type);
|
cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World, BLOCKTYPE a_Type);
|
||||||
|
|
||||||
virtual ~cChestEntity();
|
virtual ~cChestEntity() override;
|
||||||
|
|
||||||
// cBlockEntity overrides:
|
// cBlockEntity overrides:
|
||||||
virtual void SendTo(cClientHandle & a_Client) override;
|
virtual void SendTo(cClientHandle & a_Client) override;
|
||||||
|
|
|
@ -40,7 +40,7 @@ public:
|
||||||
BLOCKENTITY_PROTODEF(cDropSpenserEntity)
|
BLOCKENTITY_PROTODEF(cDropSpenserEntity)
|
||||||
|
|
||||||
cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
|
cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
|
||||||
virtual ~cDropSpenserEntity();
|
virtual ~cDropSpenserEntity() override;
|
||||||
|
|
||||||
// cBlockEntity overrides:
|
// cBlockEntity overrides:
|
||||||
virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
|
virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
|
||||||
|
|
|
@ -21,7 +21,7 @@ public:
|
||||||
BLOCKENTITY_PROTODEF(cEnderChestEntity)
|
BLOCKENTITY_PROTODEF(cEnderChestEntity)
|
||||||
|
|
||||||
cEnderChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
|
cEnderChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
|
||||||
virtual ~cEnderChestEntity();
|
virtual ~cEnderChestEntity() override;
|
||||||
|
|
||||||
// cBlockEntity overrides:
|
// cBlockEntity overrides:
|
||||||
virtual bool UsedBy(cPlayer * a_Player) override;
|
virtual bool UsedBy(cPlayer * a_Player) override;
|
||||||
|
|
|
@ -38,7 +38,7 @@ public:
|
||||||
/** Constructor used for normal operation */
|
/** Constructor used for normal operation */
|
||||||
cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
|
cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
|
||||||
|
|
||||||
virtual ~cFurnaceEntity();
|
virtual ~cFurnaceEntity() override;
|
||||||
|
|
||||||
// cBlockEntity overrides:
|
// cBlockEntity overrides:
|
||||||
virtual void SendTo(cClientHandle & a_Client) override;
|
virtual void SendTo(cClientHandle & a_Client) override;
|
||||||
|
|
|
@ -20,7 +20,7 @@ public:
|
||||||
BLOCKENTITY_PROTODEF(cJukeboxEntity)
|
BLOCKENTITY_PROTODEF(cJukeboxEntity)
|
||||||
|
|
||||||
cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
|
cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
|
||||||
virtual ~cJukeboxEntity();
|
virtual ~cJukeboxEntity() override;
|
||||||
|
|
||||||
// tolua_begin
|
// tolua_begin
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ public:
|
||||||
|
|
||||||
/** Creates a new note entity. a_World may be nullptr */
|
/** Creates a new note entity. a_World may be nullptr */
|
||||||
cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
|
cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
|
||||||
virtual ~cNoteEntity() {}
|
virtual ~cNoteEntity() override {}
|
||||||
|
|
||||||
// tolua_begin
|
// tolua_begin
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ public:
|
||||||
Base(a_BlockType)
|
Base(a_BlockType)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
virtual ~cClearMetaOnDrop() {}
|
virtual ~cClearMetaOnDrop() override {}
|
||||||
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
||||||
{
|
{
|
||||||
a_Pickups.push_back(cItem(this->m_BlockType));
|
a_Pickups.push_back(cItem(this->m_BlockType));
|
||||||
|
|
|
@ -29,7 +29,7 @@ public:
|
||||||
Base(a_BlockType)
|
Base(a_BlockType)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
virtual ~cMetaRotator() {}
|
virtual ~cMetaRotator() override {}
|
||||||
|
|
||||||
virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override;
|
virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override;
|
||||||
virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override;
|
virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override;
|
||||||
|
|
|
@ -57,7 +57,7 @@ class cChunkSender:
|
||||||
typedef cIsThread super;
|
typedef cIsThread super;
|
||||||
public:
|
public:
|
||||||
cChunkSender(cWorld & a_World);
|
cChunkSender(cWorld & a_World);
|
||||||
~cChunkSender();
|
virtual ~cChunkSender() override;
|
||||||
|
|
||||||
enum eChunkPriority
|
enum eChunkPriority
|
||||||
{
|
{
|
||||||
|
|
|
@ -71,7 +71,7 @@ public: // tolua_export
|
||||||
/** Creates a new client with the specified IP address in its description and the specified initial view distance. */
|
/** Creates a new client with the specified IP address in its description and the specified initial view distance. */
|
||||||
cClientHandle(const AString & a_IPString, int a_ViewDistance);
|
cClientHandle(const AString & a_IPString, int a_ViewDistance);
|
||||||
|
|
||||||
virtual ~cClientHandle();
|
virtual ~cClientHandle() override;
|
||||||
|
|
||||||
const AString & GetIPString(void) const { return m_IPString; } // tolua_export
|
const AString & GetIPString(void) const { return m_IPString; } // tolua_export
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ class cDeadlockDetect :
|
||||||
|
|
||||||
public:
|
public:
|
||||||
cDeadlockDetect(void);
|
cDeadlockDetect(void);
|
||||||
~cDeadlockDetect();
|
virtual ~cDeadlockDetect() override;
|
||||||
|
|
||||||
/** Starts the detection. Hides cIsThread's Start, because we need some initialization */
|
/** Starts the detection. Hides cIsThread's Start, because we need some initialization */
|
||||||
bool Start(int a_IntervalSec);
|
bool Start(int a_IntervalSec);
|
||||||
|
|
|
@ -22,7 +22,7 @@ public:
|
||||||
CLASS_PROTODEF(cPawn)
|
CLASS_PROTODEF(cPawn)
|
||||||
|
|
||||||
cPawn(eEntityType a_EntityType, double a_Width, double a_Height);
|
cPawn(eEntityType a_EntityType, double a_Width, double a_Height);
|
||||||
~cPawn();
|
virtual ~cPawn() override;
|
||||||
virtual void Destroyed() override;
|
virtual void Destroyed() override;
|
||||||
|
|
||||||
virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
|
virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
|
||||||
|
|
|
@ -74,8 +74,6 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
|
||||||
m_IsCrouched(false),
|
m_IsCrouched(false),
|
||||||
m_IsSprinting(false),
|
m_IsSprinting(false),
|
||||||
m_IsFlying(false),
|
m_IsFlying(false),
|
||||||
m_IsSwimming(false),
|
|
||||||
m_IsSubmerged(false),
|
|
||||||
m_IsFishing(false),
|
m_IsFishing(false),
|
||||||
m_CanFly(false),
|
m_CanFly(false),
|
||||||
m_EatingFinishTick(-1),
|
m_EatingFinishTick(-1),
|
||||||
|
@ -96,6 +94,9 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
|
||||||
{
|
{
|
||||||
ASSERT(a_PlayerName.length() <= 16); // Otherwise this player could crash many clients...
|
ASSERT(a_PlayerName.length() <= 16); // Otherwise this player could crash many clients...
|
||||||
|
|
||||||
|
m_IsSwimming = false;
|
||||||
|
m_IsSubmerged = false;
|
||||||
|
|
||||||
m_InventoryWindow = new cInventoryWindow(*this);
|
m_InventoryWindow = new cInventoryWindow(*this);
|
||||||
m_CurrentWindow = m_InventoryWindow;
|
m_CurrentWindow = m_InventoryWindow;
|
||||||
m_InventoryWindow->OpenedByPlayer(*this);
|
m_InventoryWindow->OpenedByPlayer(*this);
|
||||||
|
|
|
@ -43,7 +43,7 @@ public:
|
||||||
|
|
||||||
virtual bool Initialize(cWorld & a_World) override;
|
virtual bool Initialize(cWorld & a_World) override;
|
||||||
|
|
||||||
virtual ~cPlayer();
|
virtual ~cPlayer() override;
|
||||||
|
|
||||||
virtual void SpawnOn(cClientHandle & a_Client) override;
|
virtual void SpawnOn(cClientHandle & a_Client) override;
|
||||||
|
|
||||||
|
@ -645,8 +645,6 @@ protected:
|
||||||
bool m_IsCrouched;
|
bool m_IsCrouched;
|
||||||
bool m_IsSprinting;
|
bool m_IsSprinting;
|
||||||
bool m_IsFlying;
|
bool m_IsFlying;
|
||||||
bool m_IsSwimming;
|
|
||||||
bool m_IsSubmerged;
|
|
||||||
bool m_IsFishing;
|
bool m_IsFishing;
|
||||||
|
|
||||||
bool m_CanFly; // If this is true the player can fly. Even if he is not in creative.
|
bool m_CanFly; // If this is true the player can fly. Even if he is not in creative.
|
||||||
|
|
|
@ -49,7 +49,7 @@ class cBioGenCache :
|
||||||
|
|
||||||
public:
|
public:
|
||||||
cBioGenCache(cBiomeGenPtr a_BioGenToCache, size_t a_CacheSize);
|
cBioGenCache(cBiomeGenPtr a_BioGenToCache, size_t a_CacheSize);
|
||||||
virtual ~cBioGenCache();
|
virtual ~cBioGenCache() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
|
|
@ -127,7 +127,7 @@ public:
|
||||||
int m_BlockZ;
|
int m_BlockZ;
|
||||||
|
|
||||||
cCaveSystem(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise);
|
cCaveSystem(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise);
|
||||||
~cCaveSystem();
|
virtual ~cCaveSystem() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int m_Size;
|
int m_Size;
|
||||||
|
|
|
@ -69,7 +69,6 @@ class cStructGenWormNestCaves :
|
||||||
public:
|
public:
|
||||||
cStructGenWormNestCaves(int a_Seed, int a_Size = 64, int a_Grid = 96, int a_MaxOffset = 128) :
|
cStructGenWormNestCaves(int a_Seed, int a_Size = 64, int a_Grid = 96, int a_MaxOffset = 128) :
|
||||||
super(a_Seed, a_Grid, a_Grid, a_MaxOffset, a_MaxOffset, a_Size, a_Size, 100),
|
super(a_Seed, a_Grid, a_Grid, a_MaxOffset, a_MaxOffset, a_Size, a_Size, 100),
|
||||||
m_Noise(a_Seed),
|
|
||||||
m_Size(a_Size),
|
m_Size(a_Size),
|
||||||
m_MaxOffset(a_MaxOffset),
|
m_MaxOffset(a_MaxOffset),
|
||||||
m_Grid(a_Grid)
|
m_Grid(a_Grid)
|
||||||
|
@ -79,7 +78,6 @@ public:
|
||||||
protected:
|
protected:
|
||||||
class cCaveSystem; // fwd: Caves.cpp
|
class cCaveSystem; // fwd: Caves.cpp
|
||||||
|
|
||||||
cNoise m_Noise;
|
|
||||||
int m_Size; // relative size of the cave systems' caves. Average number of blocks of each initial tunnel
|
int m_Size; // relative size of the cave systems' caves. Average number of blocks of each initial tunnel
|
||||||
int m_MaxOffset; // maximum offset of the cave nest origin from the grid cell the nest belongs to
|
int m_MaxOffset; // maximum offset of the cave nest origin from the grid cell the nest belongs to
|
||||||
int m_Grid; // average spacing of the nests
|
int m_Grid; // average spacing of the nests
|
||||||
|
|
|
@ -109,7 +109,7 @@ public:
|
||||||
|
|
||||||
|
|
||||||
cChunkGenerator (void);
|
cChunkGenerator (void);
|
||||||
~cChunkGenerator();
|
virtual ~cChunkGenerator() override;
|
||||||
|
|
||||||
bool Start(cPluginInterface & a_PluginInterface, cChunkSink & a_ChunkSink, cIniFile & a_IniFile);
|
bool Start(cPluginInterface & a_PluginInterface, cChunkSink & a_ChunkSink, cIniFile & a_IniFile);
|
||||||
void Stop(void);
|
void Stop(void);
|
||||||
|
|
|
@ -116,7 +116,7 @@ class cCompoGenCache :
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cCompoGenCache(cTerrainCompositionGenPtr a_Underlying, int a_CacheSize); // Doesn't take ownership of a_Underlying
|
cCompoGenCache(cTerrainCompositionGenPtr a_Underlying, int a_CacheSize); // Doesn't take ownership of a_Underlying
|
||||||
~cCompoGenCache();
|
virtual ~cCompoGenCache() override;
|
||||||
|
|
||||||
// cTerrainCompositionGen override:
|
// cTerrainCompositionGen override:
|
||||||
virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override;
|
virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class cHeiGenCache :
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cHeiGenCache(cTerrainHeightGenPtr a_HeiGenToCache, size_t a_CacheSize);
|
cHeiGenCache(cTerrainHeightGenPtr a_HeiGenToCache, size_t a_CacheSize);
|
||||||
~cHeiGenCache();
|
virtual ~cHeiGenCache() override;
|
||||||
|
|
||||||
// cTerrainHeightGen overrides:
|
// cTerrainHeightGen overrides:
|
||||||
virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
|
virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
|
||||||
|
|
|
@ -1293,7 +1293,6 @@ cStructGenMineShafts::cStructGenMineShafts(
|
||||||
int a_ChanceCorridor, int a_ChanceCrossing, int a_ChanceStaircase
|
int a_ChanceCorridor, int a_ChanceCrossing, int a_ChanceStaircase
|
||||||
) :
|
) :
|
||||||
super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSystemSize, a_MaxSystemSize, 100),
|
super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSystemSize, a_MaxSystemSize, 100),
|
||||||
m_Noise(a_Seed),
|
|
||||||
m_GridSize(a_GridSize),
|
m_GridSize(a_GridSize),
|
||||||
m_MaxSystemSize(a_MaxSystemSize),
|
m_MaxSystemSize(a_MaxSystemSize),
|
||||||
m_ProbLevelCorridor(std::max(0, a_ChanceCorridor)),
|
m_ProbLevelCorridor(std::max(0, a_ChanceCorridor)),
|
||||||
|
|
|
@ -34,7 +34,6 @@ protected:
|
||||||
friend class cMineShaftStaircase;
|
friend class cMineShaftStaircase;
|
||||||
class cMineShaftSystem; // fwd: MineShafts.cpp
|
class cMineShaftSystem; // fwd: MineShafts.cpp
|
||||||
|
|
||||||
cNoise m_Noise;
|
|
||||||
int m_GridSize; ///< Average spacing of the systems
|
int m_GridSize; ///< Average spacing of the systems
|
||||||
int m_MaxSystemSize; ///< Maximum blcok size of a mineshaft system
|
int m_MaxSystemSize; ///< Maximum blcok size of a mineshaft system
|
||||||
int m_ProbLevelCorridor; ///< Probability level of a branch object being the corridor
|
int m_ProbLevelCorridor; ///< Probability level of a branch object being the corridor
|
||||||
|
|
|
@ -27,7 +27,7 @@ class cNoise3DGenerator :
|
||||||
|
|
||||||
public:
|
public:
|
||||||
cNoise3DGenerator(cChunkGenerator & a_ChunkGenerator);
|
cNoise3DGenerator(cChunkGenerator & a_ChunkGenerator);
|
||||||
virtual ~cNoise3DGenerator();
|
virtual ~cNoise3DGenerator() override;
|
||||||
|
|
||||||
virtual void Initialize(cIniFile & a_IniFile) override;
|
virtual void Initialize(cIniFile & a_IniFile) override;
|
||||||
virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
|
virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
|
||||||
|
|
|
@ -50,7 +50,7 @@ public:
|
||||||
cPrefabPiecePool(const AString & a_FileName, bool a_LogWarnings);
|
cPrefabPiecePool(const AString & a_FileName, bool a_LogWarnings);
|
||||||
|
|
||||||
/** Destroys the pool, freeing all pieces. */
|
/** Destroys the pool, freeing all pieces. */
|
||||||
~cPrefabPiecePool();
|
virtual ~cPrefabPiecePool() override;
|
||||||
|
|
||||||
/** Removes and frees all pieces from this pool. */
|
/** Removes and frees all pieces from this pool. */
|
||||||
void Clear(void);
|
void Clear(void);
|
||||||
|
|
|
@ -82,7 +82,6 @@ protected:
|
||||||
|
|
||||||
cStructGenRavines::cStructGenRavines(int a_Seed, int a_Size) :
|
cStructGenRavines::cStructGenRavines(int a_Seed, int a_Size) :
|
||||||
super(a_Seed, a_Size, a_Size, a_Size, a_Size, a_Size * 2, a_Size * 2, 100),
|
super(a_Seed, a_Size, a_Size, a_Size, a_Size, a_Size * 2, a_Size * 2, 100),
|
||||||
m_Noise(a_Seed),
|
|
||||||
m_Size(a_Size)
|
m_Size(a_Size)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,6 @@ public:
|
||||||
protected:
|
protected:
|
||||||
class cRavine; // fwd: Ravines.cpp
|
class cRavine; // fwd: Ravines.cpp
|
||||||
|
|
||||||
cNoise m_Noise;
|
|
||||||
int m_Size; // Max size, in blocks, of the ravines generated
|
int m_Size; // Max size, in blocks, of the ravines generated
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -231,7 +231,6 @@ cRoughRavines::cRoughRavines(
|
||||||
int a_GridSize, int a_MaxOffset
|
int a_GridSize, int a_MaxOffset
|
||||||
) :
|
) :
|
||||||
super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 64),
|
super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 64),
|
||||||
m_Seed(a_Seed),
|
|
||||||
m_MaxSize(a_MaxSize),
|
m_MaxSize(a_MaxSize),
|
||||||
m_MinSize(a_MinSize),
|
m_MinSize(a_MinSize),
|
||||||
m_MaxCenterWidth(a_MaxCenterWidth),
|
m_MaxCenterWidth(a_MaxCenterWidth),
|
||||||
|
|
|
@ -33,8 +33,6 @@ public:
|
||||||
);
|
);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int m_Seed;
|
|
||||||
|
|
||||||
/** Maximum size of the ravine, in each of the X / Z axis */
|
/** Maximum size of the ravine, in each of the X / Z axis */
|
||||||
int m_MaxSize;
|
int m_MaxSize;
|
||||||
|
|
||||||
|
|
|
@ -336,7 +336,7 @@ cVillageGen::cVillageGen(
|
||||||
const AStringVector & a_PrefabsToLoad
|
const AStringVector & a_PrefabsToLoad
|
||||||
) :
|
) :
|
||||||
super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 100),
|
super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 100),
|
||||||
m_Noise(a_Seed + 1000),
|
m_RandNoise(a_Seed + 1000),
|
||||||
m_MaxDepth(a_MaxDepth),
|
m_MaxDepth(a_MaxDepth),
|
||||||
m_MaxSize(a_MaxSize),
|
m_MaxSize(a_MaxSize),
|
||||||
m_MinDensity(a_MinDensity),
|
m_MinDensity(a_MinDensity),
|
||||||
|
@ -399,7 +399,7 @@ cGridStructGen::cStructurePtr cVillageGen::CreateStructure(int a_GridX, int a_Gr
|
||||||
{
|
{
|
||||||
return cStructurePtr();
|
return cStructurePtr();
|
||||||
}
|
}
|
||||||
auto rnd = m_Noise.IntNoise2DInt(a_OriginX, a_OriginZ) / 11;
|
auto rnd = m_RandNoise.IntNoise2DInt(a_OriginX, a_OriginZ) / 11;
|
||||||
auto pool = availablePools[static_cast<size_t>(rnd) % availablePools.size()];
|
auto pool = availablePools[static_cast<size_t>(rnd) % availablePools.size()];
|
||||||
rnd /= 137;
|
rnd /= 137;
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ protected:
|
||||||
typedef std::vector<SharedPtr<cVillagePiecePool> > cVillagePiecePools;
|
typedef std::vector<SharedPtr<cVillagePiecePool> > cVillagePiecePools;
|
||||||
|
|
||||||
/** The noise used for generating random numbers */
|
/** The noise used for generating random numbers */
|
||||||
cNoise m_Noise;
|
cNoise m_RandNoise;
|
||||||
|
|
||||||
/** Maximum depth of the generator tree */
|
/** Maximum depth of the generator tree */
|
||||||
int m_MaxDepth;
|
int m_MaxDepth;
|
||||||
|
|
|
@ -33,7 +33,7 @@ public:
|
||||||
cHTTPServerConnection(cHTTPServer & a_HTTPServer);
|
cHTTPServerConnection(cHTTPServer & a_HTTPServer);
|
||||||
|
|
||||||
// Force a virtual destructor in all descendants
|
// Force a virtual destructor in all descendants
|
||||||
virtual ~cHTTPServerConnection();
|
virtual ~cHTTPServerConnection() override;
|
||||||
|
|
||||||
/** Sends HTTP status code together with a_Reason (used for HTTP errors).
|
/** Sends HTTP status code together with a_Reason (used for HTTP errors).
|
||||||
Sends the a_Reason as the body as well, so that browsers display it.
|
Sends the a_Reason as the body as well, so that browsers display it.
|
||||||
|
|
|
@ -26,7 +26,7 @@ public:
|
||||||
Sends the specified cert as the server certificate, uses the private key for decryption. */
|
Sends the specified cert as the server certificate, uses the private key for decryption. */
|
||||||
cSslHTTPServerConnection(cHTTPServer & a_HTTPServer, const cX509CertPtr & a_Cert, const cCryptoKeyPtr & a_PrivateKey);
|
cSslHTTPServerConnection(cHTTPServer & a_HTTPServer, const cX509CertPtr & a_Cert, const cCryptoKeyPtr & a_PrivateKey);
|
||||||
|
|
||||||
~cSslHTTPServerConnection();
|
virtual ~cSslHTTPServerConnection() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
cBufferedSslContext m_Ssl;
|
cBufferedSslContext m_Ssl;
|
||||||
|
|
|
@ -71,7 +71,7 @@ public:
|
||||||
cIniFile(void);
|
cIniFile(void);
|
||||||
|
|
||||||
// tolua_end
|
// tolua_end
|
||||||
virtual ~cIniFile() = default;
|
virtual ~cIniFile() override = default;
|
||||||
|
|
||||||
virtual std::vector<std::pair<AString, AString>> GetValues(AString a_keyName) override;
|
virtual std::vector<std::pair<AString, AString>> GetValues(AString a_keyName) override;
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ public:
|
||||||
|
|
||||||
cInventory(cPlayer & a_Owner);
|
cInventory(cPlayer & a_Owner);
|
||||||
|
|
||||||
virtual ~cInventory() {}
|
virtual ~cInventory() override {}
|
||||||
|
|
||||||
// tolua_begin
|
// tolua_begin
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ class cLightingThread :
|
||||||
public:
|
public:
|
||||||
|
|
||||||
cLightingThread(void);
|
cLightingThread(void);
|
||||||
~cLightingThread();
|
virtual ~cLightingThread() override;
|
||||||
|
|
||||||
bool Start(cWorld * a_World);
|
bool Start(cWorld * a_World);
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ cHorse::cHorse(int Type, int Color, int Style, int TameTimes) :
|
||||||
m_TimesToTame(TameTimes),
|
m_TimesToTame(TameTimes),
|
||||||
m_TameAttemptTimes(0),
|
m_TameAttemptTimes(0),
|
||||||
m_RearTickCount(0),
|
m_RearTickCount(0),
|
||||||
m_Speed(20.0)
|
m_MaxSpeed(20.0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,6 +183,6 @@ void cHorse::HandleSpeedFromAttachee(float a_Forward, float a_Sideways)
|
||||||
{
|
{
|
||||||
if ((m_bIsTame) && (m_bIsSaddled))
|
if ((m_bIsTame) && (m_bIsSaddled))
|
||||||
{
|
{
|
||||||
super::HandleSpeedFromAttachee(a_Forward * m_Speed, a_Sideways * m_Speed);
|
super::HandleSpeedFromAttachee(a_Forward * m_MaxSpeed, a_Sideways * m_MaxSpeed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ private:
|
||||||
|
|
||||||
bool m_bHasChest, m_bIsEating, m_bIsRearing, m_bIsMouthOpen, m_bIsTame, m_bIsSaddled;
|
bool m_bHasChest, m_bIsEating, m_bIsRearing, m_bIsMouthOpen, m_bIsTame, m_bIsSaddled;
|
||||||
int m_Type, m_Color, m_Style, m_Armour, m_TimesToTame, m_TameAttemptTimes, m_RearTickCount;
|
int m_Type, m_Color, m_Style, m_Armour, m_TimesToTame, m_TameAttemptTimes, m_RearTickCount;
|
||||||
float m_Speed;
|
float m_MaxSpeed;
|
||||||
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ public:
|
||||||
*/
|
*/
|
||||||
cMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
|
cMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
|
||||||
|
|
||||||
~cMonster();
|
virtual ~cMonster() override;
|
||||||
|
|
||||||
virtual void Destroyed() override;
|
virtual void Destroyed() override;
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ class cServerHandleImpl:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** Closes the server, dropping all the connections. */
|
/** Closes the server, dropping all the connections. */
|
||||||
~cServerHandleImpl();
|
virtual ~cServerHandleImpl() override;
|
||||||
|
|
||||||
/** Creates a new server instance listening on the specified port.
|
/** Creates a new server instance listening on the specified port.
|
||||||
Both IPv4 and IPv6 interfaces are used, if possible.
|
Both IPv4 and IPv6 interfaces are used, if possible.
|
||||||
|
|
|
@ -44,7 +44,7 @@ public:
|
||||||
cTCPLinkImpl(evutil_socket_t a_Socket, cCallbacksPtr a_LinkCallbacks, cServerHandleImplPtr a_Server, const sockaddr * a_Address, socklen_t a_AddrLen);
|
cTCPLinkImpl(evutil_socket_t a_Socket, cCallbacksPtr a_LinkCallbacks, cServerHandleImplPtr a_Server, const sockaddr * a_Address, socklen_t a_AddrLen);
|
||||||
|
|
||||||
/** Destroys the LibEvent handle representing the link. */
|
/** Destroys the LibEvent handle representing the link. */
|
||||||
~cTCPLinkImpl();
|
virtual ~cTCPLinkImpl() override;
|
||||||
|
|
||||||
/** Queues a connection request to the specified host.
|
/** Queues a connection request to the specified host.
|
||||||
a_ConnectCallbacks must be valid.
|
a_ConnectCallbacks must be valid.
|
||||||
|
|
|
@ -35,7 +35,7 @@ public:
|
||||||
If a_Port is 0, the OS is free to assign any port number it likes to the endpoint. */
|
If a_Port is 0, the OS is free to assign any port number it likes to the endpoint. */
|
||||||
cUDPEndpointImpl(UInt16 a_Port, cUDPEndpoint::cCallbacks & a_Callbacks);
|
cUDPEndpointImpl(UInt16 a_Port, cUDPEndpoint::cCallbacks & a_Callbacks);
|
||||||
|
|
||||||
~cUDPEndpointImpl();
|
virtual ~cUDPEndpointImpl() override;
|
||||||
|
|
||||||
// cUDPEndpoint overrides:
|
// cUDPEndpoint overrides:
|
||||||
virtual void Close(void) override;
|
virtual void Close(void) override;
|
||||||
|
|
|
@ -11,7 +11,7 @@ class cOverridesSettingsRepository : public cSettingsRepositoryInterface
|
||||||
public:
|
public:
|
||||||
cOverridesSettingsRepository(std::unique_ptr<cSettingsRepositoryInterface> a_Main, std::unique_ptr<cSettingsRepositoryInterface> a_Overrides);
|
cOverridesSettingsRepository(std::unique_ptr<cSettingsRepositoryInterface> a_Main, std::unique_ptr<cSettingsRepositoryInterface> a_Overrides);
|
||||||
|
|
||||||
virtual ~cOverridesSettingsRepository() = default;
|
virtual ~cOverridesSettingsRepository() override = default;
|
||||||
|
|
||||||
virtual bool KeyExists(const AString keyname) const override;
|
virtual bool KeyExists(const AString keyname) const override;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ class cBlockingSslClientSocket :
|
||||||
public:
|
public:
|
||||||
cBlockingSslClientSocket(void);
|
cBlockingSslClientSocket(void);
|
||||||
|
|
||||||
~cBlockingSslClientSocket(void)
|
virtual ~cBlockingSslClientSocket(void) override
|
||||||
{
|
{
|
||||||
Disconnect();
|
Disconnect();
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,7 @@ class cAuthenticator :
|
||||||
|
|
||||||
public:
|
public:
|
||||||
cAuthenticator(void);
|
cAuthenticator(void);
|
||||||
~cAuthenticator();
|
virtual ~cAuthenticator() override;
|
||||||
|
|
||||||
/** (Re-)read server and address from INI: */
|
/** (Re-)read server and address from INI: */
|
||||||
void ReadSettings(cSettingsRepositoryInterface & a_Settings);
|
void ReadSettings(cSettingsRepositoryInterface & a_Settings);
|
||||||
|
|
|
@ -215,7 +215,7 @@ public:
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
~cUpdateThread()
|
virtual ~cUpdateThread() override
|
||||||
{
|
{
|
||||||
// Notify the thread that it should stop:
|
// Notify the thread that it should stop:
|
||||||
m_ShouldTerminate = true;
|
m_ShouldTerminate = true;
|
||||||
|
|
|
@ -45,7 +45,7 @@ public:
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
cProtocolRecognizer(cClientHandle * a_Client);
|
cProtocolRecognizer(cClientHandle * a_Client);
|
||||||
virtual ~cProtocolRecognizer();
|
virtual ~cProtocolRecognizer() override;
|
||||||
|
|
||||||
/** Translates protocol version number into protocol version text: 49 -> "1.4.4" */
|
/** Translates protocol version number into protocol version text: 49 -> "1.4.4" */
|
||||||
static AString GetVersionTextFromInt(int a_ProtocolVersion);
|
static AString GetVersionTextFromInt(int a_ProtocolVersion);
|
||||||
|
|
|
@ -20,7 +20,7 @@ class cFireSimulator :
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cFireSimulator(cWorld & a_World, cIniFile & a_IniFile);
|
cFireSimulator(cWorld & a_World, cIniFile & a_IniFile);
|
||||||
~cFireSimulator();
|
virtual ~cFireSimulator() override;
|
||||||
|
|
||||||
virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used
|
virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used
|
||||||
virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
|
virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
|
||||||
|
|
|
@ -42,7 +42,7 @@ public:
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~cGetTrappedChestPlayers()
|
virtual ~cGetTrappedChestPlayers() override
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ public:
|
||||||
|
|
||||||
cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest);
|
cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest);
|
||||||
|
|
||||||
~cChestWindow();
|
virtual ~cChestWindow() override;
|
||||||
|
|
||||||
virtual bool ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) override;
|
virtual bool ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) override;
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ class cEnderChestWindow :
|
||||||
public:
|
public:
|
||||||
cEnderChestWindow(cEnderChestEntity * a_EnderChest);
|
cEnderChestWindow(cEnderChestEntity * a_EnderChest);
|
||||||
|
|
||||||
~cEnderChestWindow();
|
virtual ~cEnderChestWindow() override;
|
||||||
|
|
||||||
virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override;
|
virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override;
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
~cMinecartWithChestWindow()
|
virtual ~cMinecartWithChestWindow() override
|
||||||
{
|
{
|
||||||
m_ChestCart->GetWorld()->BroadcastSoundEffect("block.chest.close", m_ChestCart->GetPosX(), m_ChestCart->GetPosY(), m_ChestCart->GetPosZ(), 1, 1);
|
m_ChestCart->GetWorld()->BroadcastSoundEffect("block.chest.close", m_ChestCart->GetPosX(), m_ChestCart->GetPosY(), m_ChestCart->GetPosZ(), 1, 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -178,7 +178,7 @@ class cSlotAreaItemGrid :
|
||||||
public:
|
public:
|
||||||
cSlotAreaItemGrid(cItemGrid & a_ItemGrid, cWindow & a_ParentWindow);
|
cSlotAreaItemGrid(cItemGrid & a_ItemGrid, cWindow & a_ParentWindow);
|
||||||
|
|
||||||
virtual ~cSlotAreaItemGrid();
|
virtual ~cSlotAreaItemGrid() override;
|
||||||
|
|
||||||
virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
|
virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
|
||||||
virtual void SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
|
virtual void SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
|
||||||
|
@ -324,7 +324,7 @@ class cSlotAreaBeacon :
|
||||||
|
|
||||||
public:
|
public:
|
||||||
cSlotAreaBeacon(cBeaconEntity * a_Beacon, cWindow & a_ParentWindow);
|
cSlotAreaBeacon(cBeaconEntity * a_Beacon, cWindow & a_ParentWindow);
|
||||||
virtual ~cSlotAreaBeacon();
|
virtual ~cSlotAreaBeacon() override;
|
||||||
|
|
||||||
static bool IsPlaceableItem(short a_ItemType);
|
static bool IsPlaceableItem(short a_ItemType);
|
||||||
|
|
||||||
|
@ -436,7 +436,7 @@ class cSlotAreaFurnace :
|
||||||
public:
|
public:
|
||||||
cSlotAreaFurnace(cFurnaceEntity * a_Furnace, cWindow & a_ParentWindow);
|
cSlotAreaFurnace(cFurnaceEntity * a_Furnace, cWindow & a_ParentWindow);
|
||||||
|
|
||||||
virtual ~cSlotAreaFurnace();
|
virtual ~cSlotAreaFurnace() override;
|
||||||
|
|
||||||
virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
|
virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
|
||||||
virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots, bool a_BackFill) override;
|
virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots, bool a_BackFill) override;
|
||||||
|
@ -466,7 +466,7 @@ class cSlotAreaBrewingstand :
|
||||||
public:
|
public:
|
||||||
cSlotAreaBrewingstand(cBrewingstandEntity * a_Brewingstand, cWindow & a_ParentWindow);
|
cSlotAreaBrewingstand(cBrewingstandEntity * a_Brewingstand, cWindow & a_ParentWindow);
|
||||||
|
|
||||||
virtual ~cSlotAreaBrewingstand();
|
virtual ~cSlotAreaBrewingstand() override;
|
||||||
|
|
||||||
virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
|
virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
|
||||||
virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots, bool a_BackFill) override;
|
virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots, bool a_BackFill) override;
|
||||||
|
|
|
@ -157,7 +157,7 @@ public:
|
||||||
|
|
||||||
|
|
||||||
cWebAdmin(void);
|
cWebAdmin(void);
|
||||||
virtual ~cWebAdmin();
|
virtual ~cWebAdmin() override;
|
||||||
|
|
||||||
/** Initializes the object. Returns true if successfully initialized and ready to start */
|
/** Initializes the object. Returns true if successfully initialized and ready to start */
|
||||||
bool Init(void);
|
bool Init(void);
|
||||||
|
|
|
@ -1034,7 +1034,7 @@ private:
|
||||||
|
|
||||||
|
|
||||||
cWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_LinkedOverworldName = "");
|
cWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_LinkedOverworldName = "");
|
||||||
virtual ~cWorld();
|
virtual ~cWorld() override;
|
||||||
|
|
||||||
void Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_LastTickDurationMSec);
|
void Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_LastTickDurationMSec);
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ class cWSSAnvil :
|
||||||
public:
|
public:
|
||||||
|
|
||||||
cWSSAnvil(cWorld * a_World, int a_CompressionFactor);
|
cWSSAnvil(cWorld * a_World, int a_CompressionFactor);
|
||||||
virtual ~cWSSAnvil();
|
virtual ~cWSSAnvil() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ class cWorldStorage :
|
||||||
public:
|
public:
|
||||||
|
|
||||||
cWorldStorage(void);
|
cWorldStorage(void);
|
||||||
~cWorldStorage();
|
virtual ~cWorldStorage() override;
|
||||||
|
|
||||||
/** Queues a chunk to be loaded, asynchronously.
|
/** Queues a chunk to be loaded, asynchronously.
|
||||||
The callback, if specified, will be called with the result of the load operation. */
|
The callback, if specified, will be called with the result of the load operation. */
|
||||||
|
|
Loading…
Reference in New Issue