summaryrefslogtreecommitdiffstats
path: root/src/UI/SlotArea.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2020-04-13 18:38:06 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-16 22:07:48 +0200
commit9ee47e59995f858ec531b3ee467f131594e4ba1f (patch)
treef005d8af4a0362d7eab8a96a71aca0d73275f8e1 /src/UI/SlotArea.h
parentPrevent crash when breeding (diff)
downloadcuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.gz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.bz2
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.lz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.xz
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.zst
cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.zip
Diffstat (limited to '')
-rw-r--r--src/UI/SlotArea.h82
1 files changed, 48 insertions, 34 deletions
diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h
index 4463cb315..a744fea2c 100644
--- a/src/UI/SlotArea.h
+++ b/src/UI/SlotArea.h
@@ -91,12 +91,13 @@ protected:
/** Handles any part of the inventory, using parameters in constructor to distinguish between the parts */
-class cSlotAreaInventoryBase :
+class cSlotAreaInventoryBase:
public cSlotArea
{
- typedef cSlotArea super;
+ using Super = cSlotArea;
public:
+
cSlotAreaInventoryBase(int a_NumSlots, int a_SlotOffset, cWindow & a_ParentWindow);
// Creative inventory's click handling is somewhat different from survival inventory's, handle that here:
@@ -114,14 +115,15 @@ protected:
/** Handles the main inventory of each player, excluding the armor and hotbar */
-class cSlotAreaInventory :
+class cSlotAreaInventory:
public cSlotAreaInventoryBase
{
- typedef cSlotAreaInventoryBase super;
+ using Super = cSlotAreaInventoryBase;
public:
- cSlotAreaInventory(cWindow & a_ParentWindow) :
- cSlotAreaInventoryBase(cInventory::invInventoryCount, cInventory::invInventoryOffset, a_ParentWindow)
+
+ cSlotAreaInventory(cWindow & a_ParentWindow):
+ Super(cInventory::invInventoryCount, cInventory::invInventoryOffset, a_ParentWindow)
{
}
} ;
@@ -131,14 +133,14 @@ public:
/** Handles the hotbar of each player */
-class cSlotAreaHotBar :
+class cSlotAreaHotBar:
public cSlotAreaInventoryBase
{
- typedef cSlotAreaInventoryBase super;
+ using Super = cSlotAreaInventoryBase;
public:
- cSlotAreaHotBar(cWindow & a_ParentWindow) :
- cSlotAreaInventoryBase(cInventory::invHotbarCount, cInventory::invHotbarOffset, a_ParentWindow)
+ cSlotAreaHotBar(cWindow & a_ParentWindow):
+ Super(cInventory::invHotbarCount, cInventory::invHotbarOffset, a_ParentWindow)
{
}
} ;
@@ -148,14 +150,15 @@ public:
/** Handles the shield of each player */
-class cSlotAreaShield :
+class cSlotAreaShield:
public cSlotAreaInventoryBase
{
- typedef cSlotAreaInventoryBase super;
+ using Super = cSlotAreaInventoryBase;
public:
- cSlotAreaShield(cWindow & a_ParentWindow) :
- cSlotAreaInventoryBase(cInventory::invShieldCount, cInventory::invShieldOffset, a_ParentWindow)
+
+ cSlotAreaShield(cWindow & a_ParentWindow):
+ Super(cInventory::invShieldCount, cInventory::invShieldOffset, a_ParentWindow)
{
}
};
@@ -165,12 +168,15 @@ public:
/** Handles the armor area of the player's inventory */
-class cSlotAreaArmor :
+class cSlotAreaArmor:
public cSlotAreaInventoryBase
{
+ using Super = cSlotAreaInventoryBase;
+
public:
- cSlotAreaArmor(cWindow & a_ParentWindow) :
- cSlotAreaInventoryBase(cInventory::invArmorCount, cInventory::invArmorOffset, a_ParentWindow)
+
+ cSlotAreaArmor(cWindow & a_ParentWindow):
+ Super(cInventory::invArmorCount, cInventory::invArmorOffset, a_ParentWindow)
{
}
@@ -188,13 +194,14 @@ public:
/** Handles any slot area that is representing a cItemGrid; same items for all the players */
-class cSlotAreaItemGrid :
+class cSlotAreaItemGrid:
public cSlotArea,
public cItemGrid::cListener
{
- typedef cSlotArea super;
+ using Super = cSlotArea;
public:
+
cSlotAreaItemGrid(cItemGrid & a_ItemGrid, cWindow & a_ParentWindow);
virtual ~cSlotAreaItemGrid() override;
@@ -216,12 +223,13 @@ protected:
/** A cSlotArea with items layout that is private to each player and is temporary, such as
a crafting grid or an enchantment table.
This common ancestor stores the items in a per-player map. It also implements tossing items from the map. */
-class cSlotAreaTemporary :
+class cSlotAreaTemporary:
public cSlotArea
{
- typedef cSlotArea super;
+ using Super = cSlotArea;
public:
+
cSlotAreaTemporary(int a_NumSlots, cWindow & a_ParentWindow);
// cSlotArea overrides:
@@ -234,7 +242,7 @@ public:
void TossItems(cPlayer & a_Player, int a_Begin, int a_End);
protected:
- typedef std::map<UInt32, std::vector<cItem> > cItemMap; // Maps EntityID -> items
+ using cItemMap = std::map<UInt32, std::vector<cItem> >; // Maps EntityID -> items
cItemMap m_Items;
@@ -246,12 +254,13 @@ protected:
-class cSlotAreaCrafting :
+class cSlotAreaCrafting:
public cSlotAreaTemporary
{
- typedef cSlotAreaTemporary super;
+ using Super = cSlotAreaTemporary;
public:
+
/** a_GridSize is allowed to be only 2 or 3 */
cSlotAreaCrafting(int a_GridSize, cWindow & a_ParentWindow);
@@ -298,12 +307,13 @@ protected:
-class cSlotAreaAnvil :
+class cSlotAreaAnvil:
public cSlotAreaTemporary
{
- typedef cSlotAreaTemporary super;
+ using Super = cSlotAreaTemporary;
public:
+
cSlotAreaAnvil(cWindow & a_ParentWindow);
// cSlotArea overrides:
@@ -335,13 +345,14 @@ protected:
-class cSlotAreaBeacon :
+class cSlotAreaBeacon:
public cSlotArea,
public cItemGrid::cListener
{
- typedef cSlotArea super;
+ using Super = cSlotArea;
public:
+
cSlotAreaBeacon(cBeaconEntity * a_Beacon, cWindow & a_ParentWindow);
virtual ~cSlotAreaBeacon() override;
@@ -363,12 +374,13 @@ protected:
-class cSlotAreaEnchanting :
+class cSlotAreaEnchanting:
public cSlotAreaTemporary
{
- typedef cSlotAreaTemporary super;
+ using Super = cSlotAreaTemporary;
public:
+
cSlotAreaEnchanting(cWindow & a_ParentWindow, int a_BlockX, int a_BlockY, int a_BlockZ);
// cSlotArea overrides:
@@ -446,13 +458,14 @@ protected:
-class cSlotAreaFurnace :
+class cSlotAreaFurnace:
public cSlotArea,
public cItemGrid::cListener
{
- typedef cSlotArea super;
+ using Super = cSlotArea;
public:
+
cSlotAreaFurnace(cFurnaceEntity * a_Furnace, cWindow & a_ParentWindow);
virtual ~cSlotAreaFurnace() override;
@@ -476,13 +489,14 @@ protected:
-class cSlotAreaBrewingstand :
+class cSlotAreaBrewingstand:
public cSlotArea,
public cItemGrid::cListener
{
- typedef cSlotArea super;
+ using Super = cSlotArea;
public:
+
cSlotAreaBrewingstand(cBrewingstandEntity * a_Brewingstand, cWindow & a_ParentWindow);
virtual ~cSlotAreaBrewingstand() override;