diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 01:21:04 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 01:21:04 +0100 |
commit | 8d1996833bd73271ca14a3df46633d9b2ed13052 (patch) | |
tree | daedb1622096e5bb6b8b9ec15882769b827506e1 /src/skel/win/win.cpp | |
parent | get rid of all PED_SKIN defines (diff) | |
parent | little cleanup of templates (diff) | |
download | re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.gz re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.bz2 re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.lz re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.xz re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.zst re3-8d1996833bd73271ca14a3df46633d9b2ed13052.zip |
Diffstat (limited to 'src/skel/win/win.cpp')
-rw-r--r-- | src/skel/win/win.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index a437a3b4..1fd959f2 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -98,6 +98,7 @@ static psGlobalType PsGlobal; #include "Sprite2d.h" #include "AnimViewer.h" #include "Font.h" +#include "MemoryMgr.h" VALIDATE_SIZE(psGlobalType, 0x28); @@ -309,7 +310,11 @@ psMouseSetPos(RwV2d *pos) RwMemoryFunctions* psGetMemoryFunctions(void) { +#ifdef USE_CUSTOM_ALLOCATOR + return &memFuncs; +#else return nil; +#endif } /* @@ -2009,6 +2014,10 @@ WinMain(HINSTANCE instance, } #endif +#ifdef USE_CUSTOM_ALLOCATOR + InitMemoryMgr(); +#endif + /* * Initialize the platform independent data. * This will in turn initialize the platform specific data... |