diff options
| author | Thierry Crozat | 2015-02-03 08:49:26 +0000 |
|---|---|---|
| committer | Thierry Crozat | 2015-02-03 08:51:06 +0000 |
| commit | f1c64c2afe7d9de5ea337d61b4443376e4685ab0 (patch) | |
| tree | 4bbd19736adc11c9c43c8bd3511387b39a6ccd5d /engines/scumm | |
| parent | 1adcb23d71a1f1ef6c4bc3b98fb474959fd14462 (diff) | |
| download | scummvm-rg350-f1c64c2afe7d9de5ea337d61b4443376e4685ab0.tar.gz scummvm-rg350-f1c64c2afe7d9de5ea337d61b4443376e4685ab0.tar.bz2 scummvm-rg350-f1c64c2afe7d9de5ea337d61b4443376e4685ab0.zip | |
SCUMM: Fix handling of string resources in smash player for Steam mac games
The Dig Steam/mac uses LF instead of CRLF for end of line.
This fixes display of subtitles in that version. This also fixes the crash
described in bug #6796.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 7617fc541f..2014462ab7 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -115,6 +115,10 @@ public: if (data_end[-2] == '\r' && data_end[-1] == '\n' && data_end[0] == '\r' && data_end[1] == '\n') { break; } + // In Steam mac version LF is used instead of CR-LF + if (data_end[-2] == '\n' && data_end[-1] == '\n') { + break; + } // In Russian Full Throttle strings are finished with // just one pair of CR-LF if (data_end[-2] == '\r' && data_end[-1] == '\n' && data_end[0] == '#') { |