diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 15:21:58 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 15:21:58 +0200 |
| commit | 7c6b291860fd415f79067fc7058f11ffa58fdf10 (patch) | |
| tree | 15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/RwHelper.cpp | |
| parent | Reactivated Store(Restore)StuffIn(From)Mem, fixed bugs (diff) | |
| parent | Merge pull request #78 from ShFil119/cleanup (diff) | |
| download | re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.gz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.bz2 re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.lz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.xz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.zst re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.zip | |
Diffstat (limited to 'src/RwHelper.cpp')
| -rw-r--r-- | src/RwHelper.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/RwHelper.cpp b/src/RwHelper.cpp index 3c198272..8dade266 100644 --- a/src/RwHelper.cpp +++ b/src/RwHelper.cpp @@ -1,7 +1,7 @@ #define WITHD3D #include "common.h" #include "patcher.h" -#include "TimeCycle.h" +#include "Timecycle.h" #include "skeleton.h" void * @@ -9,11 +9,11 @@ RwMallocAlign(RwUInt32 size, RwUInt32 align) { void *mem = (void *)malloc(size + align); - ASSERT(mem != NULL); + ASSERT(mem != nil); void *addr = (void *)((((RwUInt32)mem) + align) & ~(align - 1)); - ASSERT(addr != NULL); + ASSERT(addr != nil); *(((void **)addr) - 1) = mem; @@ -23,11 +23,11 @@ RwMallocAlign(RwUInt32 size, RwUInt32 align) void RwFreeAlign(void *mem) { - ASSERT(mem != NULL); + ASSERT(mem != nil); void *addr = *(((void **)mem) - 1); - ASSERT(addr != NULL); + ASSERT(addr != nil); free(addr); } @@ -283,7 +283,7 @@ CameraDestroy(RwCamera *camera) RwRasterDestroy(raster); - if ((tmpRaster != NULL) && (tmpRaster != raster)) + if ((tmpRaster != nil) && (tmpRaster != raster)) { RwRasterDestroy(tmpRaster); } @@ -296,7 +296,7 @@ CameraDestroy(RwCamera *camera) RwRasterDestroy(raster); - if ((tmpRaster != NULL) && (tmpRaster != raster)) + if ((tmpRaster != nil) && (tmpRaster != raster)) { RwRasterDestroy(tmpRaster); } @@ -344,7 +344,7 @@ CameraCreate(RwInt32 width, RwInt32 height, RwBool zBuffer) /* if we're here then an error must have occurred so clean up */ CameraDestroy(camera); - return (NULL); + return (nil); } STARTPATCHES |