aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-08-14 11:31:36 +0000
committerTravis Howell2004-08-14 11:31:36 +0000
commit8bc615a3941d3e23c49cf7c73bf3a8257f59f5c7 (patch)
tree1dddde79302d7d075b383a42e74e1c52902de4f0 /scumm
parentacc51d2e29ce2664ca44072dd584e5ee455fa6fd (diff)
downloadscummvm-rg350-8bc615a3941d3e23c49cf7c73bf3a8257f59f5c7.tar.gz
scummvm-rg350-8bc615a3941d3e23c49cf7c73bf3a8257f59f5c7.tar.bz2
scummvm-rg350-8bc615a3941d3e23c49cf7c73bf3a8257f59f5c7.zip
Fix loadCharset failures for computer terminals in FT.
Later games use slightly different code. svn-id: r14605
Diffstat (limited to 'scumm')
-rw-r--r--scumm/string.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index a7a8d24637..62f858c645 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -589,7 +589,7 @@ int ScummEngine::addStringToStack(byte *dst, int dstSize, int var) {
void ScummEngine::initCharset(int charsetno) {
int i;
- if (!getResourceAddress(rtCharset, charsetno))
+ if ((!getResourceAddress(rtCharset, charsetno)) || (_version >= 7 && !isResourceLoaded(rtCharset, charsetno)))
loadCharset(charsetno);
_string[0]._default.charset = charsetno;