aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/vkeybd/virtual-keyboard-gui.cpp4
-rw-r--r--common/system.h2
-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
-rw-r--r--graphics/cursorman.h6
-rw-r--r--gui/GuiManager.cpp4
10 files changed, 16 insertions, 16 deletions
diff --git a/backends/vkeybd/virtual-keyboard-gui.cpp b/backends/vkeybd/virtual-keyboard-gui.cpp
index 316e2ac450..ad9dd9f638 100644
--- a/backends/vkeybd/virtual-keyboard-gui.cpp
+++ b/backends/vkeybd/virtual-keyboard-gui.cpp
@@ -444,7 +444,7 @@ void VirtualKeyboardGUI::setupCursor() {
};
CursorMan.pushCursorPalette(palette, 0, 4);
- CursorMan.pushCursor(NULL, 0, 0, 0, 0);
+ CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
CursorMan.showMouse(true);
}
@@ -458,7 +458,7 @@ void VirtualKeyboardGUI::animateCursor() {
}
}
- CursorMan.replaceCursor(_cursor, 16, 16, 7, 7);
+ CursorMan.replaceCursor(_cursor, 16, 16, 7, 7, 255);
_cursorAnimateTimer = time;
_cursorAnimateCounter = (_cursorAnimateCounter + 1) % 4;
diff --git a/common/system.h b/common/system.h
index 9790b09dd8..1e1ee5d886 100644
--- a/common/system.h
+++ b/common/system.h
@@ -779,7 +779,7 @@ public:
* @param cursorTargetScale scale factor which cursor is designed for
* @param format pointer to the pixel format which cursor graphic uses
*/
- virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL) = 0;
+ virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL) = 0;
/**
* Replace the specified range of cursor the palette with new colors.
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);
}
}
diff --git a/graphics/cursorman.h b/graphics/cursorman.h
index 3536f27f9e..e0f9fcda2d 100644
--- a/graphics/cursorman.h
+++ b/graphics/cursorman.h
@@ -72,7 +72,7 @@ public:
* useful to push a "dummy" cursor and modify it later. The
* cursor will be added to the stack, but not to the backend.
*/
- void pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1, const Graphics::PixelFormat *format = NULL);
+ void pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int targetScale = 1, const Graphics::PixelFormat *format = NULL);
/**
* Pop a cursor from the stack, and restore the previous one to the
@@ -95,7 +95,7 @@ public:
* @param format a pointer to the pixel format which the cursor graphic uses,
* CLUT8 will be used if this is NULL or not specified.
*/
- void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1, const Graphics::PixelFormat *format = NULL);
+ void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int targetScale = 1, const Graphics::PixelFormat *format = NULL);
/**
* Pop all of the cursors and cursor palettes from their respective stacks.
@@ -180,7 +180,7 @@ private:
uint _size;
- Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1, const Graphics::PixelFormat *format = NULL);
+ Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int targetScale = 1, const Graphics::PixelFormat *format = NULL);
~Cursor();
};
diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp
index b97a62109b..8cf71a1331 100644
--- a/gui/GuiManager.cpp
+++ b/gui/GuiManager.cpp
@@ -412,7 +412,7 @@ void GuiManager::setupCursor() {
};
CursorMan.pushCursorPalette(palette, 0, 4);
- CursorMan.pushCursor(NULL, 0, 0, 0, 0);
+ CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
CursorMan.showMouse(true);
}
@@ -430,7 +430,7 @@ void GuiManager::animateCursor() {
}
}
- CursorMan.replaceCursor(_cursor, 16, 16, 7, 7);
+ CursorMan.replaceCursor(_cursor, 16, 16, 7, 7, 255);
_cursorAnimateTimer = time;
_cursorAnimateCounter = (_cursorAnimateCounter + 1) % 4;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 20:46:37 +0000