diff options
author | Johannes Schickel | 2010-10-22 02:08:26 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-10-22 02:08:26 +0000 |
commit | 38463e61619fe1e4d2b6c59313d99c40482d7411 (patch) | |
tree | 2de315a413f3179802b1daf9c07c7bad63cadedf /engines/kyra/scene_mr.cpp | |
parent | fed894aeee8bc9cdf174e50eab9b24de8bf30a70 (diff) | |
download | scummvm-rg350-38463e61619fe1e4d2b6c59313d99c40482d7411.tar.gz scummvm-rg350-38463e61619fe1e4d2b6c59313d99c40482d7411.tar.bz2 scummvm-rg350-38463e61619fe1e4d2b6c59313d99c40482d7411.zip |
KYRA: A little refactoring (name change).
svn-id: r53695
Diffstat (limited to 'engines/kyra/scene_mr.cpp')
-rw-r--r-- | engines/kyra/scene_mr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index bd0a1fe544..95243e9d5c 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -287,7 +287,7 @@ void KyraEngine_MR::enterNewSceneUnk1(int facing, int unk1, int unk2) { } void KyraEngine_MR::enterNewSceneUnk2(int unk1) { - _unk3 = -1; + _savedMouseState = -1; if (_mainCharX == -1 && _mainCharY == -1 && !unk1) { _mainCharacter.animFrame = _characterFrameTable[_mainCharacter.facing]; updateCharacterAnim(0); @@ -300,7 +300,7 @@ void KyraEngine_MR::enterNewSceneUnk2(int unk1) { } _unk4 = 0; - _unk3 = -1; + _savedMouseState = -1; } void KyraEngine_MR::unloadScene() { @@ -696,16 +696,16 @@ int KyraEngine_MR::checkSceneChange() { int facing = 0; int process = 0; - if (_screen->getLayer(charX, charY) == 1 && _unk3 == -7) { + if (_screen->getLayer(charX, charY) == 1 && _savedMouseState == -7) { facing = 0; process = 1; - } else if (charX >= 316 && _unk3 == -6) { + } else if (charX >= 316 && _savedMouseState == -6) { facing = 2; process = 1; - } else if (charY >= 186 && _unk3 == -5) { + } else if (charY >= 186 && _savedMouseState == -5) { facing = 4; process = 1; - } else if (charX <= 4 && _unk3 == -4) { + } else if (charX <= 4 && _savedMouseState == -4) { facing = 6; process = 1; } @@ -742,7 +742,7 @@ int KyraEngine_MR::checkSceneChange() { return 1; } int KyraEngine_MR::runSceneScript1(int x, int y) { - if (y > 187 && _unk3 > -4) + if (y > 187 && _savedMouseState > -4) return 0; if (_deathHandler >= 0) return 0; |