diff options
| author | Einar Johan Trøan Sømåen | 2012-03-13 17:22:40 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 12:42:07 +0200 |
| commit | 5b01f6a284e9e6d21234603ade4557cada9982c0 (patch) | |
| tree | 12c1a3c60fb1230ac37ac4150415c26845f548b2 | |
| parent | 46458bfc00f6822ab21875c8bffe7695eade7156 (diff) | |
| download | scummvm-rg350-5b01f6a284e9e6d21234603ade4557cada9982c0.tar.gz scummvm-rg350-5b01f6a284e9e6d21234603ade4557cada9982c0.tar.bz2 scummvm-rg350-5b01f6a284e9e6d21234603ade4557cada9982c0.zip | |
WINTERMUTE: Add BKeyboardState to build
| -rw-r--r-- | engines/wintermute/BKeyboardState.cpp | 15 | ||||
| -rw-r--r-- | engines/wintermute/module.mk | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/engines/wintermute/BKeyboardState.cpp b/engines/wintermute/BKeyboardState.cpp index 055b2cf8c5..d15b800d8e 100644 --- a/engines/wintermute/BKeyboardState.cpp +++ b/engines/wintermute/BKeyboardState.cpp @@ -71,11 +71,12 @@ HRESULT CBKeyboardState::ScCallMethod(CScScript *Script, CScStack *Stack, CScSta vKey = (int)str[0];
} else vKey = val->GetInt();
- Uint8 *state = SDL_GetKeyboardState(NULL);
- SDL_Scancode scanCode = SDL_GetScancodeFromKey(VKeyToKeyCode(vKey));
- bool isDown = state[scanCode] > 0;
+ warning("BKeyboardState doesnt yet have state-support"); //TODO;
+// Uint8 *state = SDL_GetKeyboardState(NULL);
+// SDL_Scancode scanCode = SDL_GetScancodeFromKey(VKeyToKeyCode(vKey));
+// bool isDown = state[scanCode] > 0;
- Stack->PushBool(isDown);
+// Stack->PushBool(isDown);
return S_OK;
}
@@ -177,7 +178,7 @@ char *CBKeyboardState::ScToString() { //////////////////////////////////////////////////////////////////////////
HRESULT CBKeyboardState::ReadKey(SDL_Event *event) {
- m_CurrentPrintable = (event->type == SDL_TEXTINPUT);
+ //m_CurrentPrintable = (event->type == SDL_TEXTINPUT); // TODO
m_CurrentCharCode = KeyCodeToVKey(event);
//m_CurrentKeyData = KeyData;
@@ -235,9 +236,9 @@ uint32 CBKeyboardState::KeyCodeToVKey(SDL_Event *event) { }
//////////////////////////////////////////////////////////////////////////
-SDL_Keycode CBKeyboardState::VKeyToKeyCode(uint32 vkey) {
+Common::KeyCode CBKeyboardState::VKeyToKeyCode(uint32 vkey) {
// todo
- return (SDL_Keycode)vkey;
+ return (Common::KeyCode)vkey;
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk index 0fba4a202f..80d599c8ff 100644 --- a/engines/wintermute/module.mk +++ b/engines/wintermute/module.mk @@ -55,6 +55,7 @@ MODULE_OBJS := \ BFontTT.o \ BFrame.o \ BImage.o \ + BKeyboardState.o \ BNamedObject.o \ BObject.o \ BPackage.o \ @@ -70,6 +71,7 @@ MODULE_OBJS := \ BResources.o \ BResourceFile.o \ BSaveThumbFile.o \ + BSaveThumbHelper.o \ BScriptable.o \ BScriptHolder.o \ BSound.o \ |