[Scummvm-git-logs] scummvm master -> 0fbc07449d03e8bb8154291aa42cd392a8597aa4
sev-
sev at scummvm.org
Tue Feb 4 22:55:52 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5426608a8d DIRECTOR: LINGO: Remove obsolete warning
0fbc07449d GRAPHICS: MACGUI: Fix Mac cursors
Commit: 5426608a8dd1c44060398addb8a5cc4c15e7256d
https://github.com/scummvm/scummvm/commit/5426608a8dd1c44060398addb8a5cc4c15e7256d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-04T23:54:57+01:00
Commit Message:
DIRECTOR: LINGO: Remove obsolete warning
Changed paths:
engines/director/lingo/lingo-funcs.cpp
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index a68539b..4a962dc 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -354,8 +354,6 @@ void Lingo::func_cursor(int c) {
}
_cursorOnStack = true;
-
- warning("STUB: func_cursor(%d)", c);
}
void Lingo::func_beep(int repeats) {
Commit: 0fbc07449d03e8bb8154291aa42cd392a8597aa4
https://github.com/scummvm/scummvm/commit/0fbc07449d03e8bb8154291aa42cd392a8597aa4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-04T23:55:18+01:00
Commit Message:
GRAPHICS: MACGUI: Fix Mac cursors
Changed paths:
graphics/macgui/macwindowmanager.cpp
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index b3b87b4..7b9c048 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -53,23 +53,28 @@ static byte fillPatterns[][8] = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x
{ 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd } // kPatternDarkGray
};
+static const byte cursorPalette[] = {
+ 0, 0, 0,
+ 0xff, 0xff, 0xff
+};
+
static const byte macCursorArrow[] = {
- 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 2, 0, 2, 3, 3, 3, 3, 3, 3, 3, 3,
- 2, 0, 0, 2, 3, 3, 3, 3, 3, 3, 3,
- 2, 0, 0, 0, 2, 3, 3, 3, 3, 3, 3,
- 2, 0, 0, 0, 0, 2, 3, 3, 3, 3, 3,
- 2, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3,
- 2, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3,
- 2, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3,
- 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3,
- 2, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2,
- 2, 0, 0, 2, 0, 0, 2, 3, 3, 3, 3,
- 2, 0, 2, 3, 2, 0, 0, 2, 3, 3, 3,
- 2, 2, 3, 3, 2, 0, 0, 2, 3, 3, 3,
- 2, 3, 3, 3, 3, 2, 0, 0, 2, 3, 3,
- 3, 3, 3, 3, 3, 2, 0, 0, 2, 3, 3,
- 3, 3, 3, 3, 3, 3, 2, 2, 2, 3, 3
+ 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 1, 0, 1, 3, 3, 3, 3, 3, 3, 3, 3,
+ 1, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3,
+ 1, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3,
+ 1, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3,
+ 1, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3,
+ 1, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3,
+ 1, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3,
+ 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 1, 0, 0, 1, 0, 0, 1, 3, 3, 3, 3,
+ 1, 0, 1, 3, 1, 0, 0, 1, 3, 3, 3,
+ 1, 1, 3, 3, 1, 0, 0, 1, 3, 3, 3,
+ 1, 3, 3, 3, 3, 1, 0, 0, 1, 3, 3,
+ 3, 3, 3, 3, 3, 1, 0, 0, 1, 3, 3,
+ 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3
};
static const byte macCursorBeam[] = {
@@ -91,58 +96,58 @@ static const byte macCursorBeam[] = {
0, 0, 3, 3, 3, 0, 0, 3, 3, 3, 3,
};
static const byte macCursorCrossHair[] = {
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
};
static const byte macCursorWatch[] = {
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1,
- 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0,
- 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 0, 1, 1, 1, 1, 1, 1, 0, 1, 3,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0,
+ 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 3,
+ 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 3,
+ 3, 0, 1, 1, 1, 1, 1, 1, 0, 1, 3,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3,
};
static const byte macCursorCrossBar[] = {
- 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,
- 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0,
- 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1,
- 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1,
- 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
- 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 3, 3, 3, 0, 0, 0, 0, 3, 3, 3, 3,
+ 3, 3, 3, 0, 1, 1, 0, 0, 3, 3, 3,
+ 3, 3, 3, 0, 1, 1, 0, 0, 3, 3, 3,
+ 3, 3, 3, 0, 1, 1, 0, 0, 3, 3, 3,
+ 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 3,
+ 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0,
+ 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0,
+ 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
+ 3, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
+ 3, 3, 3, 0, 1, 1, 0, 0, 3, 3, 3,
+ 3, 3, 3, 0, 1, 1, 0, 0, 3, 3, 3,
+ 3, 3, 3, 0, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 3, 3, 0, 0, 0, 0, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
};
static void menuTimerHandler(void *refCon);
@@ -471,26 +476,32 @@ void MacWindowManager::removeFromWindowList(BaseMacWindow *target) {
/////////////////
void MacWindowManager::pushArrowCursor() {
CursorMan.pushCursor(macCursorArrow, 11, 16, 1, 1, 3);
+ CursorMan.pushCursorPalette(cursorPalette, 0, 2);
}
void MacWindowManager::pushBeamCursor() {
CursorMan.pushCursor(macCursorBeam, 11, 16, 1, 1, 3);
+ CursorMan.pushCursorPalette(cursorPalette, 0, 2);
}
void MacWindowManager::pushCrossHairCursor() {
CursorMan.pushCursor(macCursorCrossHair, 11, 16, 1, 1, 3);
+ CursorMan.pushCursorPalette(cursorPalette, 0, 2);
}
void MacWindowManager::pushCrossBarCursor() {
CursorMan.pushCursor(macCursorCrossBar, 11, 16, 1, 1, 3);
+ CursorMan.pushCursorPalette(cursorPalette, 0, 2);
}
void MacWindowManager::pushWatchCursor() {
CursorMan.pushCursor(macCursorWatch, 11, 16, 1, 1, 3);
+ CursorMan.pushCursorPalette(cursorPalette, 0, 2);
}
void MacWindowManager::popCursor() {
CursorMan.popCursor();
+ CursorMan.pushCursorPalette(cursorPalette, 0, 2);
}
///////////////////
More information about the Scummvm-git-logs
mailing list