aboutsummaryrefslogtreecommitdiff
path: root/graphics/fonts
diff options
context:
space:
mode:
authorCameron Cawley2020-01-04 15:00:40 +0000
committerFilippos Karapetis2020-01-11 17:34:12 +0200
commita692905eb273ae8c33ba1351e519b93dbf10f7fd (patch)
tree8f20261edeb46bcb82c39d03f923c0c1637975dc /graphics/fonts
parent532f3826021178c3affd9dfc042f6d7b33df00ec (diff)
downloadscummvm-rg350-a692905eb273ae8c33ba1351e519b93dbf10f7fd.tar.gz
scummvm-rg350-a692905eb273ae8c33ba1351e519b93dbf10f7fd.tar.bz2
scummvm-rg350-a692905eb273ae8c33ba1351e519b93dbf10f7fd.zip
COMMON: Add a function to simplify loading Windows executables
Diffstat (limited to 'graphics/fonts')
-rw-r--r--graphics/fonts/winfont.cpp24
1 files changed, 5 insertions, 19 deletions
diff --git a/graphics/fonts/winfont.cpp b/graphics/fonts/winfont.cpp
index 6494f006b3..ad5b36ec23 100644
--- a/graphics/fonts/winfont.cpp
+++ b/graphics/fonts/winfont.cpp
@@ -77,27 +77,13 @@ static WinFontDirEntry readDirEntry(Common::SeekableReadStream &stream) {
}
bool WinFont::loadFromFON(const Common::String &fileName, const WinFontDirEntry &dirEntry) {
- Common::WinResources *exe;
-
- // First try loading via the NE code
- exe = new Common::NEResources();
- if (exe->loadFromEXE(fileName)) {
- bool ok = loadFromEXE(exe, fileName, dirEntry);
- delete exe;
- return ok;
- }
- delete exe;
+ Common::WinResources *exe = Common::WinResources::createFromEXE(fileName);
+ if (!exe)
+ return false;
- // Then try loading via the PE code
- exe = new Common::PEResources();
- if (exe->loadFromEXE(fileName)) {
- bool ok = loadFromEXE(exe, fileName, dirEntry);
- delete exe;
- return ok;
- }
+ bool ok = loadFromEXE(exe, fileName, dirEntry);
delete exe;
-
- return false;
+ return ok;
}
bool WinFont::loadFromEXE(Common::WinResources *exe, const Common::String &fileName, const WinFontDirEntry &dirEntry) {