archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-02 15:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory heap starting to work

Browse Source
This commit is contained in:
aap
2020-11-25 22:49:50 +01:00
parent 88baa9ce5f
commit 4ddc356341
8 changed files with 74 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/skel/glfw/glfw.cpp
View File

@ -40,6 +40,7 @@
#include "Sprite2d.h"
#include "AnimViewer.h"
#include "Font.h"
#include "MemoryHeap.h"
#define MAX_SUBSYSTEMS (16)
@ -277,7 +278,11 @@ psMouseSetPos(RwV2d *pos)
RwMemoryFunctions*
psGetMemoryFunctions(void)
{
#ifdef USE_CUSTOM_ALLOCATOR
return &memFuncs;
#else
return nil;
#endif
}
/*
@ -1461,6 +1466,10 @@ main(int argc, char *argv[])
RwV2d pos;
RwInt32 i;
#ifdef USE_CUSTOM_ALLOCATOR
InitMemoryMgr();
#endif
#ifndef _WIN32
struct sigaction act;
act.sa_sigaction = terminateHandler;

11
src/skel/win/win.cpp
View File

@ -97,6 +97,7 @@ static psGlobalType PsGlobal;
#include "Sprite2d.h"
#include "AnimViewer.h"
#include "Font.h"
#include "MemoryHeap.h"
VALIDATE_SIZE(psGlobalType, 0x28);
@ -304,7 +305,11 @@ psMouseSetPos(RwV2d *pos)
RwMemoryFunctions*
psGetMemoryFunctions(void)
{
#ifdef USE_CUSTOM_ALLOCATOR
return &memFuncs;
#else
return nil;
#endif
}
/*
@ -2006,7 +2011,11 @@ WinMain(HINSTANCE instance,
RwChar **argv;
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
#if 0
#ifdef USE_CUSTOM_ALLOCATOR
InitMemoryMgr();
#endif
#if 1
// TODO: make this an option somewhere
AllocConsole();
freopen("CONIN$", "r", stdin);