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/cursor.cpp | |
| 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/cursor.cpp')
| -rw-r--r-- | scumm/cursor.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp index 5eea91fd18..2c5a6f3a9e 100644 --- a/scumm/cursor.cpp +++ b/scumm/cursor.cpp @@ -157,10 +157,7 @@ void ScummEngine::setCursorFromBuffer(byte *ptr, int width, int height, int pitc #ifndef DISABLE_HE void ScummEngine_v70he::setCursorFromImg(uint img, uint room, uint imgindex) { - if (_platform == Common::kPlatformMacintosh && _heversion == 72) - _macResExtractor->setCursor(img); - else - _win32ResExtractor->setCursor(img); + _resExtractor->setCursor(img); } void ScummEngine_v90he::setDefaultCursor() { |