aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/resource_v3.cpp7
-rw-r--r--scumm/string.cpp5
2 files changed, 7 insertions, 5 deletions
diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp
index b64ae5ad30..0b8ac8531e 100644
--- a/scumm/resource_v3.cpp
+++ b/scumm/resource_v3.cpp
@@ -184,8 +184,11 @@ void Scumm_v3::loadCharset(int no) {
File file;
char buf[20];
- sprintf(buf, "%02d.LFL", 99 - no);
-// sprintf(buf, "%02d.LFL", 98 + no);
+ if (_gameId == GID_ZAK256)
+ sprintf(buf, "%02d.LFL", 98 + no);
+ else
+ sprintf(buf, "%02d.LFL", 99 - no);
+
file.open(buf, _gameDataPath);
if (file.isOpen() == false) {
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 7759c6d77e..d871eddc3c 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -749,10 +749,9 @@ void Scumm::addStringToStack(int var) {
void Scumm::initCharset(int charsetno) {
int i;
- if (_gameId == GID_ZAK256) {
- debug(0, "initCharset: FIXME using incorrect charset");
+ // FIXME why is this required? see also Scumm_v3::loadCharset
+ if (_gameId == GID_ZAK256)
charsetno = !charsetno;
- }
if (_features & GF_SMALL_HEADER)
loadCharset(charsetno);