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:
@@ -38,13 +38,13 @@ RegionFile *RegionFileCache::_getRegionFile(ConsoleSaveFile *saveFile, const wst
|
||||
}
|
||||
MemSect(0);
|
||||
|
||||
RegionFile *ref = NULL;
|
||||
RegionFile *ref = nullptr;
|
||||
auto it = cache.find(file);
|
||||
if( it != cache.end() )
|
||||
ref = it->second;
|
||||
|
||||
// 4J Jev, put back in.
|
||||
if (ref != NULL)
|
||||
if (ref != nullptr)
|
||||
{
|
||||
return ref;
|
||||
}
|
||||
@@ -72,7 +72,7 @@ void RegionFileCache::_clear() // 4J - TODO was synchronized
|
||||
for(auto& it : cache)
|
||||
{
|
||||
RegionFile *regionFile = it.second;
|
||||
if (regionFile != NULL)
|
||||
if (regionFile != nullptr)
|
||||
{
|
||||
regionFile->close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user