[Scummvm-cvs-logs] scummvm master -> f1c64c2afe7d9de5ea337d61b4443376e4685ab0

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f1c64c2afe SCUMM: Fix handling of string resources in smash player for Steam mac games


Commit: f1c64c2afe7d9de5ea337d61b4443376e4685ab0
    https://github.com/scummvm/scummvm/commit/f1c64c2afe7d9de5ea337d61b4443376e4685ab0
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2015-02-03T08:51:06Z

Commit Message:
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.

Changed paths:
    engines/scumm/smush/smush_player.cpp



diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 7617fc5..2014462 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] == '#') {