diff options
| -rw-r--r-- | saga/gfx.cpp | 20 | ||||
| -rw-r--r-- | saga/interface.h | 10 | ||||
| -rw-r--r-- | saga/xref.txt | 14 |
3 files changed, 32 insertions, 12 deletions
diff --git a/saga/gfx.cpp b/saga/gfx.cpp index cbf5cccc5f..08ddd57590 100644 --- a/saga/gfx.cpp +++ b/saga/gfx.cpp @@ -29,6 +29,7 @@ #include "saga/saga.h" #include "saga/gfx.h" +#include "saga/interface.h" #include "common/system.h" @@ -979,14 +980,17 @@ void Gfx::showCursor(bool state) { void Gfx::setCursor() { // Set up the mouse cursor - byte cursor_img[CURSOR_W * CURSOR_H] = { - 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 4, 0, 0, 0, - 4, 4, 4, 2, 4, 4, 4, - 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 4, 0, 0, 0, + const byte A = kITEColorLightGrey; + const byte B = kITEColorWhite; + + const byte cursor_img[CURSOR_W * CURSOR_H] = { + 0, 0, 0, A, 0, 0, 0, + 0, 0, 0, A, 0, 0, 0, + 0, 0, 0, A, 0, 0, 0, + A, A, A, B, B, B, B, + 0, 0, 0, A, 0, 0, 0, + 0, 0, 0, A, 0, 0, 0, + 0, 0, 0, A, 0, 0, 0, }; _system->setMouseCursor(cursor_img, CURSOR_W, CURSOR_H, 3, 3, 0); diff --git a/saga/interface.h b/saga/interface.h index dd82987e07..f5918d8e7f 100644 --- a/saga/interface.h +++ b/saga/interface.h @@ -92,11 +92,13 @@ struct Converse { }; enum ITEColors { - kITEColorBrightWhite = 0x1, - kITEColorGrey = 0xa, - kITEColorDarkGrey = 0xb, + kITEColorBrightWhite = 0x01, + kITEColorWhite = 0x02, + kITEColorLightGrey = 0x04, + kITEColorGrey = 0x0a, + kITEColorDarkGrey = 0x0b, kITEColorGreen = 0xba, - kITEColorBlack = 0xf, + kITEColorBlack = 0x0f, kITEColorBlue = 0x93 }; diff --git a/saga/xref.txt b/saga/xref.txt index 03b7876283..3a7ffd8dd5 100644 --- a/saga/xref.txt +++ b/saga/xref.txt @@ -96,6 +96,20 @@ Main.c ====== sceneIndexTable _scene->getSceneLUT() +Main.h +====== +BRIGHT_WHITE kITEColorBrightWhite +WHITE_02 kITEColorWhite +GREY_0A kITEColorGrey +DK_GREY_0B kITEColorDarkGrey +PITCH_BLACK kITEColorBlack +BLUE_93 kITEColorBlue +GREEB_BA kITEColorGreen + +Note that ScummVM's kITEColorLightGrey does not have any corresponding +constant in the original SAGA engine. We use it for the ITE mouse cursor. See +PtrData[] in Main.c and setCursor() in gfx.cpp + Tile.h ====== isoTile.height ISOTILE_ENTRY.tile_h |