aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins
diff options
context:
space:
mode:
authorPaul Gilbert2012-10-23 09:07:19 +1100
committerPaul Gilbert2012-10-23 09:07:19 +1100
commit289ca6e50d32d3bfb71f7ba07973622752354017 (patch)
tree7ba485bcdae4ff37da5667cebbdc938ba62b65fc /engines/hopkins
parent1ab3d755b990cbcff7f818f88a19bb1e0aaf90e8 (diff)
downloadscummvm-rg350-289ca6e50d32d3bfb71f7ba07973622752354017.tar.gz
scummvm-rg350-289ca6e50d32d3bfb71f7ba07973622752354017.tar.bz2
scummvm-rg350-289ca6e50d32d3bfb71f7ba07973622752354017.zip
HOPKINS: Fix some more uninitialised variables
Diffstat (limited to 'engines/hopkins')
-rw-r--r--engines/hopkins/events.cpp1
-rw-r--r--engines/hopkins/hopkins.cpp1
-rw-r--r--engines/hopkins/talk.cpp2
3 files changed, 3 insertions, 1 deletions
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 94810e5c4c..8a1ebdfd7c 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -45,6 +45,7 @@ EventsManager::EventsManager() {
lItCounter = 0;
ESC_KEY = false;
btsouris = 0;
+ OLD_ICONE = 0;
_priorCounterTime = 0;
_priorFrameTime = 0;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 84836e2510..cf2b869bfa 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -49,6 +49,7 @@ HopkinsEngine::HopkinsEngine(OSystem *syst, const HopkinsGameDescription *gameDe
_menuManager.setParent(this);
_objectsManager.setParent(this);
_soundManager.setParent(this);
+ _talkManager.setParent(this);
}
HopkinsEngine::~HopkinsEngine() {
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 2ddb74ff09..608d74b006 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -955,7 +955,7 @@ void TalkManager::REPONSE(int a1, int a2) {
v3 = a2;
LABEL_2:
v15 = 0;
- if (g_PTRNUL != _vm->_globals.COUCOU) {
+ if (_vm->_globals.COUCOU != g_PTRNUL) {
v5 = _vm->_globals.COUCOU;
while (1) {
if (*v5 == 'C') {