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/skel | |
| 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 'src/skel')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 2 | ||||
| -rw-r--r-- | src/skel/skeleton.cpp | 5 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 617fee18..56877d37 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -40,7 +40,7 @@ #include "Sprite2d.h" #include "AnimViewer.h" #include "Font.h" -#include "MemoryHeap.h" +#include "MemoryMgr.h" #define MAX_SUBSYSTEMS (16) diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp index 4780316a..3166093e 100644 --- a/src/skel/skeleton.cpp +++ b/src/skel/skeleton.cpp @@ -10,6 +10,7 @@ #include "skeleton.h" #include "platform.h" +#include "MemoryHeap.h" @@ -307,6 +308,8 @@ RsRwInitialize(void *displayID) { RwEngineOpenParams openParams; + PUSH_MEMID(MEMID_RENDER); // NB: not popped on failed return + /* * Start RenderWare... */ @@ -374,6 +377,8 @@ RsRwInitialize(void *displayID) RwTextureSetMipmapping(FALSE); RwTextureSetAutoMipmapping(FALSE); + POP_MEMID(); + return TRUE; } diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index b4897d67..5f6d662c 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -97,7 +97,7 @@ static psGlobalType PsGlobal; #include "Sprite2d.h" #include "AnimViewer.h" #include "Font.h" -#include "MemoryHeap.h" +#include "MemoryMgr.h" VALIDATE_SIZE(psGlobalType, 0x28); |