aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dists/engine-data/kyra.datbin257322 -> 257348 bytes
-rw-r--r--engines/kyra/gui_lok.cpp5
-rw-r--r--tools/create_kyradat/create_kyradat.cpp4
3 files changed, 6 insertions, 3 deletions
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index c945b7863b..6bcb6930a3 100644
--- a/dists/engine-data/kyra.dat
+++ b/dists/engine-data/kyra.dat
Binary files differ
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 9ef20ba8a3..9668ac82b5 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -371,8 +371,11 @@ void GUI_LoK::setGUILabels() {
walkspeedGarbageOffset = 0;
} else if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
// English Amiga version
- offsetOptions = 8;
+ offset = 23;
+ offsetOn = 23;
+ offsetOptions = 32;
walkspeedGarbageOffset = 2;
+ offsetMainMenu = 23;
}
assert(offset + 27 < _vm->_guiStringsSize);
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 2e53efbaff..26fb1a6eff 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -500,7 +500,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
if (g->special == kAmigaVersion) {
if (i + 1 >= size)
++entries;
- else if (!data[i+1])
+ else if (!data[i+1] && !(i & 1))
continue;
else
++entries;
@@ -616,7 +616,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
// we need to strip some aligment zeros out here
int dstPos = 0;
for (uint32 i = 0; i < size; ++i) {
- if (!data[i]) {
+ if (!data[i] && !(i & 1)) {
if (i + 1 > size)
continue;
else if (i + 1 < size && !data[i+1])