aboutsummaryrefslogtreecommitdiff
path: root/common/winexe_ne.h
diff options
context:
space:
mode:
authorcraigsc2020-01-11 12:08:21 -0800
committercraigsc2020-01-11 12:08:21 -0800
commit3dd4fb16f017a8eab5c6c11fd119a397b457866e (patch)
tree5b80b5c5038d8577c2d674a5a4742b335deca515 /common/winexe_ne.h
parentf9f81ea9baecb714f26cf1c17a1b0ae58431467b (diff)
parent5893672b80f00fced33c42e63471d68ba47d7dd4 (diff)
downloadscummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.tar.gz
scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.tar.bz2
scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'common/winexe_ne.h')
-rw-r--r--common/winexe_ne.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/common/winexe_ne.h b/common/winexe_ne.h
index 1a845864b2..118629abe1 100644
--- a/common/winexe_ne.h
+++ b/common/winexe_ne.h
@@ -38,7 +38,7 @@ class SeekableReadStream;
*
* See http://en.wikipedia.org/wiki/New_Executable for more info.
*/
-class NEResources {
+class NEResources : public WinResources {
public:
NEResources();
~NEResources();
@@ -47,10 +47,7 @@ public:
void clear();
/** Load from an EXE file. */
- bool loadFromEXE(const String &fileName);
-
- /** Load from a Windows compressed EXE file. */
- bool loadFromCompressedEXE(const String &fileName);
+ using WinResources::loadFromEXE;
/** Load from a stream. */
bool loadFromEXE(SeekableReadStream *stream);