aboutsummaryrefslogtreecommitdiff
path: root/scumm/string.cpp
diff options
context:
space:
mode:
authorMax Horn2003-04-29 10:26:35 +0000
committerMax Horn2003-04-29 10:26:35 +0000
commitb23e788b7df0476d33d5db6da9859598e51e715f (patch)
tree9a5e0679c9c274e03873a038537f45320f3c0756 /scumm/string.cpp
parentea6dace0b26f94c71b88e68abf05016a052665e6 (diff)
downloadscummvm-rg350-b23e788b7df0476d33d5db6da9859598e51e715f.tar.gz
scummvm-rg350-b23e788b7df0476d33d5db6da9859598e51e715f.tar.bz2
scummvm-rg350-b23e788b7df0476d33d5db6da9859598e51e715f.zip
unified Zak256 charset code with the rest; this *might* cause a regression should anywhere in Zak256 a charset > 1 be set; if so, tell me where exactly, and I can try to figure out a proper fix
svn-id: r7195
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r--scumm/string.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 671b64833d..929468d27b 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -753,13 +753,7 @@ void Scumm::addStringToStack(int var) {
void Scumm::initCharset(int charsetno) {
int i;
- // FIXME why is this required? see also Scumm_v3::loadCharset
- if (_gameId == GID_ZAK256)
- charsetno = !charsetno;
-
- if (_features & GF_SMALL_HEADER)
- loadCharset(charsetno);
- else if (!getResourceAddress(rtCharset, charsetno))
+ if (!getResourceAddress(rtCharset, charsetno))
loadCharset(charsetno);
_string[0].t_charset = charsetno;