diff options
| author | aap <aap@papnet.eu> | 2020-11-28 18:52:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 18:52:44 +0100 |
| commit | c57fee38caed4cc770aa8e57b74672ca85aa0fa3 (patch) | |
| tree | d9b0a02ad6c0d81fc78b9c8f0bbb018189d92d39 /src/render | |
| parent | Make texture conversion work a bit faster (diff) | |
| parent | moved some stuff to MemoryMgr (diff) | |
| download | re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.gz re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.bz2 re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.lz re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.xz re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.zst re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/render/PlayerSkin.cpp | 1 | ||||
| -rw-r--r-- | src/render/WaterLevel.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/render/PlayerSkin.cpp b/src/render/PlayerSkin.cpp index d66f7ce4..f0fae45a 100644 --- a/src/render/PlayerSkin.cpp +++ b/src/render/PlayerSkin.cpp @@ -14,6 +14,7 @@ #include "RwHelper.h" #include "Timer.h" #include "Lights.h" +#include "MemoryMgr.h" RpClump *gpPlayerClump; float gOldFov; diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp index 6133b1d7..ecfccc90 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -21,6 +21,7 @@ #include "RenderBuffer.h" #include <rpworld.h> #include "WaterLevel.h" +#include "MemoryHeap.h" float TEXTURE_ADDU; @@ -1157,6 +1158,8 @@ CWaterLevel::AllocateBoatWakeArray() { CStreaming::MakeSpaceFor(14 * CDSTREAM_SECTOR_SIZE); + PUSH_MEMID(MEMID_STREAM); + ASSERT(ms_pWavyAtomic != NULL ); RpGeometry *wavyGeometry = RpAtomicGetGeometry(ms_pWavyAtomic); @@ -1230,6 +1233,8 @@ CWaterLevel::AllocateBoatWakeArray() RpGeometryUnlock(apGeomArray[geom]); } } + + POP_MEMID(); } void |