diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/keyboard.h | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/keyboard.h')
| -rw-r--r-- | common/keyboard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/keyboard.h b/common/keyboard.h index 74b8775a0f..bdd0a2d4af 100644 --- a/common/keyboard.h +++ b/common/keyboard.h @@ -291,7 +291,7 @@ struct KeyState { return f == (flags & ~(KBD_NUM|KBD_CAPS|KBD_SCRL)); } - bool operator ==(const KeyState &x) const { + bool operator==(const KeyState &x) const { return keycode == x.keycode && ascii == x.ascii && flags == x.flags; } }; |