diff options
| author | Torbjörn Andersson | 2006-05-20 10:59:25 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-05-20 10:59:25 +0000 |
| commit | 6cdd98b6179954a6ccfc40a9db5bf106a3a9b9e1 (patch) | |
| tree | ba2f0a1361f04b6ec44b12d62326786e2c8f24b0 /engines/scumm | |
| parent | 1c7c0039b5483919387943625a04646c5b6b0754 (diff) | |
| download | scummvm-rg350-6cdd98b6179954a6ccfc40a9db5bf106a3a9b9e1.tar.gz scummvm-rg350-6cdd98b6179954a6ccfc40a9db5bf106a3a9b9e1.tar.bz2 scummvm-rg350-6cdd98b6179954a6ccfc40a9db5bf106a3a9b9e1.zip | |
After the GUI has finished, restore the old cursor palette (if any). For this
to work, cursor palette now has to be set using the new "palette manager". See
graphics/paletteman.cpp
svn-id: r22543
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/cursor.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/he/resource_he.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index aabcbee482..2e624144ad 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -23,6 +23,7 @@ #include "common/stdafx.h" #include "common/system.h" #include "common/util.h" +#include "graphics/paletteman.h" #include "scumm/bomp.h" #include "scumm/charset.h" #include "scumm/intern.h" @@ -176,8 +177,7 @@ void ScummEngine_v70he::setDefaultCursor() { // Since white color position is not guaranteed // we setup our own palette if supported by backend - if (_system->hasFeature(OSystem::kFeatureCursorHasPalette)) - _system->setCursorPalette(palette, 0xfe, 2); + PaletteMan.replaceCursorPalette(palette, 0xfe, 2); updateCursor(); } diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index dadc6ea7b7..8cbb2f263f 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -33,6 +33,7 @@ #include "scumm/he/sound_he.h" #include "sound/wave.h" +#include "graphics/paletteman.h" #include "common/stream.h" #include "common/system.h" @@ -106,8 +107,8 @@ void ResExtractor::setCursor(int id) { cc->last_used = g_system->getMillis(); } - if (_vm->_system->hasFeature(OSystem::kFeatureCursorHasPalette) && cc->palette) - _vm->_system->setCursorPalette(cc->palette, 0, cc->palSize); + if (cc->palette) + PaletteMan.replaceCursorPalette(cc->palette, 0, cc->palSize); _vm->setCursorHotspot(cc->hotspot_x, cc->hotspot_y); _vm->setCursorFromBuffer(cc->bitmap, cc->w, cc->h, cc->w); |