From 813176fbd1de6591201a840829cb3f4ab927f754 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 18 Jan 2021 16:09:10 +0000 Subject: cChunk: don't inherit from cChunkDef (#5106) --- src/Chunk.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/Chunk.h') diff --git a/src/Chunk.h b/src/Chunk.h index d0283f3e4..ec5407480 100644 --- a/src/Chunk.h +++ b/src/Chunk.h @@ -45,10 +45,7 @@ typedef std::list cClientHandleList; #define PREPARE_REL_AND_CHUNK(Position, OriginalChunk) cChunk * Chunk; Vector3i Rel; bool RelSuccess = (OriginalChunk).GetChunkAndRelByAbsolute(Position, &Chunk, Rel) -// This class is not to be used directly -// Instead, call actions on cChunkMap (such as cChunkMap::SetBlock() etc.) -class cChunk : - public cChunkDef // The inheritance is "misused" here only to inherit the functions and constants defined in cChunkDef +class cChunk { public: @@ -347,8 +344,6 @@ public: returns true if the use was successful, return false to use the block as a "normal" block */ bool UseBlockEntity(cPlayer * a_Player, int a_X, int a_Y, int a_Z); // [x, y, z] in world block coords - void CalculateHeightmap(const BLOCKTYPE * a_BlockTypes); - void SendBlockEntity (int a_BlockX, int a_BlockY, int a_BlockZ, cClientHandle & a_Client); Vector3i PositionToWorldPosition(Vector3i a_RelPos) -- cgit v1.2.3