diff options
| author | Johannes Schickel | 2012-09-26 04:17:31 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-09-26 04:17:55 +0200 |
| commit | 89abab97e3124fa25eb4c7d3e8b38501747a8d17 (patch) | |
| tree | d60a833c9ed352fbe44c0b9a6b8ff43fcbc29419 /engines/tinsel | |
| parent | a6c6c74350bb673c178d9756a1625ca128d24f21 (diff) | |
| download | scummvm-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/tinsel')
| -rw-r--r-- | engines/tinsel/actors.cpp | 4 | ||||
| -rw-r--r-- | engines/tinsel/pcode.cpp | 4 | ||||
| -rw-r--r-- | engines/tinsel/saveload.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp index a784ff5788..0ba8b7cdba 100644 --- a/engines/tinsel/actors.cpp +++ b/engines/tinsel/actors.cpp @@ -319,8 +319,8 @@ static void ActorRestoredProcess(CORO_PARAM, const void *param) { CORO_BEGIN_CODE(_ctx); _ctx->pic = RestoreInterpretContext(r->pic); - - // The newly added check here specially sets the process to RES_NOT when loading a savegame. + + // The newly added check here specially sets the process to RES_NOT when loading a savegame. // This is needed particularly for the Psychiatrist scene in Discworld 1 - otherwise Rincewind // can't go upstairs without leaving the building and returning. If this patch causes problems // in other scenes, an added check for the hCode == 1174490602 could be added. diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index 6ea18c8268..04bc2856ca 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -152,7 +152,7 @@ static const byte fragment12[] = {OP_JMPTRUE | OPSIZE16, FRAGMENT_WORD(1491), OP_IMM | OPSIZE16, FRAGMENT_WORD(322), OP_LIBCALL | OPSIZE8, 46, // Give back the whistle OP_JUMP | OPSIZE16, FRAGMENT_WORD(1568)}; static const byte fragment13[] = {OP_ZERO, OP_GSTORE | OPSIZE16, FRAGMENT_WORD(306)}; -static const byte fragment14[] = {OP_LIBCALL | OPSIZE8, 58, +static const byte fragment14[] = {OP_LIBCALL | OPSIZE8, 58, OP_IMM, FRAGMENT_DWORD((42 << 23)), OP_ONE, OP_ZERO, OP_LIBCALL | OPSIZE8, 44, OP_LIBCALL | OPSIZE8, 97, OP_JUMP | OPSIZE16, FRAGMENT_WORD(2220) }; @@ -222,7 +222,7 @@ const WorkaroundEntry workaroundList[] = { // times would cause the game to crash {TINSEL_V2, true, false, Common::kPlatformUnknown, 1109294728, 0, sizeof(fragment13), fragment13}, - // DW1 PSX DEMO: Alters a script in the PSX DW1 demo to show the Idle animation scene rather than + // DW1 PSX DEMO: Alters a script in the PSX DW1 demo to show the Idle animation scene rather than // quitting the game when no user input happens for a while {TINSEL_V1, true, true, Common::kPlatformPSX, 0, 2186, sizeof(fragment14), fragment14}, diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index 518e27f02b..2ef92d853f 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -502,7 +502,7 @@ static bool DoRestore() { delete f; // Invalid header, or savegame too new -> skip it return false; } - + // Load in the data. For older savegame versions, we potentially need to load the data twice, once // for pre 1.5 savegames, and if that fails, a second time for 1.5 savegames int numInterpreters = hdr.numInterpreters; |
