diff options
| author | Cameron Cawley | 2019-05-01 17:12:18 +0100 |
|---|---|---|
| committer | Filippos Karapetis | 2019-05-01 23:52:56 +0300 |
| commit | 8c2b09d919671c99be96d42bc3aeecec9222b46a (patch) | |
| tree | 23918b80332c136803fac2749a91fb3f761fe6d3 /graphics/fonts | |
| parent | 3309c574c031f9a92457b3ccedd3210db50a9706 (diff) | |
| download | scummvm-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 'graphics/fonts')
| -rw-r--r-- | graphics/fonts/winfont.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/fonts/winfont.cpp b/graphics/fonts/winfont.cpp index 141fc243e1..ec6ce6f89a 100644 --- a/graphics/fonts/winfont.cpp +++ b/graphics/fonts/winfont.cpp @@ -92,7 +92,7 @@ bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry & return false; // Let's pull out the font directory - Common::SeekableReadStream *fontDirectory = exe.getResource(Common::kNEFontDir, Common::String("FONTDIR")); + Common::SeekableReadStream *fontDirectory = exe.getResource(Common::kWinFontDir, Common::String("FONTDIR")); if (!fontDirectory) { warning("No font directory in '%s'", fileName.c_str()); return false; @@ -109,7 +109,7 @@ bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry & } // Actually go get our font now... - Common::SeekableReadStream *fontStream = exe.getResource(Common::kNEFont, fontId); + Common::SeekableReadStream *fontStream = exe.getResource(Common::kWinFont, fontId); if (!fontStream) { warning("Could not find font %d in %s", fontId, fileName.c_str()); return false; @@ -129,7 +129,7 @@ bool WinFont::loadFromPE(const Common::String &fileName, const WinFontDirEntry & } // Let's pull out the font directory - Common::SeekableReadStream *fontDirectory = exe->getResource(Common::kPEFontDir, Common::String("FONTDIR")); + Common::SeekableReadStream *fontDirectory = exe->getResource(Common::kWinFontDir, Common::String("FONTDIR")); if (!fontDirectory) { warning("No font directory in '%s'", fileName.c_str()); delete exe; @@ -148,7 +148,7 @@ bool WinFont::loadFromPE(const Common::String &fileName, const WinFontDirEntry & } // Actually go get our font now... - Common::SeekableReadStream *fontStream = exe->getResource(Common::kPEFont, fontId); + Common::SeekableReadStream *fontStream = exe->getResource(Common::kWinFont, fontId); if (!fontStream) { warning("Could not find font %d in %s", fontId, fileName.c_str()); delete exe; |