diff options
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_hof.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/kyra_v1.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp index 00c630d3d4..83fa59a9d1 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -1550,7 +1550,7 @@ void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) { #pragma mark - -void KyraEngine_HoF::loadInvWsa(const char *filename, int run, int delayTime, int page, int sfx, int sFrame, int flags) { +void KyraEngine_HoF::loadInvWsa(const char *filename, int run_, int delayTime, int page, int sfx, int sFrame, int flags) { int wsaFlags = 1; if (flags) wsaFlags |= 2; @@ -1583,7 +1583,7 @@ void KyraEngine_HoF::loadInvWsa(const char *filename, int run, int delayTime, in _invWsa.running = true; _invWsa.timer = _system->getMillis(); - if (run) { + if (run_) { while (_invWsa.running && !skipFlag() && !shouldQuit()) { update(); _system->delayMillis(10); diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index af7e0385cc..527739f19f 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -176,6 +176,14 @@ public: protected: // Engine APIs virtual Common::Error init(); + virtual Common::Error go() = 0; + virtual Common::Error run() { + Common::Error err; + err = init(); + if (err != Common::kNoError) + return err; + return go(); + } virtual ::GUI::Debugger *getDebugger(); virtual bool hasFeature(EngineFeature f) const; virtual void pauseEngineIntern(bool pause); |