aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/TexturePack.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-07 21:56:03 -0500
committerGitHub <noreply@github.com>2026-03-08 09:56:03 +0700
commita9be52c41a02d207233199e98898fe7483d7e817 (patch)
tree71dfaec3a86b05e9ca409b97d8eb9d7f993bfdd0 /Minecraft.Client/TexturePack.cpp
parent1be5faaea781402e7de06b263eeca4c688b7712c (diff)
Project modernization (#630)
* 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
Diffstat (limited to 'Minecraft.Client/TexturePack.cpp')
-rw-r--r--Minecraft.Client/TexturePack.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.Client/TexturePack.cpp b/Minecraft.Client/TexturePack.cpp
index 7ed208ae..bacb2951 100644
--- a/Minecraft.Client/TexturePack.cpp
+++ b/Minecraft.Client/TexturePack.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "TexturePack.h"
-wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pchBDPatchFileName /*= NULL*/)
+wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pchBDPatchFileName /*= nullptr*/)
{
wstring wDrive;
#ifdef _XBOX
@@ -24,8 +24,8 @@ wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pc
#ifdef __PS3__
// 4J-PB - we need to check for a BD patch - this is going to be an issue for full DLC texture packs (Halloween)
- char *pchUsrDir=NULL;
- if(app.GetBootedFromDiscPatch() && pchBDPatchFileName!=NULL)
+ char *pchUsrDir=nullptr;
+ if(app.GetBootedFromDiscPatch() && pchBDPatchFileName!=nullptr)
{
pchUsrDir = app.GetBDUsrDirPath(pchBDPatchFileName);
wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));