diff options
| author | craigsc | 2020-01-11 12:08:21 -0800 |
|---|---|---|
| committer | craigsc | 2020-01-11 12:08:21 -0800 |
| commit | 3dd4fb16f017a8eab5c6c11fd119a397b457866e (patch) | |
| tree | 5b80b5c5038d8577c2d674a5a4742b335deca515 /graphics/fonts/winfont.h | |
| parent | f9f81ea9baecb714f26cf1c17a1b0ae58431467b (diff) | |
| parent | 5893672b80f00fced33c42e63471d68ba47d7dd4 (diff) | |
| download | scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.tar.gz scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.tar.bz2 scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'graphics/fonts/winfont.h')
| -rw-r--r-- | graphics/fonts/winfont.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/fonts/winfont.h b/graphics/fonts/winfont.h index 3354fc2381..f1c661f270 100644 --- a/graphics/fonts/winfont.h +++ b/graphics/fonts/winfont.h @@ -28,6 +28,7 @@ namespace Common { class SeekableReadStream; +class WinResources; } namespace Graphics { @@ -67,8 +68,7 @@ public: void drawChar(Surface *dst, uint32 chr, int x, int y, uint32 color) const; private: - bool loadFromPE(const Common::String &fileName, const WinFontDirEntry &dirEntry); - bool loadFromNE(const Common::String &fileName, const WinFontDirEntry &dirEntry); + bool loadFromEXE(Common::WinResources *exe, const Common::String &fileName, const WinFontDirEntry &dirEntry); uint32 getFontIndex(Common::SeekableReadStream &stream, const WinFontDirEntry &dirEntry); bool loadFromFNT(Common::SeekableReadStream &stream); |