diff options
author | Filippos Karapetis | 2017-11-03 09:59:49 +0200 |
---|---|---|
committer | Filippos Karapetis | 2017-11-11 17:14:38 +0200 |
commit | 1f1d860797029dbe58ea4cc282ff3489768965d5 (patch) | |
tree | a29db1ca412552c0a86fa28a7c3ef0a07db93ecc /engines/drascula/drascula.cpp | |
parent | 1e1b6f7ca45eaa7911359337fd0e12fb19249e03 (diff) | |
download | scummvm-rg350-1f1d860797029dbe58ea4cc282ff3489768965d5.tar.gz scummvm-rg350-1f1d860797029dbe58ea4cc282ff3489768965d5.tar.bz2 scummvm-rg350-1f1d860797029dbe58ea4cc282ff3489768965d5.zip |
DRASCULA: Merge the floor coordinates into _walkRect
Diffstat (limited to 'engines/drascula/drascula.cpp')
-rw-r--r-- | engines/drascula/drascula.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index bb126e5307..3f840b0901 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -94,10 +94,6 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam _talkSequencesSize = 0; _numLangs = 0; feetHeight = 0; - floorX1 = 0; - floorY1 = 0; - floorX2 = 0; - floorY2 = 0; lowerLimit = 0; upperLimit = 0; trackFinal = 0; @@ -768,8 +764,8 @@ bool DrasculaEngine::verify1() { } if (doBreak == 0) { - roomX = CLIP(_mouseX, floorX1, floorX2); - roomY = CLIP(_mouseY, floorY1 + feetHeight, floorY2); + roomX = CLIP<int16>(_mouseX, _walkRect.left, _walkRect.right); + roomY = CLIP<int16>(_mouseY, _walkRect.top + feetHeight, _walkRect.bottom); startWalking(); } doBreak = 0; |