From 365cbc6e1cea96741e26c9ce912b003f8fd2c62c Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 29 Sep 2019 14:59:24 +0200 Subject: Refactored more of Entities and BlockEntities to use Vector3. (#4403) --- src/UI/BeaconWindow.cpp | 2 +- src/UI/BeaconWindow.h | 4 ++-- src/UI/BrewingstandWindow.cpp | 4 ++-- src/UI/BrewingstandWindow.h | 5 +++-- src/UI/ChestWindow.cpp | 2 +- src/UI/DropSpenserWindow.cpp | 4 ++-- src/UI/DropSpenserWindow.h | 4 ++-- src/UI/EnderChestWindow.cpp | 2 +- src/UI/FurnaceWindow.cpp | 2 +- src/UI/FurnaceWindow.h | 4 ++-- src/UI/HopperWindow.cpp | 2 +- src/UI/HopperWindow.h | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) (limited to 'src/UI') diff --git a/src/UI/BeaconWindow.cpp b/src/UI/BeaconWindow.cpp index 93c357600..e0e9b9c5c 100644 --- a/src/UI/BeaconWindow.cpp +++ b/src/UI/BeaconWindow.cpp @@ -13,7 +13,7 @@ -cBeaconWindow::cBeaconWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cBeaconEntity * a_Beacon) : +cBeaconWindow::cBeaconWindow(cBeaconEntity * a_Beacon): cWindow(wtBeacon, "Beacon"), m_Beacon(a_Beacon) { diff --git a/src/UI/BeaconWindow.h b/src/UI/BeaconWindow.h index 2b35e9d4a..14f7456b4 100644 --- a/src/UI/BeaconWindow.h +++ b/src/UI/BeaconWindow.h @@ -19,10 +19,10 @@ class cBeaconWindow : public cWindow { - typedef cWindow super; + using super = cWindow; public: - cBeaconWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cBeaconEntity * a_Beacon); + cBeaconWindow(cBeaconEntity * a_Beacon); cBeaconEntity * GetBeaconEntity(void) const { return m_Beacon; } diff --git a/src/UI/BrewingstandWindow.cpp b/src/UI/BrewingstandWindow.cpp index 11a5990f2..08fb7d93f 100644 --- a/src/UI/BrewingstandWindow.cpp +++ b/src/UI/BrewingstandWindow.cpp @@ -13,8 +13,8 @@ -cBrewingstandWindow::cBrewingstandWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cBrewingstandEntity * a_Brewingstand) : - cWindow(wtBrewery, "Brewingstand") +cBrewingstandWindow::cBrewingstandWindow(cBrewingstandEntity * a_Brewingstand): + super(wtBrewery, "Brewingstand") { m_SlotAreas.push_back(new cSlotAreaBrewingstand(a_Brewingstand, *this)); m_SlotAreas.push_back(new cSlotAreaInventory(*this)); diff --git a/src/UI/BrewingstandWindow.h b/src/UI/BrewingstandWindow.h index e55752187..9c89d29bd 100644 --- a/src/UI/BrewingstandWindow.h +++ b/src/UI/BrewingstandWindow.h @@ -18,10 +18,11 @@ class cBrewingstandWindow : public cWindow { - typedef cWindow super; + using super = cWindow; public: - cBrewingstandWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cBrewingstandEntity * a_Brewingstand); + + cBrewingstandWindow(cBrewingstandEntity * a_Brewingstand); virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override; }; diff --git a/src/UI/ChestWindow.cpp b/src/UI/ChestWindow.cpp index 67582b786..03347dfed 100644 --- a/src/UI/ChestWindow.cpp +++ b/src/UI/ChestWindow.cpp @@ -13,7 +13,7 @@ -cChestWindow::cChestWindow(cChestEntity * a_Chest) : +cChestWindow::cChestWindow(cChestEntity * a_Chest): cWindow(wtChest, (a_Chest->GetBlockType() == E_BLOCK_CHEST) ? "Chest" : "Trapped Chest"), m_World(a_Chest->GetWorld()), m_BlockPos(a_Chest->GetPos()), diff --git a/src/UI/DropSpenserWindow.cpp b/src/UI/DropSpenserWindow.cpp index 1ddeae842..38b38e56f 100644 --- a/src/UI/DropSpenserWindow.cpp +++ b/src/UI/DropSpenserWindow.cpp @@ -11,8 +11,8 @@ -cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cDropSpenserEntity * a_DropSpenser) : - cWindow(wtDropSpenser, (a_DropSpenser->GetBlockType() == E_BLOCK_DISPENSER) ? "Dispenser" : "Dropper") +cDropSpenserWindow::cDropSpenserWindow(cDropSpenserEntity * a_DropSpenser): + super(wtDropSpenser, (a_DropSpenser->GetBlockType() == E_BLOCK_DISPENSER) ? "Dispenser" : "Dropper") { m_SlotAreas.push_back(new cSlotAreaItemGrid(a_DropSpenser->GetContents(), *this)); m_SlotAreas.push_back(new cSlotAreaInventory(*this)); diff --git a/src/UI/DropSpenserWindow.h b/src/UI/DropSpenserWindow.h index cfc040493..d24c3b7a3 100644 --- a/src/UI/DropSpenserWindow.h +++ b/src/UI/DropSpenserWindow.h @@ -19,10 +19,10 @@ class cDropSpenserWindow : public cWindow { - typedef cWindow super; + using super = cWindow; public: - cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cDropSpenserEntity * a_DropSpenser); + cDropSpenserWindow(cDropSpenserEntity * a_DropSpenser); virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override; }; diff --git a/src/UI/EnderChestWindow.cpp b/src/UI/EnderChestWindow.cpp index 6c3bcff50..9f8a891ad 100644 --- a/src/UI/EnderChestWindow.cpp +++ b/src/UI/EnderChestWindow.cpp @@ -12,7 +12,7 @@ -cEnderChestWindow::cEnderChestWindow(cEnderChestEntity * a_EnderChest) : +cEnderChestWindow::cEnderChestWindow(cEnderChestEntity * a_EnderChest): cWindow(wtChest, "Ender Chest"), m_World(a_EnderChest->GetWorld()), m_BlockPos(a_EnderChest->GetPos()) diff --git a/src/UI/FurnaceWindow.cpp b/src/UI/FurnaceWindow.cpp index a4e852fd8..d4447b8ee 100644 --- a/src/UI/FurnaceWindow.cpp +++ b/src/UI/FurnaceWindow.cpp @@ -13,7 +13,7 @@ -cFurnaceWindow::cFurnaceWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceEntity * a_Furnace) : +cFurnaceWindow::cFurnaceWindow(cFurnaceEntity * a_Furnace): cWindow(wtFurnace, "Furnace") { m_SlotAreas.push_back(new cSlotAreaFurnace(a_Furnace, *this)); diff --git a/src/UI/FurnaceWindow.h b/src/UI/FurnaceWindow.h index 845505f8e..d10485563 100644 --- a/src/UI/FurnaceWindow.h +++ b/src/UI/FurnaceWindow.h @@ -18,10 +18,10 @@ class cFurnaceWindow : public cWindow { - typedef cWindow super; + using super = cWindow; public: - cFurnaceWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceEntity * a_Furnace); + cFurnaceWindow(cFurnaceEntity * a_Furnace); virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override; diff --git a/src/UI/HopperWindow.cpp b/src/UI/HopperWindow.cpp index d2b098e6b..db79e6857 100644 --- a/src/UI/HopperWindow.cpp +++ b/src/UI/HopperWindow.cpp @@ -13,7 +13,7 @@ -cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEntity * a_Hopper) : +cHopperWindow::cHopperWindow(cHopperEntity * a_Hopper): super(wtHopper, "Hopper") { m_SlotAreas.push_back(new cSlotAreaItemGrid(a_Hopper->GetContents(), *this)); diff --git a/src/UI/HopperWindow.h b/src/UI/HopperWindow.h index 2dec08666..b4a0cef84 100644 --- a/src/UI/HopperWindow.h +++ b/src/UI/HopperWindow.h @@ -21,7 +21,7 @@ class cHopperWindow : typedef cWindow super; public: - cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEntity * a_Hopper); + cHopperWindow(cHopperEntity * a_Hopper); virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override; -- cgit v1.2.3