flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

const-ify some Chunk functions

Browse Source
This commit is contained in:
Tiger Wang 2020-08-08 12:09:40 +01:00
parent fd52d8e8df
commit 2f79ab2e26
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Chunk.cpp
View File

@ -1715,7 +1715,7 @@ OwnedEntity cChunk::RemoveEntity(cEntity & a_Entity)
bool cChunk::HasEntity(UInt32 a_EntityID)
bool cChunk::HasEntity(UInt32 a_EntityID) const
{
for (const auto & Entity : m_Entities)
{
@ -1731,7 +1731,7 @@ bool cChunk::HasEntity(UInt32 a_EntityID)
bool cChunk::ForEachEntity(cEntityCallback a_Callback)
bool cChunk::ForEachEntity(cEntityCallback a_Callback) const
{
// The entity list is locked by the parent chunkmap's CS
for (const auto & Entity : m_Entities)
@ -1748,7 +1748,7 @@ bool cChunk::ForEachEntity(cEntityCallback a_Callback)
bool cChunk::ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback a_Callback)
bool cChunk::ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback a_Callback) const
{
// The entity list is locked by the parent chunkmap's CS
for (const auto & Entity : m_Entities)
@ -1774,7 +1774,7 @@ bool cChunk::ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback a_Ca
bool cChunk::DoWithEntityByID(UInt32 a_EntityID, cEntityCallback a_Callback, bool & a_CallbackResult)
bool cChunk::DoWithEntityByID(UInt32 a_EntityID, cEntityCallback a_Callback, bool & a_CallbackResult) const
{
// The entity list is locked by the parent chunkmap's CS
for (const auto & Entity : m_Entities)

14
src/Chunk.h
View File

@ -250,17 +250,17 @@ public:
Returns an owning reference to the found entity. */
OwnedEntity RemoveEntity(cEntity & a_Entity);
bool HasEntity(UInt32 a_EntityID);
bool HasEntity(UInt32 a_EntityID) const;
/** Calls the callback for each entity; returns true if all entities processed, false if the callback aborted by returning true */
bool ForEachEntity(cEntityCallback a_Callback); // Lua-accessible
bool ForEachEntity(cEntityCallback a_Callback) const; // Lua-accessible
/** Calls the callback for each entity that has a nonempty intersection with the specified boundingbox.
Returns true if all entities processed, false if the callback aborted by returning true. */
bool ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback a_Callback); // Lua-accessible
bool ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback a_Callback) const; // Lua-accessible
/** Calls the callback if the entity with the specified ID is found, with the entity object as the callback param. Returns true if entity found. */
bool DoWithEntityByID(UInt32 a_EntityID, cEntityCallback a_Callback, bool & a_CallbackResult); // Lua-accessible
bool DoWithEntityByID(UInt32 a_EntityID, cEntityCallback a_Callback, bool & a_CallbackResult) const; // Lua-accessible
/** Calls the callback for each tyEntity; returns true if all block entities processed, false if the callback aborted by returning true
tBlocktypes are all blocktypes convertible to tyEntity which are to be called. If no block type is given the callback is called for every block entity
@ -516,10 +516,10 @@ public:
// Per-chunk simulator data:
cFireSimulatorChunkData & GetFireSimulatorData (void) { return m_FireSimulatorData; }
cFluidSimulatorData * GetWaterSimulatorData(void) { return m_WaterSimulatorData; }
cFluidSimulatorData * GetLavaSimulatorData (void) { return m_LavaSimulatorData; }
cFluidSimulatorData * GetWaterSimulatorData(void) const { return m_WaterSimulatorData; }
cFluidSimulatorData * GetLavaSimulatorData (void) const { return m_LavaSimulatorData; }
cSandSimulatorChunkData & GetSandSimulatorData (void) { return m_SandSimulatorData; }
cRedstoneSimulatorChunkData * GetRedstoneSimulatorData(void) { return m_RedstoneSimulatorData; }
cRedstoneSimulatorChunkData * GetRedstoneSimulatorData(void) const { return m_RedstoneSimulatorData; }
/** Returns the block entity at the specified (absolute) coords.
Returns nullptr if no such BE or outside this chunk. */