aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-08-14 11:49:01 +0000
committerTravis Howell2004-08-14 11:49:01 +0000
commitbc7b72f13dc075c3b221941c4f182a98d689715e (patch)
tree1b788053be32c26d87d8259fec8650f9ca7e7b5a
parent8bc615a3941d3e23c49cf7c73bf3a8257f59f5c7 (diff)
downloadscummvm-rg350-bc7b72f13dc075c3b221941c4f182a98d689715e.tar.gz
scummvm-rg350-bc7b72f13dc075c3b221941c4f182a98d689715e.tar.bz2
scummvm-rg350-bc7b72f13dc075c3b221941c4f182a98d689715e.zip
Wrong order
svn-id: r14606
-rw-r--r--scumm/string.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 62f858c645..02a88b148f 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)) || (_version >= 7 && !isResourceLoaded(rtCharset, charsetno)))
+ if ((_version >= 7 && !isResourceLoaded(rtCharset, charsetno)) || !getResourceAddress(rtCharset, charsetno))
loadCharset(charsetno);
_string[0]._default.charset = charsetno;