Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.Client/ClockTexture.cpp
View File

@@ -10,7 +10,7 @@
ClockTexture::ClockTexture() : StitchedTexture(L"clock", L"clock")
{
rot = rota = 0.0;
m_dataTexture = NULL;
m_dataTexture = nullptr;
m_iPad = XUSER_INDEX_ANY;
}
@@ -27,7 +27,7 @@ void ClockTexture::cycleFrames()
Minecraft *mc = Minecraft::GetInstance();
double rott = 0;
if (m_iPad >= 0 && m_iPad < XUSER_MAX_COUNT && mc->level != NULL && mc->localplayers[m_iPad] != NULL)
if (m_iPad >= 0 && m_iPad < XUSER_MAX_COUNT && mc->level != nullptr && mc->localplayers[m_iPad] != nullptr)
{
float time = mc->localplayers[m_iPad]->level->getTimeOfDay(1);
rott = time;
@@ -55,9 +55,9 @@ void ClockTexture::cycleFrames()
rot += rota;
// 4J Stu - We share data with another texture
if(m_dataTexture != NULL)
if(m_dataTexture != nullptr)
{
int newFrame = (int) ((rot + 1.0) * m_dataTexture->frames->size()) % m_dataTexture->frames->size();
int newFrame = static_cast<int>((rot + 1.0) * m_dataTexture->frames->size()) % m_dataTexture->frames->size();
while (newFrame < 0)
{
newFrame = (newFrame + m_dataTexture->frames->size()) % m_dataTexture->frames->size();
@@ -70,7 +70,7 @@ void ClockTexture::cycleFrames()
}
else
{
int newFrame = (int) ((rot + 1.0) * frames->size()) % frames->size();
int newFrame = static_cast<int>((rot + 1.0) * frames->size()) % frames->size();
while (newFrame < 0)
{
newFrame = (newFrame + frames->size()) % frames->size();
@@ -95,7 +95,7 @@ int ClockTexture::getSourceHeight() const
int ClockTexture::getFrames()
{
if(m_dataTexture == NULL)
if(m_dataTexture == nullptr)
{
return StitchedTexture::getFrames();
}
@@ -107,7 +107,7 @@ int ClockTexture::getFrames()
void ClockTexture::freeFrameTextures()
{
if(m_dataTexture == NULL)
if(m_dataTexture == nullptr)
{
StitchedTexture::freeFrameTextures();
}
@@ -115,5 +115,5 @@ void ClockTexture::freeFrameTextures()
bool ClockTexture::hasOwnData()
{
return m_dataTexture == NULL;
return m_dataTexture == nullptr;
}