diff options
| author | Jody Northup | 2009-06-24 06:44:30 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-24 06:44:30 +0000 |
| commit | 865129a5630017f05d08e778ba1ef430c23cd55a (patch) | |
| tree | 302b20f7e4366d8e5b91cffde7420a0f719771ec /engines/scumm | |
| parent | 4a380dc0d8b1a75fa31e0b4511e03b0782b43f89 (diff) | |
| download | scummvm-rg350-865129a5630017f05d08e778ba1ef430c23cd55a.tar.gz scummvm-rg350-865129a5630017f05d08e778ba1ef430c23cd55a.tar.bz2 scummvm-rg350-865129a5630017f05d08e778ba1ef430c23cd55a.zip | |
made the cursor's pixel format a member of the cursor object, merged ____CursorFormat functions into equivalent ____Cursor functions.
svn-id: r41825
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/cursor.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 5c695e58a5..190c337c63 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -113,12 +113,17 @@ void ScummEngine_v6::setCursorTransparency(int a) { void ScummEngine::updateCursor() { int transColor = (_game.heversion >= 80) ? 5 : 255; #ifdef ENABLE_RGB_COLOR - CursorMan.replaceCursorFormat(_system->getScreenFormat()); -#endif + CursorMan.replaceCursor(_grabbedCursor, _cursor.width, _cursor.height, + _cursor.hotspotX, _cursor.hotspotY, + (_game.platform == Common::kPlatformNES ? _grabbedCursor[63] : transColor), + (_game.heversion == 70 ? 2 : 1), + _system->getScreenFormat()); +#else CursorMan.replaceCursor(_grabbedCursor, _cursor.width, _cursor.height, _cursor.hotspotX, _cursor.hotspotY, (_game.platform == Common::kPlatformNES ? _grabbedCursor[63] : transColor), (_game.heversion == 70 ? 2 : 1)); +#endif } void ScummEngine_v6::grabCursor(int x, int y, int w, int h) { |