aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1
diff options
context:
space:
mode:
authorJohannes Schickel2012-09-26 04:17:31 +0200
committerJohannes Schickel2012-09-26 04:17:55 +0200
commit89abab97e3124fa25eb4c7d3e8b38501747a8d17 (patch)
treed60a833c9ed352fbe44c0b9a6b8ff43fcbc29419 /engines/sword1
parenta6c6c74350bb673c178d9756a1625ca128d24f21 (diff)
downloadscummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.gz
scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.bz2
scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.zip
JANITORIAL: Remove trailing whitespaces.
Powered by: git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'engines/sword1')
-rw-r--r--engines/sword1/animation.cpp6
-rw-r--r--engines/sword1/objectman.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index f7add4eed2..ff3c897dba 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -69,7 +69,7 @@ static const char *const sequenceList[20] = {
};
// This is the list of the names of the PlayStation videos
-// TODO: fight.str, flashy.str,
+// TODO: fight.str, flashy.str,
static const char *const sequenceListPSX[20] = {
"e_ferr1",
"ladder1",
@@ -152,14 +152,14 @@ bool MoviePlayer::load(uint32 id) {
warning("%s:%d startFrame (%d) <= lastEnd (%d)", filename.c_str(), lineNo, startFrame, lastEnd);
continue;
}
-
+
int color = 0;
if (*ptr == '@') {
++ptr;
color = strtoul(ptr, const_cast<char **>(&ptr), 10);
while (*ptr && Common::isSpace(*ptr))
ptr++;
- }
+ }
_movieTexts.push_back(MovieText(startFrame, endFrame, ptr, color));
lastEnd = endFrame;
diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index 5d1864d58d..3e70a95699 100644
--- a/engines/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
@@ -107,7 +107,7 @@ char *ObjectMan::lockText(uint32 textId) {
warning("Missing translation for textId %u (\"%s\")", textId, text);
unlockText(textId, BS1_ENGLISH);
}
-
+
return _missingSubTitleStr;
}
return text;
@@ -164,7 +164,7 @@ char *ObjectMan::lockText(uint32 textId, uint8 lang) {
// We use the hardcoded text in this case.
if (textId == 2950145)
return const_cast<char *>(_translationId2950145[lang]);
-
+
warning("ObjectMan::lockText(%d): text number has no text lines", textId);
return NULL;
}