aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMarcus Comstedt2010-01-07 15:07:36 +0000
committerMarcus Comstedt2010-01-07 15:07:36 +0000
commit40f950616397dad5833751b755c11f92f4462acb (patch)
treec678ab133e8a45d689e65985636c69706f958afa /engines
parent519e80ca8b57bb7b68a13cea6e83c0404fe0a414 (diff)
downloadscummvm-rg350-40f950616397dad5833751b755c11f92f4462acb.tar.gz
scummvm-rg350-40f950616397dad5833751b755c11f92f4462acb.tar.bz2
scummvm-rg350-40f950616397dad5833751b755c11f92f4462acb.zip
The default keycolor for mouse pointers used to be 255.
This makes sense as a default for CLUT8 modes, but not really for anything else. As part of the gsoc2009-16bit merge, the default was changed to "all ones", with extra code in the SDL backend to truncate this to the depth of the mode. However, "all ones" (white) still isn't a very useful default for RGB modes. So rather than jumping through hoops to provide a bad default, it's better to remove the default altogether. Engines which relied on the old default of 255 have been updated to specify it explicitly. svn-id: r47118
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/cursor.cpp2
-rw-r--r--engines/cine/gfx.cpp2
-rw-r--r--engines/cruise/mouse.cpp2
-rw-r--r--engines/draci/mouse.cpp4
-rw-r--r--engines/drascula/interface.cpp4
-rw-r--r--engines/sword1/mouse.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp
index b741811a68..109184e9c7 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/cursor.cpp
@@ -797,7 +797,7 @@ void AGOSEngine::initMouse() {
void AGOSEngine::drawMousePointer() {
if (getGameType() == GType_SIMON2) {
- CursorMan.replaceCursor(_simon2_cursors[_mouseCursor], 16, 16, 7, 7);
+ CursorMan.replaceCursor(_simon2_cursors[_mouseCursor], 16, 16, 7, 7, 0xFF);
} else if (getGameType() != GType_SIMON1) {
const uint16 *src;
int i, j;
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index 610afda492..e3ce658366 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -1407,7 +1407,7 @@ void setMouseCursor(int cursor) {
}
++src;
}
- CursorMan.replaceCursor(mouseCursor, 16, 16, mc->hotspotX, mc->hotspotY);
+ CursorMan.replaceCursor(mouseCursor, 16, 16, mc->hotspotX, mc->hotspotY, 0xFF);
CursorMan.replaceCursorPalette(cursorPalette, 0, 2);
currentMouseCursor = cursor;
}
diff --git a/engines/cruise/mouse.cpp b/engines/cruise/mouse.cpp
index 1dbf435b3e..521ba3a54e 100644
--- a/engines/cruise/mouse.cpp
+++ b/engines/cruise/mouse.cpp
@@ -76,7 +76,7 @@ void changeCursor(CursorType eType) {
}
++src;
}
- CursorMan.replaceCursor(mouseCursor, 16, 16, mc->hotspotX, mc->hotspotY);
+ CursorMan.replaceCursor(mouseCursor, 16, 16, mc->hotspotX, mc->hotspotY, 0xFF);
CursorMan.replaceCursorPalette(cursorPalette, 0, 2);
currentCursor = eType;
}
diff --git a/engines/draci/mouse.cpp b/engines/draci/mouse.cpp
index 28e2a84fc7..1d251d24c3 100644
--- a/engines/draci/mouse.cpp
+++ b/engines/draci/mouse.cpp
@@ -108,7 +108,7 @@ void Mouse::setCursorType(CursorType cur) {
Sprite sp(f->_data, f->_length, 0, 0, true);
CursorMan.replaceCursorPalette(_vm->_screen->getPalette(), 0, kNumColours);
CursorMan.replaceCursor(sp.getBuffer(), sp.getWidth(), sp.getHeight(),
- sp.getWidth() / 2, sp.getHeight() / 2);
+ sp.getWidth() / 2, sp.getHeight() / 2, 255);
}
void Mouse::loadItemCursor(const GameItem *item, bool highlighted) {
@@ -126,7 +126,7 @@ void Mouse::loadItemCursor(const GameItem *item, bool highlighted) {
Sprite sp(f->_data, f->_length, 0, 0, true);
CursorMan.replaceCursorPalette(_vm->_screen->getPalette(), 0, kNumColours);
CursorMan.replaceCursor(sp.getBuffer(), sp.getWidth(), sp.getHeight(),
- sp.getWidth() / 2, sp.getHeight() / 2);
+ sp.getWidth() / 2, sp.getHeight() / 2, 255);
}
} // End of namespace Draci
diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp
index 5f09542e8c..21803a8932 100644
--- a/engines/drascula/interface.cpp
+++ b/engines/drascula/interface.cpp
@@ -31,10 +31,10 @@ namespace Drascula {
void DrasculaEngine::setCursor(int cursor) {
switch (cursor) {
case kCursorCrosshair:
- CursorMan.replaceCursor((const byte *)crosshairCursor, 40, 25, 20, 17);
+ CursorMan.replaceCursor((const byte *)crosshairCursor, 40, 25, 20, 17, 255);
break;
case kCursorCurrentItem:
- CursorMan.replaceCursor((const byte *)mouseCursor, OBJWIDTH, OBJHEIGHT, 20, 17);
+ CursorMan.replaceCursor((const byte *)mouseCursor, OBJWIDTH, OBJHEIGHT, 20, 17, 255);
default:
break;
}
diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp
index 725254d76b..3df55fc7d2 100644
--- a/engines/sword1/mouse.cpp
+++ b/engines/sword1/mouse.cpp
@@ -307,7 +307,7 @@ void Mouse::animate() {
_frame = (_frame + 1) % _currentPtr->numFrames;
uint8 *ptrData = (uint8*)_currentPtr + sizeof(MousePtr);
ptrData += _frame * _currentPtr->sizeX * _currentPtr->sizeY;
- CursorMan.replaceCursor(ptrData, _currentPtr->sizeX, _currentPtr->sizeY, _currentPtr->hotSpotX, _currentPtr->hotSpotY);
+ CursorMan.replaceCursor(ptrData, _currentPtr->sizeX, _currentPtr->sizeY, _currentPtr->hotSpotX, _currentPtr->hotSpotY, 255);
}
}