aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorGregory Montoir2004-05-05 18:03:41 +0000
committerGregory Montoir2004-05-05 18:03:41 +0000
commit0637bb70a7db21e5c2db49d09ec878cfc0c900db (patch)
tree643701b29060a483781ca26b1b62958acc91ab42 /queen
parent148872d1fd622092cb7975d414bb6f161d0801ef (diff)
downloadscummvm-rg350-0637bb70a7db21e5c2db49d09ec878cfc0c900db.tar.gz
scummvm-rg350-0637bb70a7db21e5c2db49d09ec878cfc0c900db.tar.bz2
scummvm-rg350-0637bb70a7db21e5c2db49d09ec878cfc0c900db.zip
make use of OSystem::setMouseCursor() change
svn-id: r13792
Diffstat (limited to 'queen')
-rw-r--r--queen/display.cpp17
-rw-r--r--queen/display.h2
2 files changed, 1 insertions, 18 deletions
diff --git a/queen/display.cpp b/queen/display.cpp
index f8051db821..5586f8a0ee 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -61,8 +61,6 @@ Display::Display(QueenEngine *vm, OSystem *system)
_backdropBuf = (uint8 *)calloc(BACKDROP_W * BACKDROP_H, sizeof(uint8));
#endif
- memset(_mousePtr, 0, sizeof(_mousePtr));
-
_fullRefresh = 1;
_dirtyBlocksWidth = SCREEN_W / D_BLOCK_W;
_dirtyBlocksHeight = SCREEN_H / D_BLOCK_H;
@@ -789,20 +787,7 @@ void Display::setDirtyBlock(uint16 x, uint16 y, uint16 w, uint16 h) {
}
void Display::setMouseCursor(uint8 *buf, uint16 w, uint16 h) {
- assert(w == 14 && h == 14);
- uint16 size = 14 * 14;
- memcpy(_mousePtr, buf, size);
- // change transparency color to match the one expected by the backend (0xFF)
- uint8 *p = _mousePtr;
- while (size--) {
- if (*p == 255) {
- *p = 254;
- } else if (*p == 0) {
- *p = 255;
- }
- ++p;
- }
- _system->setMouseCursor(_mousePtr, 14, 14, 1, 1);
+ _system->setMouseCursor(buf, w, h, 1, 1, 0);
}
void Display::showMouseCursor(bool show) {
diff --git a/queen/display.h b/queen/display.h
index 212afde1e1..af3812d356 100644
--- a/queen/display.h
+++ b/queen/display.h
@@ -152,8 +152,6 @@ private:
uint8 *_panelBuf;
uint8 *_backdropBuf;
- uint8 _mousePtr[14 * 14];
-
uint8 _fullRefresh;
uint8 *_dirtyBlocks;
uint16 _dirtyBlocksWidth, _dirtyBlocksHeight;