aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2/controls.cpp
diff options
context:
space:
mode:
authorDavid Corrales2007-06-23 18:51:33 +0000
committerDavid Corrales2007-06-23 18:51:33 +0000
commitcacd7a28fd51d960947de88abbf30c487e66529d (patch)
treef3baa59853bfb307e452b86b9d93c4737b1fa6ab /engines/sword2/controls.cpp
parent0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff)
parent90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff)
downloadscummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'engines/sword2/controls.cpp')
-rw-r--r--engines/sword2/controls.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp
index 277ea108d9..84580c7520 100644
--- a/engines/sword2/controls.cpp
+++ b/engines/sword2/controls.cpp
@@ -26,6 +26,7 @@
*/
#include "common/stdafx.h"
+#include "common/events.h"
#include "common/rect.h"
#include "common/config-manager.h"
#include "common/system.h"
@@ -317,9 +318,9 @@ int Dialog::runModal() {
KeyboardEvent *ke = _vm->keyboardEvent();
if (ke) {
- if (ke->keycode == 27)
+ if (ke->kbd.keycode == Common::KEYCODE_ESCAPE)
setResult(0);
- else if (ke->keycode == '\n' || ke->keycode == '\r')
+ else if (ke->kbd.keycode == Common::KEYCODE_RETURN || ke->kbd.keycode == Common::KEYCODE_KP_ENTER)
setResult(1);
}
@@ -1130,13 +1131,13 @@ public:
virtual void onKey(KeyboardEvent *ke) {
if (_editable) {
- if (ke->keycode == 8)
- _parent->onAction(this, 8);
- else if (ke->ascii >= ' ' && ke->ascii <= 255) {
+ if (ke->kbd.keycode == Common::KEYCODE_BACKSPACE)
+ _parent->onAction(this, Common::KEYCODE_BACKSPACE);
+ else if (ke->kbd.ascii >= ' ' && ke->kbd.ascii <= 255) {
// Accept the character if the font renderer
// has what looks like a valid glyph for it.
- if (_fr->getCharWidth(ke->ascii))
- _parent->onAction(this, ke->ascii);
+ if (_fr->getCharWidth(ke->kbd.ascii))
+ _parent->onAction(this, ke->kbd.ascii);
}
}
}
@@ -1354,7 +1355,7 @@ void SaveRestoreDialog::onAction(Widget *widget, int result) {
drawEditBuffer(slot);
}
break;
- case 8:
+ case Common::KEYCODE_BACKSPACE:
if (_editPos > _firstPos) {
_editBuffer[_editPos - 1] = _editBuffer[_editPos];
_editBuffer[_editPos--] = 0;