aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Stitcher.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/Stitcher.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/Stitcher.cpp')
-rw-r--r--Minecraft.Client/Stitcher.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.Client/Stitcher.cpp b/Minecraft.Client/Stitcher.cpp
index d52954c4..450c8026 100644
--- a/Minecraft.Client/Stitcher.cpp
+++ b/Minecraft.Client/Stitcher.cpp
@@ -17,7 +17,7 @@ void Stitcher::_init(const wstring &name, int maxWidth, int maxHeight, bool forc
// 4J init
storageX = 0;
storageY = 0;
- stitchedTexture = NULL;
+ stitchedTexture = nullptr;
}
Stitcher::Stitcher(const wstring &name, int maxWidth, int maxHeight, bool forcePowerOfTwo)
@@ -78,7 +78,7 @@ void Stitcher::stitch()
//TextureHolder[] textureHolders = texturesToBeStitched.toArray(new TextureHolder[texturesToBeStitched.size()]);
//Arrays.sort(textureHolders);
- stitchedTexture = NULL;
+ stitchedTexture = nullptr;
//for (int i = 0; i < textureHolders.length; i++)
for( TextureHolder *textureHolder : texturesToBeStitched )
@@ -122,7 +122,7 @@ int Stitcher::smallestEncompassingPowerOfTwo(int input)
bool Stitcher::addToStorage(TextureHolder *textureHolder)
{
- for (int i = 0; i < storage.size(); i++)
+ for (size_t i = 0; i < storage.size(); i++)
{
if (storage.at(i)->add(textureHolder))
{