From bc7b72f13dc075c3b221941c4f182a98d689715e Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 14 Aug 2004 11:49:01 +0000
Subject: Wrong order

svn-id: r14606
---
 scumm/string.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3