diff options
| author | aap <aap@papnet.eu> | 2019-06-30 13:37:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-30 13:37:52 +0200 |
| commit | 9b5a7cd4bb6d106e10e4502f123814f4ece44a2f (patch) | |
| tree | 3ca33433362742fad0a4342b1047f992c70602c9 /src/RwHelper.cpp | |
| parent | Merge pull request #77 from Nick007J/master (diff) | |
| parent | Cleanup project a bit (diff) | |
| download | re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.gz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.bz2 re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.lz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.xz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.zst re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.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 |