aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-04-23 17:58:52 +0000
committerMax Horn2006-04-23 17:58:52 +0000
commit78dfa1f28062378b98b204e9e10c4a8f182cf4c9 (patch)
treeaa090c100ac2f56ad1a9a8ac11ffb21d8b023a91
parent0891a91acca1af6fbe418ee555a2341cb737a247 (diff)
downloadscummvm-rg350-78dfa1f28062378b98b204e9e10c4a8f182cf4c9.tar.gz
scummvm-rg350-78dfa1f28062378b98b204e9e10c4a8f182cf4c9.tar.bz2
scummvm-rg350-78dfa1f28062378b98b204e9e10c4a8f182cf4c9.zip
Moved ScummEngine_v5 from cursor.cpp to scumm.cpp (seems to be more natural, even though it inits some cursor related stuff)
svn-id: r22114
-rw-r--r--engines/scumm/cursor.cpp30
-rw-r--r--engines/scumm/scumm.cpp30
2 files changed, 30 insertions, 30 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index fd0d2a90f4..21e1b6a746 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -46,26 +46,6 @@ static const byte default_cursor_colors[4] = {
};
-static const uint16 default_cursor_images[4][16] = {
- /* cross-hair */
- { 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0000, 0x7e3f,
- 0x0000, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0000 },
- /* hourglass */
- { 0x0000, 0x7ffe, 0x6006, 0x300c, 0x1818, 0x0c30, 0x0660, 0x03c0,
- 0x0660, 0x0c30, 0x1998, 0x33cc, 0x67e6, 0x7ffe, 0x0000, 0x0000 },
- /* arrow */
- { 0x0000, 0x4000, 0x6000, 0x7000, 0x7800, 0x7c00, 0x7e00, 0x7f00,
- 0x7f80, 0x78c0, 0x7c00, 0x4600, 0x0600, 0x0300, 0x0300, 0x0180 },
- /* hand */
- { 0x1e00, 0x1200, 0x1200, 0x1200, 0x1200, 0x13ff, 0x1249, 0x1249,
- 0xf249, 0x9001, 0x9001, 0x9001, 0x8001, 0x8001, 0x8001, 0xffff },
-};
-
-static const byte default_cursor_hotspots[10] = {
- 8, 7, 8, 7, 1, 1, 5, 0,
- 8, 7, //zak256
-};
-
static const uint16 default_he_cursor[64] = {
0x0000, 0x0000, 0x3800, 0x0000, 0x7e00, 0x0000, 0x5f80, 0x0000,
0x5fe0, 0x0000, 0x2ff8, 0x0000, 0x27fe, 0x0000, 0x17ff, 0x8000,
@@ -93,16 +73,6 @@ static const byte default_v6_cursor[] = {
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
};
-ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr)
- : ScummEngine(syst, dr) {
-
- for (int i = 0; i < 4; i++) {
- memcpy(_cursorImages[i], default_cursor_images[i], 32);
- }
- memcpy(_cursorHotspots, default_cursor_hotspots, 8);
-}
-
-
void ScummEngine::setupCursor() {
_cursor.animate = 1;
}
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 7715497ef6..b3b586ad91 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -712,6 +712,36 @@ ScummEngine::~ScummEngine() {
delete _debugger;
}
+ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr)
+ : ScummEngine(syst, dr) {
+
+ static const uint16 default_cursor_images[4][16] = {
+ /* cross-hair */
+ { 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0000, 0x7e3f,
+ 0x0000, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0000 },
+ /* hourglass */
+ { 0x0000, 0x7ffe, 0x6006, 0x300c, 0x1818, 0x0c30, 0x0660, 0x03c0,
+ 0x0660, 0x0c30, 0x1998, 0x33cc, 0x67e6, 0x7ffe, 0x0000, 0x0000 },
+ /* arrow */
+ { 0x0000, 0x4000, 0x6000, 0x7000, 0x7800, 0x7c00, 0x7e00, 0x7f00,
+ 0x7f80, 0x78c0, 0x7c00, 0x4600, 0x0600, 0x0300, 0x0300, 0x0180 },
+ /* hand */
+ { 0x1e00, 0x1200, 0x1200, 0x1200, 0x1200, 0x13ff, 0x1249, 0x1249,
+ 0xf249, 0x9001, 0x9001, 0x9001, 0x8001, 0x8001, 0x8001, 0xffff },
+ };
+
+ static const byte default_cursor_hotspots[10] = {
+ 8, 7, 8, 7, 1, 1, 5, 0,
+ 8, 7, //zak256
+ };
+
+
+ for (int i = 0; i < 4; i++) {
+ memcpy(_cursorImages[i], default_cursor_images[i], 32);
+ }
+ memcpy(_cursorHotspots, default_cursor_hotspots, 8);
+}
+
ScummEngine_v4::ScummEngine_v4(OSystem *syst, const DetectorResult &dr)
: ScummEngine_v5(syst, dr) {
_resourceHeaderSize = 6;