flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Using Super.

Browse Source
This commit is contained in:
Mattes D 2020-04-13 18:38:06 +02:00 committed by Alexander Harkness
parent f931590bf0
commit 9ee47e5999
399 changed files with 1815 additions and 1381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/LuaChunkStay.cpp
View File

@ -101,7 +101,7 @@ void cLuaChunkStay::Enable(cChunkMap & a_ChunkMap, cLuaState::cCallbackPtr a_OnC
m_OnAllChunksAvailable = std::move(a_OnAllChunksAvailable);
// Enable the ChunkStay:
super::Enable(a_ChunkMap);
Super::Enable(a_ChunkMap);
}

6
src/Bindings/LuaChunkStay.h
View File

@ -23,10 +23,10 @@ class cChunkMap;
class cLuaChunkStay
: public cChunkStay
class cLuaChunkStay:
public cChunkStay
{
typedef cChunkStay super;
using Super = cChunkStay;
public:
cLuaChunkStay();

3
src/Bindings/LuaJson.cpp
View File

@ -28,7 +28,8 @@ Keeps track of the error message and the problematic value's path in the table.
class CannotSerializeException:
public std::runtime_error
{
typedef std::runtime_error Super;
using Super = std::runtime_error;
public:
/** Constructs a new instance of the exception based on the provided values directly. */
explicit CannotSerializeException(const AString & a_ValueName, const char * a_ErrorMsg):

7
src/Bindings/LuaState.h
View File

@ -285,7 +285,7 @@ public:
class cCallback:
public cTrackedRef
{
typedef cTrackedRef Super;
using Super = cTrackedRef;
public:
@ -334,7 +334,7 @@ public:
class cOptionalCallback:
public cCallback
{
typedef cCallback Super;
using Super = cCallback;
public:
@ -369,7 +369,8 @@ public:
class cTableRef:
public cTrackedRef
{
typedef cTrackedRef Super;
using Super = cTrackedRef;
public:
cTableRef(void) {}

2
src/Bindings/LuaWindow.h
View File

@ -34,7 +34,7 @@ class cLuaWindow :
// tolua_end
, public cItemGrid::cListener
{ // tolua_export
typedef cWindow Super;
using Super = cWindow;
public:
/** Create a window of the specified type, with a slot grid of a_SlotsX * a_SlotsY size.

1
src/Bindings/ManualBindings.h
View File

@ -16,6 +16,7 @@
// fwd:
struct tolua_Error;
class cPluginLua;

2
src/Bindings/PluginLua.cpp
View File

@ -187,7 +187,7 @@ bool cPluginLua::Load(void)
void cPluginLua::Unload(void)
{
ClearWebTabs();
super::Unload();
Super::Unload();
Close();
}

14
src/Bindings/PluginLua.h
View File

@ -19,15 +19,15 @@
// tolua_begin
class cPluginLua :
class cPluginLua:
public cPlugin
{
typedef cPlugin super;
// tolua_end
using Super = cPlugin;
public:
// tolua_end
/** A RAII-style mutex lock for accessing the internal LuaState.
This will be the only way to retrieve the plugin's LuaState;
@ -206,8 +206,4 @@ protected:
}
return false;
}
} ; // tolua_export
}; // tolua_export

4
src/BlockEntities/BeaconEntity.cpp
View File

@ -13,7 +13,7 @@
cBeaconEntity::cBeaconEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, 1, 1, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, 1, 1, a_World),
m_IsActive(false),
m_BeaconLevel(0),
m_PrimaryEffect(cEntityEffect::effNoEffect),
@ -264,7 +264,7 @@ void cBeaconEntity::GiveEffects(void)
void cBeaconEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cBeaconEntity &>(a_Src);
m_BeaconLevel = src.m_BeaconLevel;
m_Contents.CopyFrom(src.m_Contents);

4
src/BlockEntities/BeaconEntity.h
View File

@ -16,12 +16,12 @@
// tolua_begin
class cBeaconEntity :
class cBeaconEntity:
public cBlockEntityWithItems
{
// tolua_end
using super = cBlockEntityWithItems;
using Super = cBlockEntityWithItems;
public: // tolua_export

4
src/BlockEntities/BedEntity.cpp
View File

@ -14,7 +14,7 @@
cBedEntity::cBedEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World, short a_Color):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
m_Color(a_Color)
{
ASSERT(a_BlockType == E_BLOCK_BED);
@ -26,7 +26,7 @@ cBedEntity::cBedEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a
void cBedEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cBedEntity &>(a_Src);
m_Color = src.m_Color;
}

4
src/BlockEntities/BedEntity.h
View File

@ -12,11 +12,11 @@
// tolua_begin
class cBedEntity :
class cBedEntity:
public cBlockEntity
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

4
src/BlockEntities/BlockEntity.h
View File

@ -10,7 +10,7 @@
#define BLOCKENTITY_PROTODEF(classname) \
virtual bool IsA(const char * a_ClassName) const override \
{ \
return ((a_ClassName != nullptr) && ((strcmp(a_ClassName, #classname) == 0) || super::IsA(a_ClassName))); \
return ((a_ClassName != nullptr) && ((strcmp(a_ClassName, #classname) == 0) || Super::IsA(a_ClassName))); \
} \
virtual const char * GetClass() const override \
{ \
@ -22,7 +22,7 @@
} \
virtual const char * GetParentClass() const override \
{ \
return super::GetClass(); \
return Super::GetClass(); \
}

4
src/BlockEntities/BlockEntityWithItems.cpp
View File

@ -15,7 +15,7 @@ cBlockEntityWithItems::cBlockEntityWithItems(
int a_ItemGridWidth, int a_ItemGridHeight,
cWorld * a_World
):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
cBlockEntityWindowOwner(this),
m_Contents(a_ItemGridWidth, a_ItemGridHeight)
{
@ -28,7 +28,7 @@ cBlockEntityWithItems::cBlockEntityWithItems(
void cBlockEntityWithItems::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cBlockEntityWithItems &>(a_Src);
m_Contents.CopyFrom(src.m_Contents);
}

2
src/BlockEntities/BlockEntityWithItems.h
View File

@ -28,7 +28,7 @@ class cBlockEntityWithItems :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

8
src/BlockEntities/BrewingstandEntity.cpp
View File

@ -12,7 +12,7 @@
cBrewingstandEntity::cBrewingstandEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
m_IsDestroyed(false),
m_IsBrewing(false),
m_TimeBrewed(0),
@ -42,7 +42,7 @@ cBrewingstandEntity::~cBrewingstandEntity()
void cBrewingstandEntity::Destroy()
{
m_IsDestroyed = true;
super::Destroy();
Super::Destroy();
}
@ -51,7 +51,7 @@ void cBrewingstandEntity::Destroy()
void cBrewingstandEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cBrewingstandEntity &>(a_Src);
m_IsBrewing = src.m_IsBrewing;
for (size_t i = 0; i < ARRAYCOUNT(m_CurrentBrewingRecipes); ++i)
@ -202,7 +202,7 @@ void cBrewingstandEntity::BroadcastProgress(short a_ProgressbarID, short a_Value
void cBrewingstandEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
{
super::OnSlotChanged(a_ItemGrid, a_SlotNum);
Super::OnSlotChanged(a_ItemGrid, a_SlotNum);
if (m_IsDestroyed)
{

2
src/BlockEntities/BrewingstandEntity.h
View File

@ -20,7 +20,7 @@ class cBrewingstandEntity :
{
// tolua_end
using super = cBlockEntityWithItems;
using Super = cBlockEntityWithItems;
// tolua_begin

4
src/BlockEntities/ChestEntity.cpp
View File

@ -14,7 +14,7 @@
cChestEntity::cChestEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
m_NumActivePlayers(0),
m_Neighbour(nullptr)
{
@ -50,7 +50,7 @@ cChestEntity::~cChestEntity()
void cChestEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cChestEntity &>(a_Src);
m_Contents.CopyFrom(src.m_Contents);

2
src/BlockEntities/ChestEntity.h
View File

@ -20,7 +20,7 @@ class cChestEntity :
{
// tolua_end
using super = cBlockEntityWithItems;
using Super = cBlockEntityWithItems;
// tolua_begin

4
src/BlockEntities/CommandBlockEntity.cpp
View File

@ -18,7 +18,7 @@
cCommandBlockEntity::cCommandBlockEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
m_ShouldExecute(false),
m_Result(0)
{
@ -115,7 +115,7 @@ void cCommandBlockEntity::Activate(void)
void cCommandBlockEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cCommandBlockEntity &>(a_Src);
m_Command = src.m_Command;
m_LastOutput = src.m_LastOutput;

2
src/BlockEntities/CommandBlockEntity.h
View File

@ -22,7 +22,7 @@ class cCommandBlockEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

2
src/BlockEntities/DispenserEntity.cpp
View File

@ -14,7 +14,7 @@
cDispenserEntity::cDispenserEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World)
Super(a_BlockType, a_BlockMeta, a_Pos, a_World)
{
ASSERT(a_BlockType == E_BLOCK_DISPENSER);
}

2
src/BlockEntities/DispenserEntity.h
View File

@ -13,7 +13,7 @@ class cDispenserEntity :
{
// tolua_end
using super = cDropSpenserEntity;
using Super = cDropSpenserEntity;
public: // tolua_export

4
src/BlockEntities/DropSpenserEntity.cpp
View File

@ -16,7 +16,7 @@
cDropSpenserEntity::cDropSpenserEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
m_ShouldDropSpense(false)
{
}
@ -115,7 +115,7 @@ void cDropSpenserEntity::Activate(void)
void cDropSpenserEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cDropSpenserEntity &>(a_Src);
m_Contents.CopyFrom(src.m_Contents);
m_ShouldDropSpense = src.m_ShouldDropSpense;

2
src/BlockEntities/DropSpenserEntity.h
View File

@ -28,7 +28,7 @@ class cDropSpenserEntity :
{
// tolua_end
using super = cBlockEntityWithItems;
using Super = cBlockEntityWithItems;
// tolua_begin

2
src/BlockEntities/DropperEntity.cpp
View File

@ -11,7 +11,7 @@
cDropperEntity::cDropperEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World)
Super(a_BlockType, a_BlockMeta, a_Pos, a_World)
{
ASSERT(a_BlockType == E_BLOCK_DROPPER);
}

2
src/BlockEntities/DropperEntity.h
View File

@ -21,7 +21,7 @@ class cDropperEntity :
{
// tolua_end
using super = cDropSpenserEntity;
using Super = cDropSpenserEntity;
public: // tolua_export

2
src/BlockEntities/EnderChestEntity.cpp
View File

@ -15,7 +15,7 @@
cEnderChestEntity::cEnderChestEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
cBlockEntityWindowOwner(this)
{
ASSERT(a_BlockType == E_BLOCK_ENDER_CHEST);

2
src/BlockEntities/EnderChestEntity.h
View File

@ -15,7 +15,7 @@ class cEnderChestEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

4
src/BlockEntities/FlowerPotEntity.cpp
View File

@ -14,7 +14,7 @@
cFlowerPotEntity::cFlowerPotEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World)
Super(a_BlockType, a_BlockMeta, a_Pos, a_World)
{
ASSERT(a_BlockType == E_BLOCK_FLOWER_POT);
}
@ -43,7 +43,7 @@ void cFlowerPotEntity::Destroy(void)
void cFlowerPotEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cFlowerPotEntity &>(a_Src);
m_Item = src.m_Item;
}

2
src/BlockEntities/FlowerPotEntity.h
View File

@ -22,7 +22,7 @@ class cFlowerPotEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

8
src/BlockEntities/FurnaceEntity.cpp
View File

@ -23,7 +23,7 @@ enum
cFurnaceEntity::cFurnaceEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
m_CurrentRecipe(nullptr),
m_IsDestroyed(false),
m_IsCooking(a_BlockType == E_BLOCK_LIT_FURNACE),
@ -58,7 +58,7 @@ cFurnaceEntity::~cFurnaceEntity()
void cFurnaceEntity::Destroy()
{
m_IsDestroyed = true;
super::Destroy();
Super::Destroy();
}
@ -67,7 +67,7 @@ void cFurnaceEntity::Destroy()
void cFurnaceEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cFurnaceEntity &>(a_Src);
m_Contents.CopyFrom(src.m_Contents);
m_CurrentRecipe = src.m_CurrentRecipe;
@ -255,7 +255,7 @@ void cFurnaceEntity::BurnNewFuel(void)
void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
{
super::OnSlotChanged(a_ItemGrid, a_SlotNum);
Super::OnSlotChanged(a_ItemGrid, a_SlotNum);
if (m_IsDestroyed)
{

2
src/BlockEntities/FurnaceEntity.h
View File

@ -20,7 +20,7 @@ class cFurnaceEntity :
{
// tolua_end
using super = cBlockEntityWithItems;
using Super = cBlockEntityWithItems;
// tolua_begin

4
src/BlockEntities/HopperEntity.cpp
View File

@ -18,7 +18,7 @@
cHopperEntity::cHopperEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, ContentsWidth, ContentsHeight, a_World),
m_LastMoveItemsInTick(0),
m_LastMoveItemsOutTick(0),
m_Locked(false)
@ -63,7 +63,7 @@ std::pair<bool, Vector3i> cHopperEntity::GetOutputBlockPos(NIBBLETYPE a_BlockMet
void cHopperEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cHopperEntity &>(a_Src);
m_LastMoveItemsInTick = src.m_LastMoveItemsInTick;
m_LastMoveItemsOutTick = src.m_LastMoveItemsOutTick;

2
src/BlockEntities/HopperEntity.h
View File

@ -21,7 +21,7 @@ class cHopperEntity :
{
// tolua_end
using super = cBlockEntityWithItems;
using Super = cBlockEntityWithItems;
// tolua_begin

4
src/BlockEntities/JukeboxEntity.cpp
View File

@ -14,7 +14,7 @@
cJukeboxEntity::cJukeboxEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
m_Record(0)
{
ASSERT(a_BlockType == E_BLOCK_JUKEBOX);
@ -49,7 +49,7 @@ void cJukeboxEntity::Destroy(void)
void cJukeboxEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cJukeboxEntity &>(a_Src);
m_Record = src.m_Record;
}

2
src/BlockEntities/JukeboxEntity.h
View File

@ -15,7 +15,7 @@ class cJukeboxEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

4
src/BlockEntities/MobHeadEntity.cpp
View File

@ -14,7 +14,7 @@
cMobHeadEntity::cMobHeadEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
m_Type(SKULL_TYPE_SKELETON),
m_Rotation(SKULL_ROTATION_NORTH)
{
@ -27,7 +27,7 @@ cMobHeadEntity::cMobHeadEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Ve
void cMobHeadEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cMobHeadEntity &>(a_Src);
m_OwnerName = src.m_OwnerName;
m_OwnerTexture = src.m_OwnerTexture;

2
src/BlockEntities/MobHeadEntity.h
View File

@ -23,7 +23,7 @@ class cMobHeadEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

4
src/BlockEntities/MobSpawnerEntity.cpp
View File

@ -14,7 +14,7 @@
cMobSpawnerEntity::cMobSpawnerEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
m_Entity(mtPig),
m_SpawnDelay(100),
m_IsActive(false)
@ -28,7 +28,7 @@ cMobSpawnerEntity::cMobSpawnerEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMe
void cMobSpawnerEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cMobSpawnerEntity &>(a_Src);
m_Entity = src.m_Entity;
m_IsActive = src.m_IsActive;

2
src/BlockEntities/MobSpawnerEntity.h
View File

@ -21,7 +21,7 @@ class cMobSpawnerEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

4
src/BlockEntities/NoteEntity.cpp
View File

@ -10,7 +10,7 @@
cNoteEntity::cNoteEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World),
Super(a_BlockType, a_BlockMeta, a_Pos, a_World),
m_Pitch(0)
{
ASSERT(a_BlockType == E_BLOCK_NOTE_BLOCK);
@ -22,7 +22,7 @@ cNoteEntity::cNoteEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i
void cNoteEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cNoteEntity &>(a_Src);
m_Pitch = src.m_Pitch;
}

2
src/BlockEntities/NoteEntity.h
View File

@ -32,7 +32,7 @@ class cNoteEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

4
src/BlockEntities/SignEntity.cpp
View File

@ -13,7 +13,7 @@
cSignEntity::cSignEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i a_Pos, cWorld * a_World):
super(a_BlockType, a_BlockMeta, a_Pos, a_World)
Super(a_BlockType, a_BlockMeta, a_Pos, a_World)
{
ASSERT((a_BlockType == E_BLOCK_WALLSIGN) || (a_BlockType == E_BLOCK_SIGN_POST));
ASSERT(cChunkDef::IsValidHeight(a_Pos.y));
@ -25,7 +25,7 @@ cSignEntity::cSignEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Vector3i
void cSignEntity::CopyFrom(const cBlockEntity & a_Src)
{
super::CopyFrom(a_Src);
Super::CopyFrom(a_Src);
auto & src = static_cast<const cSignEntity &>(a_Src);
for (size_t i = 0; i < ARRAYCOUNT(m_Line); ++i)
{

2
src/BlockEntities/SignEntity.h
View File

@ -21,7 +21,7 @@ class cSignEntity :
{
// tolua_end
using super = cBlockEntity;
using Super = cBlockEntity;
public: // tolua_export

13
src/Blocks/BlockAnvil.h
View File

@ -10,14 +10,15 @@
class cBlockAnvilHandler :
class cBlockAnvilHandler:
public cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>
{
public:
using super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
using Super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
cBlockAnvilHandler(BLOCKTYPE a_BlockType)
: super(a_BlockType)
public:
cBlockAnvilHandler(BLOCKTYPE a_BlockType):
Super(a_BlockType)
{
}
@ -48,7 +49,7 @@ public:
BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
) override
{
if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
{
return false;
}

4
src/Blocks/BlockBed.h
View File

@ -18,12 +18,12 @@ class cWorldInterface;
class cBlockBedHandler :
public cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>
{
using super = cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>;
using Super = cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>;
public:
cBlockBedHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockBigFlower.h
View File

@ -12,12 +12,12 @@
class cBlockBigFlowerHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockBigFlowerHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockBrewingStand.h
View File

@ -11,12 +11,12 @@
class cBlockBrewingStandHandler :
public cBlockEntityHandler
{
using super = cBlockEntityHandler;
using Super = cBlockEntityHandler;
public:
cBlockBrewingStandHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockButton.h
View File

@ -11,12 +11,12 @@
class cBlockButtonHandler :
public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>>
{
using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>>;
using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>>;
public:
cBlockButtonHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

6
src/Blocks/BlockCactus.h
View File

@ -10,12 +10,12 @@
class cBlockCactusHandler :
public cClearMetaOnDrop<cBlockPlant<false>>
{
using super = cClearMetaOnDrop<cBlockPlant<false>>;
using Super = cClearMetaOnDrop<cBlockPlant<false>>;
public:
cBlockCactusHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -159,7 +159,7 @@ protected:
// Only allow growing if there's an air block above:
if (((a_RelPos.y + 1) < cChunkDef::Height) && (a_Chunk.GetBlock(a_RelPos.addedY(1)) == E_BLOCK_AIR))
{
return super::CanGrow(a_Chunk, a_RelPos);
return Super::CanGrow(a_Chunk, a_RelPos);
}
return paStay;
}

4
src/Blocks/BlockCake.h
View File

@ -9,10 +9,10 @@
class cBlockCakeHandler:
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockCakeHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockCarpet.h
View File

@ -17,12 +17,12 @@
class cBlockCarpetHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockCarpetHandler(BLOCKTYPE a_BlockType) :
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockCauldron.h
View File

@ -10,12 +10,12 @@
class cBlockCauldronHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockCauldronHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

6
src/Blocks/BlockChest.h
View File

@ -13,12 +13,12 @@
class cBlockChestHandler :
public cYawRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05>
{
using super = cYawRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05>;
using Super = cYawRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05>;
public:
cBlockChestHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -48,7 +48,7 @@ public:
}
// Get meta as if this was a single-chest:
if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
{
return false;
}

4
src/Blocks/BlockCocoaPod.h
View File

@ -10,11 +10,11 @@
class cBlockCocoaPodHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockCocoaPodHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockCommandBlock.h
View File

@ -10,12 +10,12 @@
class cBlockCommandBlockHandler :
public cBlockEntityHandler
{
using super = cBlockEntityHandler;
using Super = cBlockEntityHandler;
public:
cBlockCommandBlockHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockComparator.h
View File

@ -12,12 +12,12 @@
class cBlockComparatorHandler :
public cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>
{
using super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
using Super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
public:
cBlockComparatorHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

6
src/Blocks/BlockConcretePowder.h
View File

@ -10,12 +10,12 @@
class cBlockConcretePowderHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockConcretePowderHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -33,7 +33,7 @@ public:
{
return;
}
super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
Super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
}

4
src/Blocks/BlockCrops.h
View File

@ -13,12 +13,12 @@ template <NIBBLETYPE RipeMeta>
class cBlockCropsHandler:
public cBlockPlant<true>
{
using super = cBlockPlant<true>;
using Super = cBlockPlant<true>;
public:
cBlockCropsHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

17
src/Blocks/BlockDeadBush.h
View File

@ -7,21 +7,30 @@
class cBlockDeadBushHandler :
class cBlockDeadBushHandler:
public cBlockHandler
{
typedef cBlockHandler super;
using Super = cBlockHandler;
public:
cBlockDeadBushHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType)
cBlockDeadBushHandler(BLOCKTYPE a_BlockType):
Super(a_BlockType)
{
}
virtual bool DoesIgnoreBuildCollision(cChunkInterface & a_ChunkInterface, Vector3i a_Pos, cPlayer & a_Player, NIBBLETYPE a_Meta) override
{
return true;
}
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
{
if (a_RelY <= 0)

4
src/Blocks/BlockDirt.h
View File

@ -10,12 +10,12 @@
class cBlockDirtHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockDirtHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

6
src/Blocks/BlockDoor.cpp
View File

@ -8,7 +8,7 @@
cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -123,7 +123,7 @@ NIBBLETYPE cBlockDoorHandler::MetaRotateCCW(NIBBLETYPE a_Meta)
else
{
// Rotate the bottom block
return super::MetaRotateCCW(a_Meta);
return Super::MetaRotateCCW(a_Meta);
}
}
@ -141,7 +141,7 @@ NIBBLETYPE cBlockDoorHandler::MetaRotateCW(NIBBLETYPE a_Meta)
else
{
// Rotate the bottom block
return super::MetaRotateCW(a_Meta);
return Super::MetaRotateCW(a_Meta);
}
}

4
src/Blocks/BlockDoor.h
View File

@ -14,7 +14,7 @@
class cBlockDoorHandler :
public cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>
{
using super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
using Super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
public:
@ -50,7 +50,7 @@ public:
return false;
}
return super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta);
return Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta);
}
virtual cBoundingBox GetPlacementCollisionBox(BLOCKTYPE a_XM, BLOCKTYPE a_XP, BLOCKTYPE a_YM, BLOCKTYPE a_YP, BLOCKTYPE a_ZM, BLOCKTYPE a_ZP) override;

4
src/Blocks/BlockDropSpenser.h
View File

@ -16,12 +16,12 @@
class cBlockDropSpenserHandler :
public cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>
{
using super = cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>;
using Super = cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>;
public:
cBlockDropSpenserHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockEnderchest.h
View File

@ -10,12 +10,12 @@
class cBlockEnderchestHandler :
public cYawRotator<cBlockEntityHandler>
{
using super = cYawRotator<cBlockEntityHandler>;
using Super = cYawRotator<cBlockEntityHandler>;
public:
cBlockEnderchestHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockEntity.h
View File

@ -15,12 +15,12 @@ Forwards the "use" event to the block entity. */
class cBlockEntityHandler:
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockEntityHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockFarmland.h
View File

@ -19,12 +19,12 @@
class cBlockFarmlandHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockFarmlandHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockFenceGate.h
View File

@ -11,12 +11,12 @@
class cBlockFenceGateHandler :
public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>
{
using super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>;
using Super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>;
public:
cBlockFenceGateHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockFlowerPot.h
View File

@ -10,12 +10,12 @@
class cBlockFlowerPotHandler :
public cBlockEntityHandler
{
using super = cBlockEntityHandler;
using Super = cBlockEntityHandler;
public:
cBlockFlowerPotHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

20
src/Blocks/BlockFluid.h
View File

@ -7,14 +7,15 @@
class cBlockFluidHandler :
class cBlockFluidHandler:
public cBlockHandler
{
typedef cBlockHandler super;
using Super = cBlockHandler;
public:
cBlockFluidHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType)
cBlockFluidHandler(BLOCKTYPE a_BlockType):
Super(a_BlockType)
{
}
@ -61,7 +62,7 @@ public:
break;
}
}
super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
Super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
}
@ -96,14 +97,15 @@ public:
class cBlockLavaHandler :
class cBlockLavaHandler:
public cBlockFluidHandler
{
typedef cBlockFluidHandler super;
using Super = cBlockFluidHandler;
public:
cBlockLavaHandler(BLOCKTYPE a_BlockType) :
super(a_BlockType)
cBlockLavaHandler(BLOCKTYPE a_BlockType):
Super(a_BlockType)
{
}

4
src/Blocks/BlockFurnace.h
View File

@ -11,12 +11,12 @@
class cBlockFurnaceHandler :
public cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>
{
using super = cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>;
using Super = cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>;
public:
cBlockFurnaceHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockHopper.h
View File

@ -10,12 +10,12 @@
class cBlockHopperHandler :
public cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>>
{
using super = cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>>;
using Super = cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>>;
public:
cBlockHopperHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockIce.h
View File

@ -10,12 +10,12 @@
class cBlockIceHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockIceHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockLadder.h
View File

@ -11,12 +11,12 @@
class cBlockLadderHandler :
public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04> >
{
using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04>>;
using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04>>;
public:
cBlockLadderHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

8
src/Blocks/BlockLever.h
View File

@ -9,12 +9,12 @@
class cBlockLeverHandler :
public cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, false>
{
using super = cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, false>;
using Super = cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, false>;
public:
cBlockLeverHandler(BLOCKTYPE a_BlockType) :
super(a_BlockType)
Super(a_BlockType)
{
}
@ -164,7 +164,7 @@ public:
case 0x05: return 0x06; // Ground rotation
case 0x06: return 0x05;
default: return super::MetaRotateCCW(a_Meta); // Wall Rotation
default: return Super::MetaRotateCCW(a_Meta); // Wall Rotation
}
}
@ -182,7 +182,7 @@ public:
case 0x05: return 0x06; // Ground rotation
case 0x06: return 0x05;
default: return super::MetaRotateCW(a_Meta); // Wall Rotation
default: return Super::MetaRotateCW(a_Meta); // Wall Rotation
}
}

9
src/Blocks/BlockLilypad.h
View File

@ -7,14 +7,15 @@
class cBlockLilypadHandler :
class cBlockLilypadHandler:
public cClearMetaOnDrop<cBlockHandler>
{
typedef cClearMetaOnDrop<cBlockHandler> super;
using Super = cClearMetaOnDrop<cBlockHandler>;
public:
cBlockLilypadHandler(BLOCKTYPE a_BlockType) :
super(a_BlockType)
cBlockLilypadHandler(BLOCKTYPE a_BlockType):
Super(a_BlockType)
{
}

4
src/Blocks/BlockMelon.h
View File

@ -10,12 +10,12 @@
class cBlockMelonHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockMelonHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockMobHead.h
View File

@ -11,11 +11,11 @@
class cBlockMobHeadHandler :
public cBlockEntityHandler
{
using super = cBlockEntityHandler;
using Super = cBlockEntityHandler;
public:
cBlockMobHeadHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockMushroom.h
View File

@ -10,12 +10,12 @@
class cBlockMushroomHandler:
public cClearMetaOnDrop<cBlockHandler>
{
using super = cClearMetaOnDrop<cBlockHandler>;
using Super = cClearMetaOnDrop<cBlockHandler>;
public:
cBlockMushroomHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockNetherWart.h
View File

@ -11,12 +11,12 @@
class cBlockNetherWartHandler :
public cBlockPlant<false>
{
using super = cBlockPlant<false>;
using Super = cBlockPlant<false>;
public:
cBlockNetherWartHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockObserver.h
View File

@ -8,11 +8,11 @@
class cBlockObserverHandler:
public cClearMetaOnDrop<cPitchYawRotator<cBlockHandler>>
{
using super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler>>;
using Super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler>>;
public:
cBlockObserverHandler(BLOCKTYPE a_BlockType) : super(a_BlockType)
cBlockObserverHandler(BLOCKTYPE a_BlockType) : Super(a_BlockType)
{
}

9
src/Blocks/BlockOre.h
View File

@ -7,13 +7,14 @@
class cBlockOreHandler :
class cBlockOreHandler:
public cBlockHandler
{
typedef cBlockHandler super;
using Super = cBlockHandler;
public:
cBlockOreHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType)
cBlockOreHandler(BLOCKTYPE a_BlockType):
Super(a_BlockType)
{
}

4
src/Blocks/BlockPiston.cpp
View File

@ -18,7 +18,7 @@
cBlockPistonHandler::cBlockPistonHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -320,7 +320,7 @@ void cBlockPistonHandler::RetractPiston(Vector3i a_BlockPos, cWorld & a_World)
// cBlockPistonHeadHandler:
cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) :
super(E_BLOCK_PISTON_EXTENSION)
Super(E_BLOCK_PISTON_EXTENSION)
{
}

4
src/Blocks/BlockPiston.h
View File

@ -19,7 +19,7 @@ class cWorld;
class cBlockPistonHandler:
public cClearMetaOnDrop<cPitchYawRotator<cBlockHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>>
{
using super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>>;
using Super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>>;
public:
@ -145,7 +145,7 @@ private:
class cBlockPistonHeadHandler:
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockPistonHeadHandler(void);

4
src/Blocks/BlockPlant.h
View File

@ -12,13 +12,13 @@ template <bool NeedsLightToGrow>
class cBlockPlant:
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockPlant(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockPressurePlate.h
View File

@ -9,12 +9,12 @@
class cBlockPressurePlateHandler :
public cClearMetaOnDrop<cBlockHandler>
{
using super = cClearMetaOnDrop<cBlockHandler>;
using Super = cClearMetaOnDrop<cBlockHandler>;
public:
cBlockPressurePlateHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockPumpkin.h
View File

@ -8,11 +8,11 @@
class cBlockPumpkinHandler :
public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>>
{
using super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>>;
using Super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>>;
public:
cBlockPumpkinHandler(BLOCKTYPE a_BlockType) :
super(a_BlockType)
Super(a_BlockType)
{
}

8
src/Blocks/BlockRail.h
View File

@ -19,12 +19,12 @@ enum ENUM_PURE
class cBlockRailHandler :
public cClearMetaOnDrop<cBlockHandler>
{
using super = cClearMetaOnDrop<cBlockHandler>;
using Super = cClearMetaOnDrop<cBlockHandler>;
public:
cBlockRailHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -57,7 +57,7 @@ public:
BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
) override
{
super::OnPlaced(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_BlockType, a_BlockMeta);
Super::OnPlaced(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_BlockType, a_BlockMeta);
// Alert diagonal rails:
NeighborChanged(a_ChunkInterface, a_BlockPos + Vector3i( 1, 1, 0), BLOCK_FACE_NONE);
@ -80,7 +80,7 @@ public:
BLOCKTYPE a_OldBlockType, NIBBLETYPE a_OldBlockMeta
) override
{
super::OnBroken(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_OldBlockType, a_OldBlockMeta);
Super::OnBroken(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_OldBlockType, a_OldBlockMeta);
// Alert diagonal rails:
NeighborChanged(a_ChunkInterface, a_BlockPos + Vector3i( 1, 1, 0), BLOCK_FACE_NONE);

4
src/Blocks/BlockRedstone.h
View File

@ -11,12 +11,12 @@
class cBlockRedstoneHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockRedstoneHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockRedstoneRepeater.h
View File

@ -14,12 +14,12 @@
class cBlockRedstoneRepeaterHandler:
public cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>
{
using super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
using Super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
public:
cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockRedstoneTorch.h
View File

@ -10,12 +10,12 @@
class cBlockRedstoneTorchHandler :
public cBlockTorchHandler
{
using super = cBlockTorchHandler;
using Super = cBlockTorchHandler;
public:
cBlockRedstoneTorchHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockSapling.h
View File

@ -11,12 +11,12 @@
class cBlockSaplingHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockSaplingHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockSeaLantern.h
View File

@ -10,12 +10,12 @@
class cBlockSeaLanternHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockSeaLanternHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockSideways.h
View File

@ -13,12 +13,12 @@ Additionally supports the metadata specifying block sub-type in its lower 2 bits
class cBlockSidewaysHandler:
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockSidewaysHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockSignPost.h
View File

@ -11,12 +11,12 @@
class cBlockSignPostHandler:
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockSignPostHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

8
src/Blocks/BlockSlab.h
View File

@ -20,12 +20,12 @@
class cBlockSlabHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockSlabHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -239,12 +239,12 @@ public:
class cBlockDoubleSlabHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockDoubleSlabHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

6
src/Blocks/BlockSponge.h
View File

@ -10,12 +10,12 @@
class cBlockSpongeHandler :
public cBlockHandler
{
using super = cBlockHandler;
using Super = cBlockHandler;
public:
cBlockSpongeHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}
@ -33,7 +33,7 @@ public:
{
return;
}
super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
Super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
}

4
src/Blocks/BlockStairs.h
View File

@ -10,12 +10,12 @@
class cBlockStairsHandler :
public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>>
{
using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>>;
using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>>;
public:
cBlockStairsHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

4
src/Blocks/BlockStems.h
View File

@ -14,12 +14,12 @@ template <BLOCKTYPE ProduceBlockType, ENUM_ITEM_TYPE StemPickupType>
class cBlockStemsHandler:
public cBlockPlant<true>
{
using super = cBlockPlant<true>;
using Super = cBlockPlant<true>;
public:
cBlockStemsHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
Super(a_BlockType)
{
}

Some files were not shown because too many files have changed in this diff Show More