aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-05-14 21:51:36 +0000
committerFilippos Karapetis2009-05-14 21:51:36 +0000
commit61d9a42c56523388dc22c581c63c5ad0615ff750 (patch)
treee2031c65e72f9f3ac1d21fb6a8e031a4732f84d8 /engines
parent7fd6a22d72c926b1af3a569b9ec5f8102ad6db82 (diff)
downloadscummvm-rg350-61d9a42c56523388dc22c581c63c5ad0615ff750.tar.gz
scummvm-rg350-61d9a42c56523388dc22c581c63c5ad0615ff750.tar.bz2
scummvm-rg350-61d9a42c56523388dc22c581c63c5ad0615ff750.zip
Fixed the detection entry for SQ3 Amiga, and added a special case for cursor hiding in SQ5
svn-id: r40574
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/detection.cpp4
-rw-r--r--engines/sci/gfx/operations.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index b822e4ac09..32bd94c040 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -2554,9 +2554,9 @@ static const struct SciGameDescription SciGameDescriptions[] = {
{"resource.003", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 746496},
{"resource.004", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 761984},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0},
- 0,
+ GF_FOR_SCI0_BEFORE_502,
SCI_VERSION_0,
- SCI_VERSION(0, 000, 685) // TODO: best bet, exe seems packed
+ SCI_VERSION(0, 000, 453)
},
// Space Quest 3 - German Amiga
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index 29606f5d7f..7977f6db97 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -1214,7 +1214,7 @@ int gfxop_set_pointer_view(GfxState *state, int nr, int loop, int cel, Common::P
}
// Eco Quest 1 uses a 1x1 transparent cursor to hide the cursor from the user. Some scalers don't seem to support this.
- if (new_pointer->width < 2 || new_pointer->height < 2)
+ if (new_pointer->width < 2 || new_pointer->height < 2 || new_pointer->data_size <= 0)
return _gfxop_set_pointer(state, NULL, NULL);
if (hotspot)