aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorMax Horn2003-10-17 19:20:00 +0000
committerMax Horn2003-10-17 19:20:00 +0000
commit5b1c2e68b99dde553d0a1f481f4b9ce3d280b221 (patch)
treea922719f7bbe72f73074e1aaba2e9db4192b7f7d /scumm/smush
parentf5a7c671910980f60eeab2044887ab1411dfdf44 (diff)
downloadscummvm-rg350-5b1c2e68b99dde553d0a1f481f4b9ce3d280b221.tar.gz
scummvm-rg350-5b1c2e68b99dde553d0a1f481f4b9ce3d280b221.tar.bz2
scummvm-rg350-5b1c2e68b99dde553d0a1f481f4b9ce3d280b221.zip
patch #823031: Support Russian Full Throttle
svn-id: r10879
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/smush_player.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 087a8100b8..2e2e58fcb9 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -102,7 +102,12 @@ public:
char *data_end = data_start;
while (1) {
- if (data_end[-2] == '\r' && data_end[1] == '\n' && data_end[-1] == '\n' && data_end[0] == '\r') {
+ if (data_end[-2] == '\r' && data_end[-1] == '\n' && data_end[0] == '\r' && 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] == '#') {
break;
}
data_end++;
@@ -144,6 +149,7 @@ public:
if (id == _lastId) {
return _lastString;
}
+ debug(9, "StringResource::get(%d)", id);
for (int i = 0; i < _nbStrings; i++) {
if (_strings[i].id == id) {
_lastId = id;