aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-02 08:32:18 -0400
committerPaul Gilbert2015-07-02 08:32:18 -0400
commitdba1ab40a312b50137bfee415df95dce3c4a1184 (patch)
treeb4febd0350f4637ec92e3251fac628f5beeab674
parent1d173d4811210518c2aa8060a4a7714ad33a7fa2 (diff)
downloadscummvm-rg350-dba1ab40a312b50137bfee415df95dce3c4a1184.tar.gz
scummvm-rg350-dba1ab40a312b50137bfee415df95dce3c4a1184.tar.bz2
scummvm-rg350-dba1ab40a312b50137bfee415df95dce3c4a1184.zip
SHERLOCK: RT: Show arrow cursors when mouse is on exit zones
-rw-r--r--engines/sherlock/tattoo/tattoo_scene.cpp6
-rw-r--r--engines/sherlock/tattoo/tattoo_scene.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 5803a0ace0..a7f2a875f3 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -50,7 +50,6 @@ static bool sortImagesY(const ShapeEntry &s1, const ShapeEntry &s2) {
/*----------------------------------------------------------------*/
TattooScene::TattooScene(SherlockEngine *vm) : Scene(vm) {
- _arrowZone = -1;
_labTableScene = false;
}
@@ -58,7 +57,6 @@ bool TattooScene::loadScene(const Common::String &filename) {
TattooEngine &vm = *(TattooEngine *)_vm;
Events &events = *_vm->_events;
Music &music = *_vm->_music;
- Sound &sound = *_vm->_sound;
Talk &talk = *_vm->_talk;
TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
@@ -288,7 +286,7 @@ void TattooScene::checkBgShapes() {
void TattooScene::doBgAnimCheckCursor() {
Events &events = *_vm->_events;
- UserInterface &ui = *_vm->_ui;
+ TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
Common::Point mousePos = events.mousePos();
// If we're in Look Mode, make sure the cursor is the magnifying glass
@@ -300,7 +298,7 @@ void TattooScene::doBgAnimCheckCursor() {
if (events.getCursor() == ARROW || events.getCursor() >= EXIT_ZONES_START) {
CursorId cursorId = ARROW;
- if (ui._menuMode == STD_MODE && _arrowZone != -1 && _currentScene != 90) {
+ if (ui._menuMode == STD_MODE && ui._arrowZone != -1 && _currentScene != 90) {
for (uint idx = 0; idx < _exits.size(); ++idx) {
Exit &exit = _exits[idx];
if (exit.contains(mousePos))
diff --git a/engines/sherlock/tattoo/tattoo_scene.h b/engines/sherlock/tattoo/tattoo_scene.h
index c3d6e3b929..e198ba06e7 100644
--- a/engines/sherlock/tattoo/tattoo_scene.h
+++ b/engines/sherlock/tattoo/tattoo_scene.h
@@ -46,8 +46,6 @@ struct SceneTripEntry {
class TattooScene : public Scene {
private:
- int _arrowZone;
-private:
void doBgAnimCheckCursor();
/**