aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2012-11-28 21:03:11 +1100
committerPaul Gilbert2012-11-28 21:03:11 +1100
commitca95da2f87cdaa9a228b4d8d22a4a0334d0db2ce (patch)
tree82e08e35bc974f966cb4e0797e4d6226dd2a7b84 /engines
parentef90135bb96f43b01ae8d6a8c57b901c56f23872 (diff)
downloadscummvm-rg350-ca95da2f87cdaa9a228b4d8d22a4a0334d0db2ce.tar.gz
scummvm-rg350-ca95da2f87cdaa9a228b4d8d22a4a0334d0db2ce.tar.bz2
scummvm-rg350-ca95da2f87cdaa9a228b4d8d22a4a0334d0db2ce.zip
HOPKINS: Fix for character select icons appearing on the map screen
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/dialogs.cpp3
-rw-r--r--engines/hopkins/dialogs.h1
-rw-r--r--engines/hopkins/talk.cpp6
3 files changed, 4 insertions, 6 deletions
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index d30cdafafa..645f06dc65 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -36,7 +36,6 @@
namespace Hopkins {
DialogsManager::DialogsManager() {
- DESACTIVE_INVENT = false;
INVENTFLAG = false;
AFFINVEN = false;
VIRE_INVENT = false;
@@ -474,7 +473,7 @@ LABEL_7:
}
void DialogsManager::INVENT_ANIM() {
- if (!DESACTIVE_INVENT) {
+ if (!_vm->_globals.DESACTIVE_INVENT) {
if (_vm->_objectsManager.FLAG_VISIBLE_EFFACE && !_vm->_objectsManager.FLAG_VISIBLE) {
_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_objectsManager.I_old_x, 27, 48, 38,
_vm->_graphicsManager.VESA_BUFFER, _vm->_objectsManager.I_old_x, 27);
diff --git a/engines/hopkins/dialogs.h b/engines/hopkins/dialogs.h
index 3f4cdfadbb..19c7faae1f 100644
--- a/engines/hopkins/dialogs.h
+++ b/engines/hopkins/dialogs.h
@@ -38,7 +38,6 @@ class DialogsManager {
private:
HopkinsEngine *_vm;
public:
- bool DESACTIVE_INVENT;
bool INVENTFLAG;
bool AFFINVEN;
bool VIRE_INVENT;
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 9642ed1ec1..6bb0110dc5 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -198,8 +198,8 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
void TalkManager::PARLER_PERSO2(const Common::String &filename) {
_vm->_objectsManager.DESACTIVE_CURSOR = 1;
STATI = 1;
- byte v7 = _vm->_dialogsManager.DESACTIVE_INVENT;
- _vm->_dialogsManager.DESACTIVE_INVENT = 1;
+ bool v7 = _vm->_globals.DESACTIVE_INVENT;
+ _vm->_globals.DESACTIVE_INVENT = 1;
BUFFERPERSO = _vm->_fileManager.RECHERCHE_CAT(filename, 5);
TAILLEPERSO = _vm->_globals.CAT_TAILLE;
if (BUFFERPERSO == g_PTRNUL) {
@@ -265,7 +265,7 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) {
_vm->_graphicsManager.INIT_TABLE(145, 150, _vm->_graphicsManager.Palette);
_vm->_graphicsManager.setpal_vga256(_vm->_graphicsManager.Palette);
_vm->_objectsManager.DESACTIVE_CURSOR = 0;
- _vm->_dialogsManager.DESACTIVE_INVENT = v7;
+ _vm->_globals.DESACTIVE_INVENT = v7;
STATI = 0;
}