[Scummvm-cvs-logs] scummvm master -> dba1ab40a312b50137bfee415df95dce3c4a1184
dreammaster
dreammaster at scummvm.org
Thu Jul 2 14:33:23 CEST 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dba1ab40a3 SHERLOCK: RT: Show arrow cursors when mouse is on exit zones
Commit: dba1ab40a312b50137bfee415df95dce3c4a1184
https://github.com/scummvm/scummvm/commit/dba1ab40a312b50137bfee415df95dce3c4a1184
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-02T08:32:18-04:00
Commit Message:
SHERLOCK: RT: Show arrow cursors when mouse is on exit zones
Changed paths:
engines/sherlock/tattoo/tattoo_scene.cpp
engines/sherlock/tattoo/tattoo_scene.h
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 5803a0a..a7f2a87 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 c3d6e3b..e198ba0 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();
/**
More information about the Scummvm-git-logs
mailing list