aboutsummaryrefslogtreecommitdiff
path: root/common/keyboard.h
diff options
context:
space:
mode:
authorTarek Soliman2011-10-12 13:42:37 -0500
committerTarek Soliman2011-10-27 10:46:21 -0500
commit2df4b5385c7ae1a2d6d703b06a3749b64f216c15 (patch)
treeb830d2e9b06d3b555c54133fa8d09ab7332ee43a /common/keyboard.h
parent719020a3e7f222f6348e01c8285d85e226919d30 (diff)
downloadscummvm-rg350-2df4b5385c7ae1a2d6d703b06a3749b64f216c15.tar.gz
scummvm-rg350-2df4b5385c7ae1a2d6d703b06a3749b64f216c15.tar.bz2
scummvm-rg350-2df4b5385c7ae1a2d6d703b06a3749b64f216c15.zip
COMMON: Remove ascii check from KeyState::operator==
ascii is used for display and text input. Operator== shouldn't be used in those cases. Besides, it breaks the keymapper for non-ascii keys like KEYCODE_LEFT
Diffstat (limited to 'common/keyboard.h')
-rw-r--r--common/keyboard.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/keyboard.h b/common/keyboard.h
index bdd0a2d4af..ead6ed427b 100644
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -292,7 +292,8 @@ struct KeyState {
}
bool operator==(const KeyState &x) const {
- return keycode == x.keycode && ascii == x.ascii && flags == x.flags;
+ // intentionally ignore ascii
+ return keycode == x.keycode && flags == x.flags;
}
};