aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2013-01-07 19:59:38 +0200
committerFilippos Karapetis2013-01-07 19:59:38 +0200
commit416463c3dab090b888bc13cecf8262470872e411 (patch)
treec20b07811fd8af5d5ecd7e902cd3cfd39be4771c
parente57c82f9dae625aec53530e6e1e8e06d6a13b533 (diff)
downloadscummvm-rg350-416463c3dab090b888bc13cecf8262470872e411.tar.gz
scummvm-rg350-416463c3dab090b888bc13cecf8262470872e411.tar.bz2
scummvm-rg350-416463c3dab090b888bc13cecf8262470872e411.zip
HOPKINS: Get rid of _disableCursorFl
-rw-r--r--engines/hopkins/objects.cpp1
-rw-r--r--engines/hopkins/objects.h1
-rw-r--r--engines/hopkins/talk.cpp4
3 files changed, 2 insertions, 4 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 25c6fe1968..ebc83520bd 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -55,7 +55,6 @@ ObjectsManager::ObjectsManager() {
_saveLoadFl = false;
SL_MODE = false;
_visibleFl = false;
- _disableCursorFl = false;
BOBTOUS = false;
my_anim = 0;
NUMZONE = 0;
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index db9b85a0d0..38f09d3548 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -80,7 +80,6 @@ public:
bool _saveLoadFl;
int SL_MODE;
bool _visibleFl;
- bool _disableCursorFl;
bool BOBTOUS;
int my_anim;
int NUMZONE;
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 94efcbe5db..3d00c441fd 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -156,7 +156,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
}
void TalkManager::PARLER_PERSO2(const Common::String &filename) {
- _vm->_objectsManager._disableCursorFl = true;
+ // TODO: The original disables the mouse cursor here
STATI = 1;
bool v7 = _vm->_globals._disableInventFl;
_vm->_globals._disableInventFl = true;
@@ -222,7 +222,7 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) {
_vm->_eventsManager.changeMouseCursor(v8);
_vm->_graphicsManager.initColorTable(145, 150, _vm->_graphicsManager._palette);
_vm->_graphicsManager.setPaletteVGA256(_vm->_graphicsManager._palette);
- _vm->_objectsManager._disableCursorFl = false;
+ // TODO: The original reenables the mouse cursor here
_vm->_globals._disableInventFl = v7;
STATI = 0;
}