aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.cpp
diff options
context:
space:
mode:
authorMax Horn2011-06-20 00:59:48 +0200
committerMax Horn2011-06-20 00:59:48 +0200
commit88913c0139ac6d1dfb356d3048702b7bc8ef4079 (patch)
treea7436d20333c28f87f2ed0bc15c743b5eb8144ee /engines/sci/sci.cpp
parent3853e76202b132e769ae149720eca931cd87104a (diff)
downloadscummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.gz
scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.bz2
scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.zip
ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting conventions. For future use, this is the command I used: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r--engines/sci/sci.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index cc9042ceb7..de1aafb8e2 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -282,7 +282,7 @@ Common::Error SciEngine::run() {
// without this games would be pretty badly broken
}
- // Show any special warnings for buggy scripts with severe game bugs,
+ // Show any special warnings for buggy scripts with severe game bugs,
// which have been patched by Sierra
if (getGameId() == GID_LONGBOW) {
// Longbow 1.0 has a buggy script which prevents the game
@@ -868,7 +868,7 @@ void SciEngine::syncIngameAudioOptions() {
_gamestate->variables[VAR_GLOBAL][90] = make_reg(0, 2); // speech
} else if (subtitlesOn && speechOn) {
// Is it a game that supports simultaneous speech and subtitles?
- if (getGameId() == GID_SQ4
+ if (getGameId() == GID_SQ4
|| getGameId() == GID_FREDDYPHARKAS
// TODO: The following need script patches for simultaneous speech and subtitles
//|| getGameId() == GID_KQ6
@@ -907,7 +907,7 @@ void SciEngine::loadMacExecutable() {
// KQ6/Freddy require the executable to load their icon bar palettes
if (hasMacIconBar())
error("Could not load Mac resource fork '%s'", filename.c_str());
-
+
// TODO: Show some sort of warning dialog saying they can't get any
// high-res Mac fonts, when we get to that point ;)
}