mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-08-28 07:30:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #841 from aap/master

Browse source 
start using CMemoryHeap; also some PS2 define cleanup
This commit is contained in:
aap 2020-11-28 18:52:44 +01:00 • committed by GitHub
commit c57fee38ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 720 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/skel/glfw/glfw.cpp
View file

@ -40,7 +40,7 @@
#include "Sprite2d.h"
#include "AnimViewer.h"
#include "Font.h"
#include "MemoryHeap.h"
#include "MemoryMgr.h"
#define MAX_SUBSYSTEMS (16)

5
src/skel/skeleton.cpp
View file

@ -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;
}

2
src/skel/win/win.cpp
View file

@ -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);