diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/kyra_v2.cpp | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index e8cb9b4370..75b568a00a 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -121,7 +121,7 @@ KyraEngine_v2::~KyraEngine_v2() { delete[] _animObjects; - for (Common::Array<const Opcode*>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i) + for (Common::Array<const Opcode *>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i) delete *i; _opcodesAnimation.clear(); @@ -162,8 +162,8 @@ void KyraEngine_v2::delay(uint32 amount, bool updateGame, bool isMainLoop) { } bool KyraEngine_v2::checkSpecialSceneExit(int num, int x, int y) { - if (_specialExitTable[0+num] > x || _specialExitTable[5+num] > y || - _specialExitTable[10+num] < x || _specialExitTable[15+num] < y) + if (_specialExitTable[0 + num] > x || _specialExitTable[5 + num] > y || + _specialExitTable[10 + num] < x || _specialExitTable[15 + num] < y) return false; return true; } |