aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/hopkins/anim.cpp2
-rw-r--r--engines/hopkins/lines.cpp4
-rw-r--r--engines/hopkins/menu.h1
-rw-r--r--engines/hopkins/saveload.h1
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index ac15139cbd..f712b111e1 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -702,8 +702,8 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
}
}
_vm->_eventsManager._rateCounter = 0;
- int soundNumber = 0;
if (!skipFl) {
+ int soundNumber = 0;
for (;;) {
++soundNumber;
_vm->_soundManager.playAnimSound(soundNumber);
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 42de5b7d07..c6238c5a52 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -2014,9 +2014,7 @@ RouteItem *LinesManager::cityMapCarRoute(int x1, int y1, int x2, int y2) {
break;
arrDataIdx[DIR_UP] = 0;
arrLineIdx[DIR_UP] = -1;
- if (arrDelta[DIR_UP] <= delta && arrLineIdx[DIR_UP] != -1)
- break;
- if (arrDelta[DIR_DOWN] <= delta && arrLineIdx[DIR_DOWN] != -1)
+ if ((arrDelta[DIR_UP] <= delta && arrLineIdx[DIR_UP] != -1) || (arrDelta[DIR_DOWN] <= delta && arrLineIdx[DIR_DOWN] != -1))
break;
}
arrDelta[DIR_UP] = delta;
diff --git a/engines/hopkins/menu.h b/engines/hopkins/menu.h
index aeb3aa17cd..542b773f4f 100644
--- a/engines/hopkins/menu.h
+++ b/engines/hopkins/menu.h
@@ -36,6 +36,7 @@ private:
HopkinsEngine *_vm;
public:
+ MenuManager() {}
void setParent(HopkinsEngine *vm);
int menu();
diff --git a/engines/hopkins/saveload.h b/engines/hopkins/saveload.h
index 2a7806e759..8076519b89 100644
--- a/engines/hopkins/saveload.h
+++ b/engines/hopkins/saveload.h
@@ -54,6 +54,7 @@ private:
void syncSavegameData(Common::Serializer &s, int version);
void syncCharacterLocation(Common::Serializer &s, CharacterLocation &item);
public:
+ SaveLoadManager() {}
void setParent(HopkinsEngine *vm);
void initSaves();