aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-25 01:30:12 +0000
committerJohannes Schickel2009-06-25 01:30:12 +0000
commit6e299e4777b9b3653dea75ece726ccb0f1f2d617 (patch)
treea0ac9a3f82923c70127fb3c8813b890d07ff3160 /engines/kyra
parent049c9b0c8685a15c0f9d8504b3cc814ea636b965 (diff)
downloadscummvm-rg350-6e299e4777b9b3653dea75ece726ccb0f1f2d617.tar.gz
scummvm-rg350-6e299e4777b9b3653dea75ece726ccb0f1f2d617.tar.bz2
scummvm-rg350-6e299e4777b9b3653dea75ece726ccb0f1f2d617.zip
Strip trailing whitespaces and tabs.
svn-id: r41848
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/items_lol.cpp2
-rw-r--r--engines/kyra/screen.cpp4
-rw-r--r--engines/kyra/script_lol.cpp10
-rw-r--r--engines/kyra/sprites_lol.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index e75a13c870..c0ddd0c860 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -477,7 +477,7 @@ void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int objec
r = getNearestPartyMemberFromPos(x, y);
runItemScript(t->attackerId, t->item, 0x8000, r, 0);
}
- }
+ }
}
void LoLEngine::updateFlyingObject(FlyingObject *t) {
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 4c4cc51aa7..41ac81406c 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -879,7 +879,7 @@ void Screen::drawShadedBox(int x1, int y1, int x2, int y2, int color1, int color
drawClippedLine(x1 + 1, y1 + 1, x1 + 1, y2 - 1, color2);
drawClippedLine(x1, y2 - 1, x2 - 1, y2 - 1, color2);
}
- drawClippedLine(x1, y2, x2, y2, color2);
+ drawClippedLine(x1, y2, x2, y2, color2);
showMouse();
}
@@ -1132,7 +1132,7 @@ void Screen::drawCharANSI(uint8 c, int x, int y) {
uint8 charH1 = *(fnt->fontData + fnt->charHeightTableOffset + c * 2);
uint8 charH2 = *(fnt->fontData + fnt->charHeightTableOffset + c * 2 + 1);
-
+
charH0 -= charH1 + charH2;
const uint8 *src = fnt->fontData + bitmapOffset;
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index 03cd7f096a..87dd654ea6 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -1276,7 +1276,7 @@ int LoLEngine::olol_getMonsterStat(EMCState *script) {
int LoLEngine::olol_releaseMonsterShapes(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_releaseMonsterShapes(%p)", (const void *)script);
for (int i = 0; i < 3; i++)
- releaseMonsterShapes(i);
+ releaseMonsterShapes(i);
return 0;
}
@@ -1399,17 +1399,17 @@ int LoLEngine::olol_playEndSequence(EMCState *script){
if (_characters[0].id == -9)
c = 1;
else if (_characters[0].id == -5)
- c = 3;
+ c = 3;
else if (_characters[0].id == -1)
c = 2;
while (snd_updateCharacterSpeech())
delay(_tickLength);
-
+
_eventList.clear();
_screen->hideMouse();
_screen->getPalette(1).clear();
-
+
showOutro(c, (_monsterDifficulty == 2));
quitGame();
@@ -2192,7 +2192,7 @@ int LoLEngine::olol_restoreMagicShroud(EMCState *script) {
}
mov->close();
- delete mov;
+ delete mov;
delete[] fadeTab;
_screen->showMouse();
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 593d905b87..8cee1dc5fc 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -784,7 +784,7 @@ int LoLEngine::getMonsterCurFrame(MonsterInPlay *m, uint16 dirFlags) {
default:
return m->damageReceived ? 5 : m->currentSubFrame;
}
-
+
break;
default:
break;