summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-28 16:16:15 +0100
committeraap <aap@papnet.eu>2020-11-28 17:05:57 +0100
commita8035b64662e9b9fe6689ec60e5087ff95bc2672 (patch)
tree31f809fff530c5b7b8ea2a4714766d3284b0caf5 /src/core
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
downloadre3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.gz
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.bz2
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.lz
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.xz
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.zst
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CdStream.cpp2
-rw-r--r--src/core/CdStreamPosix.cpp2
-rw-r--r--src/core/Streaming.cpp1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/core/CdStream.cpp b/src/core/CdStream.cpp
index a1235930..f987dea5 100644
--- a/src/core/CdStream.cpp
+++ b/src/core/CdStream.cpp
@@ -5,7 +5,7 @@
#include "CdStream.h"
#include "rwcore.h"
#include "RwHelper.h"
-#include "MemoryHeap.h"
+#include "MemoryMgr.h"
#define CDDEBUG(f, ...) debug ("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
#define CDTRACE(f, ...) printf("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
index 35a90a74..0854d850 100644
--- a/src/core/CdStreamPosix.cpp
+++ b/src/core/CdStreamPosix.cpp
@@ -16,7 +16,7 @@
#include "CdStream.h"
#include "rwcore.h"
-#include "RwHelper.h"
+#include "MemoryMgr.h"
#define CDDEBUG(f, ...) debug ("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
#define CDTRACE(f, ...) printf("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 628d4923..a28fe39d 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -34,6 +34,7 @@
#include "main.h"
#include "Frontend.h"
#include "Font.h"
+#include "MemoryMgr.h"
#include "MemoryHeap.h"
bool CStreaming::ms_disableStreaming;