Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -315,7 +315,7 @@ void TileCompressData_SPU::loadAndUncompressLowerSection(int block, int x0, int
|
||||
|
||||
// tile IDs first
|
||||
// ---------------------------
|
||||
if(m_lowerBlocks[block] != nullptr)
|
||||
if(m_lowerBlocks[block] != NULL)
|
||||
{
|
||||
int dmaSize = padTo16(m_lowerBlocksSize[block]);
|
||||
DmaData_SPU::getAndWait(m_pTileStorage->getDataPtr(), (uint32_t)m_lowerBlocks[block], dmaSize);
|
||||
@@ -366,7 +366,7 @@ void TileCompressData_SPU::loadAndUncompressLowerSection(int block, int x0, int
|
||||
|
||||
void TileCompressData_SPU::loadAndUncompressUpperSection(int block, int x0, int z0, int x1, int z1)
|
||||
{
|
||||
if(m_upperBlocks[block] != nullptr)
|
||||
if(m_upperBlocks[block] != NULL)
|
||||
{
|
||||
int dmaSize = padTo16(m_upperBlocksSize[block]);
|
||||
DmaData_SPU::getAndWait(m_pTileStorage->getDataPtr(), (uint32_t)m_upperBlocks[block], dmaSize);
|
||||
@@ -507,7 +507,7 @@ void TileCompressData_SPU::setForChunk( Region* region, int x0, int y0, int z0 )
|
||||
}
|
||||
else
|
||||
{
|
||||
m_lowerBlocks[i*3+j] = nullptr;
|
||||
m_lowerBlocks[i*3+j] = NULL;
|
||||
m_lowerBlocksSize[i*3+j] = 0;
|
||||
m_lowerSkyLight[i*3+j] = 0;
|
||||
m_lowerBlockLight[i*3+j] = 0;
|
||||
@@ -527,7 +527,7 @@ void TileCompressData_SPU::setForChunk( Region* region, int x0, int y0, int z0 )
|
||||
}
|
||||
else
|
||||
{
|
||||
m_upperBlocks[i*3+j] = nullptr;
|
||||
m_upperBlocks[i*3+j] = NULL;
|
||||
m_upperBlocksSize[i*3+j] = 0;
|
||||
m_upperSkyLight[i*3+j] = 0;
|
||||
m_upperBlockLight[i*3+j] = 0;
|
||||
|
||||
Reference in New Issue
Block a user