[Scummvm-git-logs] scummvm master -> 999689abff2ff819215a058e3248c1a130771bb4

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
999689abff KYRA: (LOL) - add keyboard key binding for map button


Commit: 999689abff2ff819215a058e3248c1a130771bb4
    https://github.com/scummvm/scummvm/commit/999689abff2ff819215a058e3248c1a130771bb4
Author: athrxx (athrxx at scummvm.org)
Date: 2020-08-06T15:06:28+02:00

Commit Message:
KYRA: (LOL) - add keyboard key binding for map button

Allow map display via 'm' key. The original doesn't have that, although there are keyboard controls for most other buttons.  I add this as a feature, since it's useful for controller play.

Changed paths:
    devtools/create_kyradat/create_kyradat.cpp
    devtools/create_kyradat/resources/lol_dos.h
    devtools/create_kyradat/resources/lol_dos_cd.h
    devtools/create_kyradat/resources/lol_fmtowns.h
    devtools/create_kyradat/resources/lol_pc98.h
    dists/engine-data/kyra.dat
    engines/kyra/resource/staticres.cpp


diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 034ed6d1d0..c5f7f597c3 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -45,7 +45,7 @@
 
 
 enum {
-	kKyraDatVersion = 102
+	kKyraDatVersion = 103
 };
 
 const ExtractFilename extractFilenames[] = {
diff --git a/devtools/create_kyradat/resources/lol_dos.h b/devtools/create_kyradat/resources/lol_dos.h
index dc8d9f1104..6477e8c5a0 100644
--- a/devtools/create_kyradat/resources/lol_dos.h
+++ b/devtools/create_kyradat/resources/lol_dos.h
@@ -1320,7 +1320,7 @@ static const LoLButtonDef kLoLButtonDefsDOS[95] = {
 	{ 0x0100,  20,   0,  32, 178,  22,  22, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  96,  27,  24, 0x0000,  0 },
 	{ 0x0100,   0,   0, 289,   0,  31,  28, 0x0000,  0 },
-	{ 0x0100,   0,   0, 289,  31,  31,  23, 0x0000,  0 },
+	{ 0x0100,  52,   0, 289,  31,  31,  23, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  56,  29,  24, 0x0000,  0 },
 	{ 0x1100,   0,   0, 220,  98,  43,  19, 0x0000,  0 }
 };
diff --git a/devtools/create_kyradat/resources/lol_dos_cd.h b/devtools/create_kyradat/resources/lol_dos_cd.h
index 6eee0b75d0..23a0304818 100644
--- a/devtools/create_kyradat/resources/lol_dos_cd.h
+++ b/devtools/create_kyradat/resources/lol_dos_cd.h
@@ -1385,7 +1385,7 @@ static const LoLButtonDef kLoLButtonDefsDOSCD[95] = {
 	{ 0x0100,  20,   0,  32, 178,  22,  22, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  96,  27,  24, 0x0000,  0 },
 	{ 0x0100,   0,   0, 289,   0,  31,  28, 0x0000,  0 },
-	{ 0x0100,   0,   0, 289,  31,  31,  23, 0x0000,  0 },
+	{ 0x0100,  52,   0, 289,  31,  31,  23, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  56,  29,  24, 0x0000,  0 },
 	{ 0x1100,   0,   0, 220,  98,  43,  19, 0x0000,  0 }
 };
diff --git a/devtools/create_kyradat/resources/lol_fmtowns.h b/devtools/create_kyradat/resources/lol_fmtowns.h
index f02d48c58f..5ec3af7f90 100644
--- a/devtools/create_kyradat/resources/lol_fmtowns.h
+++ b/devtools/create_kyradat/resources/lol_fmtowns.h
@@ -1174,7 +1174,7 @@ static const LoLButtonDef kLoLButtonDefsFMTowns[95] = {
 	{ 0x0100,  82,   0,  32, 178,  22,  22, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  96,  27,  24, 0x0000,  0 },
 	{ 0x0100,   0,   0, 289,   0,  31,  28, 0x0000,  0 },
-	{ 0x0100,   0,   0, 289,  31,  31,  23, 0x0000,  0 },
+	{ 0x0100,  77,   0, 289,  31,  31,  23, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  56,  29,  24, 0x0000,  0 },
 	{ 0x1100,   0,   0, 220,  98,  43,  19, 0x0000,  0 }
 };
diff --git a/devtools/create_kyradat/resources/lol_pc98.h b/devtools/create_kyradat/resources/lol_pc98.h
index f60e13111a..d22af7fbd3 100644
--- a/devtools/create_kyradat/resources/lol_pc98.h
+++ b/devtools/create_kyradat/resources/lol_pc98.h
@@ -1173,7 +1173,7 @@ static const LoLButtonDef kLoLButtonDefsPC98[95] = {
 	{ 0x0100,  20,   0,  32, 178,  22,  22, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  96,  27,  24, 0x0000,  0 },
 	{ 0x0100,   0,   0, 289,   0,  31,  28, 0x0000,  0 },
-	{ 0x0100,   0,   0, 289,  31,  31,  23, 0x0000,  0 },
+	{ 0x0100,  52,   0, 289,  31,  31,  23, 0x0000,  0 },
 	{ 0x0100,   0,   0, 291,  56,  29,  24, 0x0000,  0 },
 	{ 0x1100,   0,   0, 220,  98,  43,  19, 0x0000,  0 }
 };
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index f6c48aa678..1c5ddbbc28 100644
Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ
diff --git a/engines/kyra/resource/staticres.cpp b/engines/kyra/resource/staticres.cpp
index 343b02bb50..6fe7f917ff 100644
--- a/engines/kyra/resource/staticres.cpp
+++ b/engines/kyra/resource/staticres.cpp
@@ -39,7 +39,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 102
+#define RESFILE_VERSION 103
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {