phaneron/smartcmd-MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-12 04:03:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modernize project codebase (#906)

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

* Add safety checks and fix a issue with vector going OOR
This commit is contained in:
ModMaker101 2026-03-08 19:08:36 -04:00 • committed by GitHub
parent 88798b501d
commit 28614b922f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1373 changed files with 20086 additions and 19527 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Minecraft.Client/TextureManager.cpp
View file

@ -7,7 +7,7 @@
#include "TextureManager.h"
#include "..\Minecraft.World\StringHelpers.h"
TextureManager *TextureManager::instance = NULL;
TextureManager *TextureManager::instance = nullptr;
void TextureManager::createInstance()
{
@ -36,7 +36,7 @@ Texture *TextureManager::getTexture(const wstring &name)
return idToTextureMap.find(stringToIDMap.find(name)->second)->second;
}
return NULL;
return nullptr;
}
void TextureManager::registerName(const wstring &name, Texture *texture)
@ -136,7 +136,7 @@ vector<Texture *> *TextureManager::createTextures(const wstring &filename, bool
for (int i = 0; i < frameCount; i++)
{
BufferedImage *subImage = image->getSubimage(0, frameHeight * i, frameWidth, frameHeight);
Texture *texture = createTexture(texName, mode, frameWidth, frameHeight, clamp, format, minFilter, magFilter, mipmap || image->getData(1) != NULL, subImage);
Texture *texture = createTexture(texName, mode, frameWidth, frameHeight, clamp, format, minFilter, magFilter, mipmap || image->getData(1) != nullptr, subImage);
delete subImage;
result->push_back(texture);
}
@ -146,7 +146,7 @@ vector<Texture *> *TextureManager::createTextures(const wstring &filename, bool
// TODO: Remove this hack -- fix proper rotation support (needed for 'off-aspect textures')
if (width == height)
{
result->push_back(createTexture(texName, mode, width, height, clamp, format, minFilter, magFilter, mipmap || image->getData(1) != NULL, image));
result->push_back(createTexture(texName, mode, width, height, clamp, format, minFilter, magFilter, mipmap || image->getData(1) != nullptr, image));
}
else
{
@ -191,6 +191,6 @@ Texture *TextureManager::createTexture(const wstring &name, int mode, int width,
Texture *TextureManager::createTexture(const wstring &name, int mode, int width, int height, int format, bool mipmap)
{
// 4J Stu - Don't clamp as it causes issues with how we signal non-mipmmapped textures to the pixel shader
//return createTexture(name, mode, width, height, Texture::WM_CLAMP, format, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, NULL);
return createTexture(name, mode, width, height, Texture::WM_WRAP, format, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, NULL);
//return createTexture(name, mode, width, height, Texture::WM_CLAMP, format, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, nullptr);
return createTexture(name, mode, width, height, Texture::WM_WRAP, format, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, nullptr);
}