aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2016-02-13 00:11:05 +0100
committerMartin Kiewitz2016-02-13 00:11:05 +0100
commit579a46810d52535a44b8019aa4c46b7f5b88f0d6 (patch)
treeae9d8fa07cde806af1c53ff50c7369a46a3fb692 /engines
parentaf9028355294ffe569e9100c2cac02eb843b1c11 (diff)
parent98edaa799ed16d42992d3273fd80e46d9a5634b6 (diff)
downloadscummvm-rg350-579a46810d52535a44b8019aa4c46b7f5b88f0d6.tar.gz
scummvm-rg350-579a46810d52535a44b8019aa4c46b7f5b88f0d6.tar.bz2
scummvm-rg350-579a46810d52535a44b8019aa4c46b7f5b88f0d6.zip
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/event.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 126c6f2d56..c260e23021 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -44,7 +44,7 @@ static const ScancodeRow scancodeAltifyRows[] = {
{ 0x2c, "ZXCVBNM,./" }
};
-static const byte codepagemap_88591toDOS[0x80] = {
+static const byte codePageMap88591ToDOS[0x80] = {
'?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', // 0x8x
'?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', // 0x9x
'?', 0xad, 0x9b, 0x9c, '?', 0x9d, '?', 0x9e, '?', '?', 0xa6, 0xae, 0xaa, '?', '?', '?', // 0xAx
@@ -265,7 +265,7 @@ SciEvent EventManager::getScummVMEvent() {
return noEvent;
// Convert 8859-1 characters to DOS (cp850/437) for
// multilingual SCI01 games
- input.character = codepagemap_88591toDOS[input.character & 0x7f];
+ input.character = codePageMap88591ToDOS[input.character & 0x7f];
}
if (scummVMKeycode == Common::KEYCODE_TAB) {
input.character = SCI_KEY_TAB;