diff options
| author | Eugene Sandulenko | 2005-05-18 15:57:16 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-05-18 15:57:16 +0000 |
| commit | 51f8aa50b15ac99903f5e4ad3c5422d5473bef85 (patch) | |
| tree | a8ce700d8bc24e0f46a6b30377d7e4e7cbb82de6 /scumm/intern.h | |
| parent | b575dba642cdc2ad9e78042c0dc9c7ea169ec735 (diff) | |
| download | scummvm-rg350-51f8aa50b15ac99903f5e4ad3c5422d5473bef85.tar.gz scummvm-rg350-51f8aa50b15ac99903f5e4ad3c5422d5473bef85.tar.bz2 scummvm-rg350-51f8aa50b15ac99903f5e4ad3c5422d5473bef85.zip | |
Combine Win32 and Mac resource extractors (used for cursors in latter HE) as
only one of them can exist at the same time. Also it saves code and adds
caching to Mac resource extractor.
svn-id: r18169
Diffstat (limited to 'scumm/intern.h')
| -rw-r--r-- | scumm/intern.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index aba640f23a..094d702a89 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -757,8 +757,7 @@ protected: #ifndef DISABLE_HE class ScummEngine_v70he : public ScummEngine_v60he { - friend class Win32ResExtractor; - friend class MacResExtractor; + friend class ResExtractor; protected: typedef void (ScummEngine_v70he::*OpcodeProcv70he)(); @@ -769,8 +768,7 @@ protected: const OpcodeEntryv70he *_opcodesv70he; - Win32ResExtractor *_win32ResExtractor; - MacResExtractor *_macResExtractor; + ResExtractor *_resExtractor; byte *_heV7RoomOffsets; |