diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-13 12:22:31 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-13 12:22:31 +0100 |
| commit | 57201187de74da42437dfa984a6cd36fe663a5e4 (patch) | |
| tree | 303a3e4ab297c1dcf0cb81236f012db96ac5f78d /src/rw | |
| parent | Make cmake files more generic (diff) | |
| download | re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.gz re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.bz2 re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.lz re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.xz re3-57201187de74da42437dfa984a6cd36fe663a5e4.tar.zst re3-57201187de74da42437dfa984a6cd36fe663a5e4.zip | |
Diffstat (limited to 'src/rw')
| -rw-r--r-- | src/rw/MemoryMgr.cpp | 2 | ||||
| -rw-r--r-- | src/rw/RwHelper.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/rw/MemoryMgr.cpp b/src/rw/MemoryMgr.cpp index e2f6f144..2379692c 100644 --- a/src/rw/MemoryMgr.cpp +++ b/src/rw/MemoryMgr.cpp @@ -93,7 +93,7 @@ MemoryMgrFree(void *ptr) void * RwMallocAlign(RwUInt32 size, RwUInt32 align) { -#ifdef FIX_BUGS +#if defined (FIX_BUGS) || defined(FIX_BUGS_64) uintptr ptralign = align-1; void *mem = (void *)MemoryMgrMalloc(size + sizeof(uintptr) + ptralign); diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp index dd356b96..d004656c 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -291,7 +291,8 @@ SkinGetBonePositionsToTable(RpClump *clump, RwV3d *boneTable) parent = stack[sp--]; else parent = i; - assert(parent >= 0 && parent < numBones); + + //assert(parent >= 0 && parent < numBones); } } @@ -299,7 +300,7 @@ RpHAnimAnimation* HAnimAnimationCreateForHierarchy(RpHAnimHierarchy *hier) { int i; -#ifdef FIX_BUGS +#if defined FIX_BUGS || defined LIBRW int numNodes = hier->numNodes*2; // you're supposed to have at least two KFs per node #else int numNodes = hier->numNodes; @@ -313,7 +314,7 @@ HAnimAnimationCreateForHierarchy(RpHAnimHierarchy *hier) frame->q.real = 1.0f; frame->q.imag.x = frame->q.imag.y = frame->q.imag.z = 0.0f; frame->t.x = frame->t.y = frame->t.z = 0.0f; -#ifdef FIX_BUGS +#if defined FIX_BUGS || defined LIBRW // times are subtracted and divided giving NaNs // so they can't both be 0 frame->time = i/hier->numNodes; @@ -401,7 +402,7 @@ CameraSize(RwCamera * camera, RwRect * rect, RwRaster *zRaster; // BUG: game just changes camera raster's sizes, but this is a hack -#ifdef FIX_BUGS +#if defined FIX_BUGS || defined LIBRW /* * Destroy rasters... */ |