diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-05-02 09:50:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 09:50:36 +0200 |
commit | a4dbb5c58270959884c17d720185da06464fa256 (patch) | |
tree | 2b4e81410e90e059f51726e6c9a01c03fcbfb98d /src/BlockEntities | |
parent | tolua++ bindings use nullptr. (#4219) (diff) | |
download | cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.gz cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.bz2 cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.lz cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.xz cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.zst cuberite-a4dbb5c58270959884c17d720185da06464fa256.zip |
Diffstat (limited to 'src/BlockEntities')
-rw-r--r-- | src/BlockEntities/BeaconEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/BedEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/BlockEntityWithItems.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/BrewingstandEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/ChestEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/CommandBlockEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/DropSpenserEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/FlowerPotEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/FurnaceEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/HopperEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/JukeboxEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/MobHeadEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/MobSpawnerEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/NoteEntity.cpp | 2 | ||||
-rw-r--r-- | src/BlockEntities/SignEntity.cpp | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index 15f6744da..f1f7341b7 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -264,7 +264,7 @@ void cBeaconEntity::GiveEffects(void) void cBeaconEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cBeaconEntity &>(a_Src); + auto & src = static_cast<const cBeaconEntity &>(a_Src); m_BeaconLevel = src.m_BeaconLevel; m_Contents.CopyFrom(src.m_Contents); m_IsActive = src.m_IsActive; diff --git a/src/BlockEntities/BedEntity.cpp b/src/BlockEntities/BedEntity.cpp index c74448661..a9cb178b0 100644 --- a/src/BlockEntities/BedEntity.cpp +++ b/src/BlockEntities/BedEntity.cpp @@ -23,7 +23,7 @@ cBedEntity::cBedEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_Bloc void cBedEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cBedEntity &>(a_Src); + auto & src = static_cast<const cBedEntity &>(a_Src); m_Color = src.m_Color; } diff --git a/src/BlockEntities/BlockEntityWithItems.cpp b/src/BlockEntities/BlockEntityWithItems.cpp index de223041d..01d217a16 100644 --- a/src/BlockEntities/BlockEntityWithItems.cpp +++ b/src/BlockEntities/BlockEntityWithItems.cpp @@ -48,7 +48,7 @@ void cBlockEntityWithItems::Destroy(void) void cBlockEntityWithItems::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cBlockEntityWithItems &>(a_Src); + auto & src = static_cast<const cBlockEntityWithItems &>(a_Src); m_Contents.CopyFrom(src.m_Contents); } diff --git a/src/BlockEntities/BrewingstandEntity.cpp b/src/BlockEntities/BrewingstandEntity.cpp index 2c0f28c30..94fcdcbe6 100644 --- a/src/BlockEntities/BrewingstandEntity.cpp +++ b/src/BlockEntities/BrewingstandEntity.cpp @@ -59,7 +59,7 @@ void cBrewingstandEntity::Destroy() void cBrewingstandEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cBrewingstandEntity &>(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) { diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 5e8b29a45..beffa84de 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -50,7 +50,7 @@ cChestEntity::~cChestEntity() void cChestEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cChestEntity &>(a_Src); + auto & src = static_cast<const cChestEntity &>(a_Src); m_Contents.CopyFrom(src.m_Contents); // Reset the neighbor and player count, there's no sense in copying these: diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp index d8f358028..6b9862a99 100644 --- a/src/BlockEntities/CommandBlockEntity.cpp +++ b/src/BlockEntities/CommandBlockEntity.cpp @@ -117,7 +117,7 @@ void cCommandBlockEntity::Activate(void) void cCommandBlockEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cCommandBlockEntity &>(a_Src); + auto & src = static_cast<const cCommandBlockEntity &>(a_Src); m_Command = src.m_Command; m_LastOutput = src.m_LastOutput; m_Result = src.m_Result; diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp index df825c995..80fba1864 100644 --- a/src/BlockEntities/DropSpenserEntity.cpp +++ b/src/BlockEntities/DropSpenserEntity.cpp @@ -116,7 +116,7 @@ void cDropSpenserEntity::Activate(void) void cDropSpenserEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cDropSpenserEntity &>(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/FlowerPotEntity.cpp b/src/BlockEntities/FlowerPotEntity.cpp index 486553c50..cb6c3419c 100644 --- a/src/BlockEntities/FlowerPotEntity.cpp +++ b/src/BlockEntities/FlowerPotEntity.cpp @@ -44,7 +44,7 @@ void cFlowerPotEntity::Destroy(void) void cFlowerPotEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cFlowerPotEntity &>(a_Src); + auto & src = static_cast<const cFlowerPotEntity &>(a_Src); m_Item = src.m_Item; } diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index 96a17782a..0813927f2 100644 --- a/src/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -69,7 +69,7 @@ void cFurnaceEntity::Destroy() void cFurnaceEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cFurnaceEntity &>(a_Src); + auto & src = static_cast<const cFurnaceEntity &>(a_Src); m_Contents.CopyFrom(src.m_Contents); m_CurrentRecipe = src.m_CurrentRecipe; m_FuelBurnTime = src.m_FuelBurnTime; diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp index e6c2ad546..91340f35b 100644 --- a/src/BlockEntities/HopperEntity.cpp +++ b/src/BlockEntities/HopperEntity.cpp @@ -56,7 +56,7 @@ bool cHopperEntity::GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, i void cHopperEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cHopperEntity &>(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/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index ef2069d72..9fbb99c0e 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -32,7 +32,7 @@ cJukeboxEntity::~cJukeboxEntity() void cJukeboxEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cJukeboxEntity &>(a_Src); + auto & src = static_cast<const cJukeboxEntity &>(a_Src); m_Record = src.m_Record; } diff --git a/src/BlockEntities/MobHeadEntity.cpp b/src/BlockEntities/MobHeadEntity.cpp index 3a2ef9e72..5438bbb26 100644 --- a/src/BlockEntities/MobHeadEntity.cpp +++ b/src/BlockEntities/MobHeadEntity.cpp @@ -28,7 +28,7 @@ cMobHeadEntity::cMobHeadEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, in void cMobHeadEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cMobHeadEntity &>(a_Src); + auto & src = static_cast<const cMobHeadEntity &>(a_Src); m_OwnerName = src.m_OwnerName; m_OwnerTexture = src.m_OwnerTexture; m_OwnerTextureSignature = src.m_OwnerTextureSignature; diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp index a4e53d5d1..772fa8d79 100644 --- a/src/BlockEntities/MobSpawnerEntity.cpp +++ b/src/BlockEntities/MobSpawnerEntity.cpp @@ -29,7 +29,7 @@ cMobSpawnerEntity::cMobSpawnerEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMe void cMobSpawnerEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cMobSpawnerEntity &>(a_Src); + auto & src = static_cast<const cMobSpawnerEntity &>(a_Src); m_Entity = src.m_Entity; m_IsActive = src.m_IsActive; m_SpawnDelay = src.m_SpawnDelay; diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index ca8c2c03d..6fca0381a 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -23,7 +23,7 @@ cNoteEntity::cNoteEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_Bl void cNoteEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cNoteEntity &>(a_Src); + auto & src = static_cast<const cNoteEntity &>(a_Src); m_Pitch = src.m_Pitch; } diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp index 61f200ed5..f607e7bbd 100644 --- a/src/BlockEntities/SignEntity.cpp +++ b/src/BlockEntities/SignEntity.cpp @@ -26,7 +26,7 @@ cSignEntity::cSignEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_Bl void cSignEntity::CopyFrom(const cBlockEntity & a_Src) { Super::CopyFrom(a_Src); - auto & src = reinterpret_cast<const cSignEntity &>(a_Src); + auto & src = static_cast<const cSignEntity &>(a_Src); for (size_t i = 0; i < ARRAYCOUNT(m_Line); ++i) { m_Line[i] = src.m_Line[i]; |