diff options
author | Alexander Harkness <me@bearbin.net> | 2024-11-02 22:27:47 +0100 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2024-11-02 22:27:47 +0100 |
commit | cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a (patch) | |
tree | f647b20e1823f1846af88e832cf82a4a02e96e69 /src/BlockEntities/BlockEntityWithItems.h | |
parent | Improve clang-format config file, remove automatically enforced code style from contrib guide. (diff) | |
download | cuberite-clang-format-codebase.tar cuberite-clang-format-codebase.tar.gz cuberite-clang-format-codebase.tar.bz2 cuberite-clang-format-codebase.tar.lz cuberite-clang-format-codebase.tar.xz cuberite-clang-format-codebase.tar.zst cuberite-clang-format-codebase.zip |
Diffstat (limited to 'src/BlockEntities/BlockEntityWithItems.h')
-rw-r--r-- | src/BlockEntities/BlockEntityWithItems.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index f191c8f43..fec288b14 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -19,25 +19,24 @@ // tolua_begin -class cBlockEntityWithItems : - public cBlockEntity, - // tolua_end - public cItemGrid::cListener, - // tolua_begin - public cBlockEntityWindowOwner +class cBlockEntityWithItems : public cBlockEntity, + // tolua_end + public cItemGrid::cListener, + // tolua_begin + public cBlockEntityWindowOwner { // tolua_end using Super = cBlockEntity; -public: // tolua_export - + public: // tolua_export cBlockEntityWithItems( - BLOCKTYPE a_BlockType, // Type of the block that the entity represents - NIBBLETYPE a_BlockMeta, // Meta of the block that the entity represents - Vector3i a_Pos, // Abs position of the block entity - int a_ItemGridWidth, int a_ItemGridHeight, // Dimensions of the ItemGrid - cWorld * a_World // Optional world to assign to the entity + BLOCKTYPE a_BlockType, // Type of the block that the entity represents + NIBBLETYPE a_BlockMeta, // Meta of the block that the entity represents + Vector3i a_Pos, // Abs position of the block entity + int a_ItemGridWidth, + int a_ItemGridHeight, // Dimensions of the ItemGrid + cWorld * a_World // Optional world to assign to the entity ); // cBlockEntity overrides: @@ -46,10 +45,10 @@ public: // tolua_export // tolua_begin - const cItem & GetSlot(int a_SlotNum) const { return m_Contents.GetSlot(a_SlotNum); } + const cItem & GetSlot(int a_SlotNum) const { return m_Contents.GetSlot(a_SlotNum); } const cItem & GetSlot(int a_X, int a_Y) const { return m_Contents.GetSlot(a_X, a_Y); } - void SetSlot(int a_SlotNum, const cItem & a_Item) { m_Contents.SetSlot(a_SlotNum, a_Item); } + void SetSlot(int a_SlotNum, const cItem & a_Item) { m_Contents.SetSlot(a_SlotNum, a_Item); } void SetSlot(int a_X, int a_Y, const cItem & a_Item) { m_Contents.SetSlot(a_X, a_Y, a_Item); } /** Returns the ItemGrid used for storing the contents */ @@ -60,10 +59,9 @@ public: // tolua_export /** Const version of the GetContents() function for C++ type-safety */ const cItemGrid & GetContents(void) const { return m_Contents; } -protected: - + protected: cItemGrid m_Contents; // cItemGrid::cListener overrides: virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) override; -} ; // tolua_export +}; // tolua_export |