diff options
| author | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
| commit | d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch) | |
| tree | e6e98f266610f6428c248aed6abc75e637e45231 /engines/kyra | |
| parent | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff) | |
| download | scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2 scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip | |
Fixed the spaces before tabs.
svn-id: r30667
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/screen.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sequences_v1.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sequences_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/staticres.cpp | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 87c6d4f843..4c154bf8f1 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -960,7 +960,7 @@ int KyraEngine_v1::checkForNPCScriptRun(int xpos, int ypos) { charRight = currentChar->x1 + 11; charTop = currentChar->y1 - 48; // if (!i) - // charBottom = currentChar->y2 - 16; + // charBottom = currentChar->y2 - 16; // else charBottom = currentChar->y1; diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 5f0d1a1e50..8801e8050a 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -419,7 +419,7 @@ void KyraEngine_v2::handleInput(int x, int y) { } else { int skipHandling = 0; - if (checkItemCollision(x, y) == -1) { + if (checkItemCollision(x, y) == -1) { resetGameFlag(0x1EF); skipHandling = handleInputUnkSub(x, y) ? 1 : 0; diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 546ab6f6a5..d57511509d 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -2942,7 +2942,7 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { return; } - destPage += y * 640 + x; + destPage += y * 640 + x; uint8 *src = 0, *dst = 0; if (color2 != 0x80) { diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp index 785b0b3aed..c78fdb352d 100644 --- a/engines/kyra/sequences_v1.cpp +++ b/engines/kyra/sequences_v1.cpp @@ -1126,7 +1126,7 @@ void KyraEngine_v1::seq_playCredits() { } if (*currentString == 1) { - currentString++; + currentString++; if (!_flags.isTalkie) _screen->setFont(Screen::FID_CRED6_FNT); } else { diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index 0de8522736..e1b69dec6e 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -1853,7 +1853,7 @@ void KyraEngine_v2::seq_nestedSequenceFrame(int command, int wsaNum) { _activeWSA[wsaNum].movie->setX(0); _activeWSA[wsaNum].movie->setY(0); seq_animatedSubFrame(8, 2, 7, 8, _activeWSA[wsaNum].movie->xAdd(), _activeWSA[wsaNum].movie->yAdd(), - _activeWSA[wsaNum].movie->width(), _activeWSA[wsaNum].movie->height(), 0, 2); + _activeWSA[wsaNum].movie->width(), _activeWSA[wsaNum].movie->height(), 0, 2); break; case 3: diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index df5af4ab3e..2f447b9973 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -1257,10 +1257,10 @@ void KyraEngine_v1::setupMenu() { {1, 0, 0, 0, 110, 0, 30, 64, 15, 252, 253, 5, 0, 248, 249, 250, &KyraEngine_v1::gui_controlsChangeMusic, -1, 0, 34, 32, 0, 0}, - {1, 0, 0, 0, 110, 0, 47, 64, 15, 252, 253, 5, 0, + {1, 0, 0, 0, 110, 0, 47, 64, 15, 252, 253, 5, 0, 248, 249, 250, &KyraEngine_v1::gui_controlsChangeSounds, -1, 0, 34, 49, 0, 0}, - {1, 0, 0, 0, 110, 0, 64, 64, 15, 252, 253, 5, 0, + {1, 0, 0, 0, 110, 0, 64, 64, 15, 252, 253, 5, 0, 248, 249, 250, &KyraEngine_v1::gui_controlsChangeWalk, -1, 0, 34, 66, 0, 0}, {1, 0, 0, 0, 110, 0, 81, 64, 15, 252, 253, 5, 0, |