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

cChunk: Added the GetRelNeighborChunkAdjustCoords() function

Browse Source 
Not only does it return the proper neighbor chunk, but also it adjusts the relative coords to be in that returned chunk.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1523 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-05-28 12:18:03 +00:00
parent 5f208f30ac
commit 9cd6333486
2 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
source/Chunk.cpp
View File

@ -2354,6 +2354,72 @@ cChunk * cChunk::GetRelNeighborChunk(int a_RelX, int a_RelZ)
cChunk * cChunk::GetRelNeighborChunkAdjustCoords(int & a_RelX, int & a_RelZ)
{
bool ReturnThis = true;
int RelX = a_RelX;
int RelZ = a_RelZ;
if (a_RelX < 0)
{
if (m_NeighborXM != NULL)
{
RelX = a_RelX + cChunkDef::Width;
cChunk * Candidate = m_NeighborXM->GetRelNeighborChunkAdjustCoords(RelX, RelZ);
if (Candidate != NULL)
{
a_RelX = RelX;
a_RelZ = RelZ;
return Candidate;
}
}
// Going X-first failed, but if the request is crossing Z as well, let's try the Z-first later on.
ReturnThis = false;
}
else if (a_RelX >= cChunkDef::Width)
{
if (m_NeighborXP != NULL)
{
RelX = a_RelX - cChunkDef::Width;
cChunk * Candidate = m_NeighborXP->GetRelNeighborChunkAdjustCoords(RelX, RelZ);
if (Candidate != NULL)
{
a_RelX = RelX;
a_RelZ = RelZ;
return Candidate;
}
}
// Going X-first failed, but if the request is crossing Z as well, let's try the Z-first later on.
ReturnThis = false;
}
if (a_RelZ < 0)
{
if (m_NeighborZM != NULL)
{
a_RelZ += cChunkDef::Width;
return m_NeighborZM->GetRelNeighborChunkAdjustCoords(a_RelX, a_RelZ);
// For requests crossing both X and Z, the X-first way has been already tried
}
return NULL;
}
else if (a_RelZ >= cChunkDef::Width)
{
if (m_NeighborZP != NULL)
{
a_RelZ -= cChunkDef::Width;
return m_NeighborZP->GetRelNeighborChunkAdjustCoords(a_RelX, a_RelZ);
// For requests crossing both X and Z, the X-first way has been already tried
}
return NULL;
}
return (ReturnThis ? this : NULL);
}
void cChunk::BroadcastAttachEntity(const cEntity & a_Entity, const cEntity * a_Vehicle)
{
for (cClientHandleList::const_iterator itr = m_LoadedByClient.begin(); itr != m_LoadedByClient.end(); ++itr )

7
source/Chunk.h
View File

@ -159,6 +159,13 @@ public:
*/
cChunk * GetRelNeighborChunk(int a_RelX, int a_RelZ);
/**
Returns the chunk into which the relatively-specified block belongs, by walking the neighbors.
Also modifies the relative coords from this-relative to return-relative.
Will return self if appropriate. Returns NULL if not reachable through neighbors.
*/
cChunk * GetRelNeighborChunkAdjustCoords(int & a_RelX, int & a_RelZ);
EMCSBiome GetBiomeAt(int a_RelX, int a_RelZ) const {return cChunkDef::GetBiome(m_BiomeMap, a_RelX, a_RelZ); }
void CollectPickupsByPlayer(cPlayer * a_Player);