diff options
Diffstat (limited to 'src/BlockEntities')
37 files changed, 59 insertions, 59 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index 00ef145fb..3964d2445 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -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); diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h index a36948820..8403dfa01 100644 --- a/src/BlockEntities/BeaconEntity.h +++ b/src/BlockEntities/BeaconEntity.h @@ -16,12 +16,12 @@ // tolua_begin -class cBeaconEntity : +class cBeaconEntity: public cBlockEntityWithItems { // tolua_end - using super = cBlockEntityWithItems; + using Super = cBlockEntityWithItems; public: // tolua_export diff --git a/src/BlockEntities/BedEntity.cpp b/src/BlockEntities/BedEntity.cpp index fad2412f0..55fc53b98 100644 --- a/src/BlockEntities/BedEntity.cpp +++ b/src/BlockEntities/BedEntity.cpp @@ -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; } diff --git a/src/BlockEntities/BedEntity.h b/src/BlockEntities/BedEntity.h index 265ed43dd..0a5d25767 100644 --- a/src/BlockEntities/BedEntity.h +++ b/src/BlockEntities/BedEntity.h @@ -12,11 +12,11 @@ // tolua_begin -class cBedEntity : +class cBedEntity: public cBlockEntity { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h index 2617edfb6..3cbceedb7 100644 --- a/src/BlockEntities/BlockEntity.h +++ b/src/BlockEntities/BlockEntity.h @@ -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(); \ } diff --git a/src/BlockEntities/BlockEntityWithItems.cpp b/src/BlockEntities/BlockEntityWithItems.cpp index fb21c0e51..8dad08650 100644 --- a/src/BlockEntities/BlockEntityWithItems.cpp +++ b/src/BlockEntities/BlockEntityWithItems.cpp @@ -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); } diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index ffce3c4f7..2a809bb35 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -28,7 +28,7 @@ class cBlockEntityWithItems : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/BrewingstandEntity.cpp b/src/BlockEntities/BrewingstandEntity.cpp index 158dd9278..3f437d4cb 100644 --- a/src/BlockEntities/BrewingstandEntity.cpp +++ b/src/BlockEntities/BrewingstandEntity.cpp @@ -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) { diff --git a/src/BlockEntities/BrewingstandEntity.h b/src/BlockEntities/BrewingstandEntity.h index 791d2a449..44d977966 100644 --- a/src/BlockEntities/BrewingstandEntity.h +++ b/src/BlockEntities/BrewingstandEntity.h @@ -20,7 +20,7 @@ class cBrewingstandEntity : { // tolua_end - using super = cBlockEntityWithItems; + using Super = cBlockEntityWithItems; // tolua_begin diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 902c9b17a..d9648df18 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -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); diff --git a/src/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h index 2e861d48c..2ac0c639b 100644 --- a/src/BlockEntities/ChestEntity.h +++ b/src/BlockEntities/ChestEntity.h @@ -20,7 +20,7 @@ class cChestEntity : { // tolua_end - using super = cBlockEntityWithItems; + using Super = cBlockEntityWithItems; // tolua_begin diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp index a1e4932ba..ad78c4ea3 100644 --- a/src/BlockEntities/CommandBlockEntity.cpp +++ b/src/BlockEntities/CommandBlockEntity.cpp @@ -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; diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h index bb85e221b..715fe445c 100644 --- a/src/BlockEntities/CommandBlockEntity.h +++ b/src/BlockEntities/CommandBlockEntity.h @@ -22,7 +22,7 @@ class cCommandBlockEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp index 95e3c46b9..90732931f 100644 --- a/src/BlockEntities/DispenserEntity.cpp +++ b/src/BlockEntities/DispenserEntity.cpp @@ -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); } diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h index 5a2afca30..c123f76cb 100644 --- a/src/BlockEntities/DispenserEntity.h +++ b/src/BlockEntities/DispenserEntity.h @@ -13,7 +13,7 @@ class cDispenserEntity : { // tolua_end - using super = cDropSpenserEntity; + using Super = cDropSpenserEntity; public: // tolua_export diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp index c301ec24c..869192d09 100644 --- a/src/BlockEntities/DropSpenserEntity.cpp +++ b/src/BlockEntities/DropSpenserEntity.cpp @@ -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; diff --git a/src/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h index 3a2cd0296..475937afe 100644 --- a/src/BlockEntities/DropSpenserEntity.h +++ b/src/BlockEntities/DropSpenserEntity.h @@ -28,7 +28,7 @@ class cDropSpenserEntity : { // tolua_end - using super = cBlockEntityWithItems; + using Super = cBlockEntityWithItems; // tolua_begin diff --git a/src/BlockEntities/DropperEntity.cpp b/src/BlockEntities/DropperEntity.cpp index 3d45e83d4..341924ebb 100644 --- a/src/BlockEntities/DropperEntity.cpp +++ b/src/BlockEntities/DropperEntity.cpp @@ -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); } diff --git a/src/BlockEntities/DropperEntity.h b/src/BlockEntities/DropperEntity.h index 722867f6a..3ba2cbbe5 100644 --- a/src/BlockEntities/DropperEntity.h +++ b/src/BlockEntities/DropperEntity.h @@ -21,7 +21,7 @@ class cDropperEntity : { // tolua_end - using super = cDropSpenserEntity; + using Super = cDropSpenserEntity; public: // tolua_export diff --git a/src/BlockEntities/EnderChestEntity.cpp b/src/BlockEntities/EnderChestEntity.cpp index c324f1cec..74e6a7d23 100644 --- a/src/BlockEntities/EnderChestEntity.cpp +++ b/src/BlockEntities/EnderChestEntity.cpp @@ -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); diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h index cbedba912..e380d1e3e 100644 --- a/src/BlockEntities/EnderChestEntity.h +++ b/src/BlockEntities/EnderChestEntity.h @@ -15,7 +15,7 @@ class cEnderChestEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/FlowerPotEntity.cpp b/src/BlockEntities/FlowerPotEntity.cpp index bb8d7854d..5446ee5bd 100644 --- a/src/BlockEntities/FlowerPotEntity.cpp +++ b/src/BlockEntities/FlowerPotEntity.cpp @@ -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; } diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h index 3fa5e7321..5ba4e4ab2 100644 --- a/src/BlockEntities/FlowerPotEntity.h +++ b/src/BlockEntities/FlowerPotEntity.h @@ -22,7 +22,7 @@ class cFlowerPotEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index 38fcf77a4..f521bf666 100644 --- a/src/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -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) { diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h index 2d262704f..64b76a9ec 100644 --- a/src/BlockEntities/FurnaceEntity.h +++ b/src/BlockEntities/FurnaceEntity.h @@ -20,7 +20,7 @@ class cFurnaceEntity : { // tolua_end - using super = cBlockEntityWithItems; + using Super = cBlockEntityWithItems; // tolua_begin diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp index aadca8311..020a041e1 100644 --- a/src/BlockEntities/HopperEntity.cpp +++ b/src/BlockEntities/HopperEntity.cpp @@ -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; diff --git a/src/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h index ef86a36bb..ff21471b6 100644 --- a/src/BlockEntities/HopperEntity.h +++ b/src/BlockEntities/HopperEntity.h @@ -21,7 +21,7 @@ class cHopperEntity : { // tolua_end - using super = cBlockEntityWithItems; + using Super = cBlockEntityWithItems; // tolua_begin diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index 9efd4f0ac..c8d08f327 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -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; } diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h index 532f8905a..223861149 100644 --- a/src/BlockEntities/JukeboxEntity.h +++ b/src/BlockEntities/JukeboxEntity.h @@ -15,7 +15,7 @@ class cJukeboxEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/MobHeadEntity.cpp b/src/BlockEntities/MobHeadEntity.cpp index fa4920f5c..36402f59f 100644 --- a/src/BlockEntities/MobHeadEntity.cpp +++ b/src/BlockEntities/MobHeadEntity.cpp @@ -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; diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h index 847e43f6f..5c41b40d8 100644 --- a/src/BlockEntities/MobHeadEntity.h +++ b/src/BlockEntities/MobHeadEntity.h @@ -23,7 +23,7 @@ class cMobHeadEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp index 76b86f73a..2b099f2c8 100644 --- a/src/BlockEntities/MobSpawnerEntity.cpp +++ b/src/BlockEntities/MobSpawnerEntity.cpp @@ -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; diff --git a/src/BlockEntities/MobSpawnerEntity.h b/src/BlockEntities/MobSpawnerEntity.h index 12fa02f51..0d1991e87 100644 --- a/src/BlockEntities/MobSpawnerEntity.h +++ b/src/BlockEntities/MobSpawnerEntity.h @@ -21,7 +21,7 @@ class cMobSpawnerEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index bb35e871c..531197a0d 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -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; } diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h index ce145a3a9..30dea8811 100644 --- a/src/BlockEntities/NoteEntity.h +++ b/src/BlockEntities/NoteEntity.h @@ -32,7 +32,7 @@ class cNoteEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp index c9ebc7294..30adcb9f9 100644 --- a/src/BlockEntities/SignEntity.cpp +++ b/src/BlockEntities/SignEntity.cpp @@ -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) { diff --git a/src/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h index 498d9e91e..83eb0352d 100644 --- a/src/BlockEntities/SignEntity.h +++ b/src/BlockEntities/SignEntity.h @@ -21,7 +21,7 @@ class cSignEntity : { // tolua_end - using super = cBlockEntity; + using Super = cBlockEntity; public: // tolua_export |