summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockHandler.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-03-02 22:03:44 +0100
committerMattes D <github@xoft.cz>2014-03-02 22:03:44 +0100
commitd25e4d4179c00f1692c4d348baece49561c49938 (patch)
treec180208ae9759403cc29c4784103569793e6cc63 /src/Blocks/BlockHandler.h
parentFixed MSVC warnings in DeprecatedBindings. (diff)
parentRemoved if condition (diff)
downloadcuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar
cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.gz
cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.bz2
cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.lz
cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.xz
cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.zst
cuberite-d25e4d4179c00f1692c4d348baece49561c49938.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockHandler.h22
1 files changed, 3 insertions, 19 deletions
diff --git a/src/Blocks/BlockHandler.h b/src/Blocks/BlockHandler.h
index a2913d7f8..c46a46045 100644
--- a/src/Blocks/BlockHandler.h
+++ b/src/Blocks/BlockHandler.h
@@ -136,30 +136,14 @@ public:
/// <returns>Block meta following mirroring</returns>
virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) { return a_Meta; }
- /// <summary>Get the blockhandler for a specific block id</summary>
- static cBlockHandler * GetBlockHandler(BLOCKTYPE a_BlockType);
-
- /// <summary>Deletes all initialised block handlers</summary>
- static void Deinit();
-
protected:
BLOCKTYPE m_BlockType;
// Creates a new blockhandler for the given block type. For internal use only, use ::GetBlockHandler() instead.
- static cBlockHandler *CreateBlockHandler(BLOCKTYPE a_BlockType);
- static cBlockHandler *m_BlockHandler[256];
- static bool m_HandlerInitialized; //used to detect if the blockhandlers are initialized
-};
-
-
+ static cBlockHandler * CreateBlockHandler(BLOCKTYPE a_BlockType);
-
-
-// Shortcut to get the blockhandler for a specific block
-inline cBlockHandler * BlockHandler(BLOCKTYPE a_BlockType)
-{
- return cBlockHandler::GetBlockHandler(a_BlockType);
-}
+ friend class cBlockInfo;
+};