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
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user