aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorCameron Cawley2019-05-01 17:12:18 +0100
committerFilippos Karapetis2019-05-01 23:52:56 +0300
commit8c2b09d919671c99be96d42bc3aeecec9222b46a (patch)
tree23918b80332c136803fac2749a91fb3f761fe6d3 /engines
parent3309c574c031f9a92457b3ccedd3210db50a9706 (diff)
downloadscummvm-rg350-8c2b09d919671c99be96d42bc3aeecec9222b46a.tar.gz
scummvm-rg350-8c2b09d919671c99be96d42bc3aeecec9222b46a.tar.bz2
scummvm-rg350-8c2b09d919671c99be96d42bc3aeecec9222b46a.zip
COMMON: Replace NEResourceType and PEResourceType with a shared enum
Diffstat (limited to 'engines')
-rw-r--r--engines/gnap/gnap.cpp2
-rw-r--r--engines/mohawk/cursors.cpp2
-rw-r--r--engines/scumm/he/moonbase/moonbase_fow.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index 9b0015e646..aece4da004 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -233,7 +233,7 @@ Common::Error GnapEngine::run() {
error("Could not load ufos.exe");
#ifdef USE_FREETYPE2
- Common::SeekableReadStream *stream = _exe->getResource(Common::kPEFont, 2000);
+ Common::SeekableReadStream *stream = _exe->getResource(Common::kWinFont, 2000);
_font = Graphics::loadTTFFont(*stream, 24);
if (!_font)
warning("Unable to load font");
diff --git a/engines/mohawk/cursors.cpp b/engines/mohawk/cursors.cpp
index 84b1c73e04..8adcbf62ed 100644
--- a/engines/mohawk/cursors.cpp
+++ b/engines/mohawk/cursors.cpp
@@ -253,7 +253,7 @@ PECursorManager::PECursorManager(const Common::String &appName) {
return;
}
- const Common::Array<Common::WinResourceID> cursorGroups = exe.getNameList(Common::kPEGroupCursor);
+ const Common::Array<Common::WinResourceID> cursorGroups = exe.getNameList(Common::kWinGroupCursor);
_cursors.resize(cursorGroups.size());
for (uint i = 0; i < cursorGroups.size(); i++) {
diff --git a/engines/scumm/he/moonbase/moonbase_fow.cpp b/engines/scumm/he/moonbase/moonbase_fow.cpp
index 0837d9eea3..2e1265aff2 100644
--- a/engines/scumm/he/moonbase/moonbase_fow.cpp
+++ b/engines/scumm/he/moonbase/moonbase_fow.cpp
@@ -103,7 +103,7 @@ bool Moonbase::setFOWImage(int image) {
error("Cannot open file %s", _fileName.c_str());
}
- Common::SeekableReadStream *stream = _exe.getResource(Common::kPERCData, resId);
+ Common::SeekableReadStream *stream = _exe.getResource(Common::kWinRCData, resId);
if (stream->size()) {
_fowImage = (uint8 *)malloc(stream->size());