diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/saga/isomap.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/saga/isomap.cpp')
| -rw-r--r-- | engines/saga/isomap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp index e886f0df82..ec6b13f313 100644 --- a/engines/saga/isomap.cpp +++ b/engines/saga/isomap.cpp @@ -95,7 +95,7 @@ static const int16 directions[8][2] = { IsoMap::IsoMap(SagaEngine *vm) : _vm(vm) { _viewScroll.x = (128 - 8) * 16; - _viewScroll.x = (128 - 8) * 16 - 64; + _viewScroll.y = (128 - 8) * 16 - 64; _viewDiff = 1; } |