diff options
| author | Einar Johan Trøan Sømåen | 2012-05-11 00:09:22 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 12:42:10 +0200 |
| commit | 2e12f9fe4d74e6f6d6ebe753fa24f863f901e312 (patch) | |
| tree | 55621f5ce46f6a2a6e386bfa9e1c3806ff8ba774 /engines/wintermute/BGame.cpp | |
| parent | f07690cb9699b670198dce2445514967ccafb1cb (diff) | |
| download | scummvm-rg350-2e12f9fe4d74e6f6d6ebe753fa24f863f901e312.tar.gz scummvm-rg350-2e12f9fe4d74e6f6d6ebe753fa24f863f901e312.tar.bz2 scummvm-rg350-2e12f9fe4d74e6f6d6ebe753fa24f863f901e312.zip | |
WINTERMUTE: Initial conversion of events from SDL2->OSystem
Diffstat (limited to 'engines/wintermute/BGame.cpp')
| -rw-r--r-- | engines/wintermute/BGame.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/wintermute/BGame.cpp b/engines/wintermute/BGame.cpp index 98a561530e..08d78e1745 100644 --- a/engines/wintermute/BGame.cpp +++ b/engines/wintermute/BGame.cpp @@ -69,6 +69,7 @@ #include "engines/wintermute/scriptables/SXString.h"
#include "common/textconsole.h"
#include "common/util.h"
+#include "common/keyboard.h"
#ifdef __IPHONEOS__
# include "ios_utils.h"
@@ -3696,16 +3697,19 @@ HRESULT CBGame::Unfreeze() { //////////////////////////////////////////////////////////////////////////
-bool CBGame::HandleKeypress(SDL_Event *event) {
+bool CBGame::HandleKeypress(Common::Event *event) {
#ifdef __WIN32__
+ // TODO: Do we really need to handle this in-engine?
// handle Alt+F4 on windows
- if (event->type == SDL_KEYDOWN && event->key.keysym.sym == SDLK_F4 && (event->key.keysym.mod == KMOD_LALT || event->key.keysym.mod == KMOD_RALT)) {
+ if (event->type == Common::EVENT_KEYDOWN && event->kbd.keycode == Common::KEYCODE_F4 && (event->kbd.flags == Common::KBD_ALT)) {
OnWindowClose();
return true;
+ //TODO
}
#endif
- if (event->type == SDL_KEYDOWN && event->key.keysym.sym == SDLK_RETURN && (event->key.keysym.mod == KMOD_LALT || event->key.keysym.mod == KMOD_RALT)) {
+ if (event->type == Common::EVENT_KEYDOWN && event->kbd.keycode == Common::KEYCODE_RETURN && (event->kbd.flags == Common::KBD_ALT)) {
+ // TODO: Handle alt-enter as well as alt-return.
_renderer->SwitchFullscreen();
return true;
}
|