Use BYTE Win Typedef instead of byte typedef from Minecraft.World

This commit is contained in:
GabsPuNs
2026-05-10 21:03:03 -04:00
parent 20d395b88d
commit 3e7983ab3c
216 changed files with 798 additions and 800 deletions

View File

@@ -61,7 +61,7 @@ C4JThread* GameRenderer::m_updateThread;
C4JThread::EventArray* GameRenderer::m_updateEvents;
bool GameRenderer::nearThingsToDo = false;
bool GameRenderer::updateRunning = false;
vector<byte *> GameRenderer::m_deleteStackByte;
vector<BYTE *> GameRenderer::m_deleteStackByte;
vector<SparseLightStorage *> GameRenderer::m_deleteStackSparseLightStorage;
vector<CompressedTileStorage *> GameRenderer::m_deleteStackCompressedTileStorage;
vector<SparseDataStorage *> GameRenderer::m_deleteStackSparseDataStorage;
@@ -1224,7 +1224,7 @@ void GameRenderer::renderLevel(float a)
#ifdef MULTITHREAD_ENABLE
// Request that an item be deleted, when it is safe to do so
void GameRenderer::AddForDelete(byte *deleteThis)
void GameRenderer::AddForDelete(BYTE *deleteThis)
{
EnterCriticalSection(&m_csDeleteStack);
m_deleteStackByte.push_back(deleteThis);
@@ -2010,9 +2010,9 @@ void GameRenderer::setupClearColor(float a)
float clearness = EnchantmentHelper::getOxygenBonus(player) * 0.2f;
unsigned int colour = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Under_Water_Clear_Colour );
byte redComponent = ((colour>>16)&0xFF);
byte greenComponent = ((colour>>8)&0xFF);
byte blueComponent = ((colour)&0xFF);
BYTE redComponent = ((colour>>16)&0xFF);
BYTE greenComponent = ((colour>>8)&0xFF);
BYTE blueComponent = ((colour)&0xFF);
fr = static_cast<float>(redComponent)/256 + clearness;//0.02f;
fg = static_cast<float>(greenComponent)/256 + clearness;//0.02f;
@@ -2021,9 +2021,9 @@ void GameRenderer::setupClearColor(float a)
else if (t != 0 && Tile::tiles[t]->material == Material::lava)
{
unsigned int colour = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Under_Lava_Clear_Colour );
byte redComponent = ((colour>>16)&0xFF);
byte greenComponent = ((colour>>8)&0xFF);
byte blueComponent = ((colour)&0xFF);
BYTE redComponent = ((colour>>16)&0xFF);
BYTE greenComponent = ((colour>>8)&0xFF);
BYTE blueComponent = ((colour)&0xFF);
fr = static_cast<float>(redComponent)/256;//0.6f;
fg = static_cast<float>(greenComponent)/256;//0.1f;