diff options
| author | Max Horn | 2009-03-01 04:30:55 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-01 04:30:55 +0000 |
| commit | 3fcbda829a2aa17cbaf6423d34f69214b91b0e6c (patch) | |
| tree | c726a8bcaa9f79bc5a79f3adaf5f32727b2048af /engines/kyra/kyra_hof.cpp | |
| parent | d0c2484502d195d05676065febe488393b490be5 (diff) | |
| download | scummvm-rg350-3fcbda829a2aa17cbaf6423d34f69214b91b0e6c.tar.gz scummvm-rg350-3fcbda829a2aa17cbaf6423d34f69214b91b0e6c.tar.bz2 scummvm-rg350-3fcbda829a2aa17cbaf6423d34f69214b91b0e6c.zip | |
Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors
svn-id: r39002
Diffstat (limited to 'engines/kyra/kyra_hof.cpp')
| -rw-r--r-- | engines/kyra/kyra_hof.cpp | 4 |
1 files changed, 2 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); |