diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-13 01:08:50 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-13 01:08:50 +0100 |
| commit | 542a5393acae66a9add32c195939b058bf154b15 (patch) | |
| tree | 97014f1f52bd206b4481fff07cd3ded01753cf98 /src/rw | |
| parent | Merge pull request #956 from withmorten/miami (diff) | |
| download | re3-542a5393acae66a9add32c195939b058bf154b15.tar re3-542a5393acae66a9add32c195939b058bf154b15.tar.gz re3-542a5393acae66a9add32c195939b058bf154b15.tar.bz2 re3-542a5393acae66a9add32c195939b058bf154b15.tar.lz re3-542a5393acae66a9add32c195939b058bf154b15.tar.xz re3-542a5393acae66a9add32c195939b058bf154b15.tar.zst re3-542a5393acae66a9add32c195939b058bf154b15.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 cab3b68c..d3fbd1d0 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -255,7 +255,8 @@ SkinGetBonePositionsToTable(RpClump *clump, RwV3d *boneTable) parent = stack[sp--]; else parent = i; - assert(parent >= 0 && parent < numBones); + + //assert(parent >= 0 && parent < numBones); } } @@ -263,7 +264,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; @@ -277,7 +278,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; @@ -483,7 +484,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... */ |