diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2011-06-15 23:33:46 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2011-06-15 23:33:46 +0400 |
| commit | 38c4f49c9a5d79610c5120b8214ac7ae54e2240f (patch) | |
| tree | 077999f432b266ccd83ef8be11def9090e5504e8 /source/gameengine/GamePlayer/ghost/GPG_Application.cpp | |
| parent | b43fa53d3ef7e99b60848dd6b47ffa548c970d9d (diff) | |
Moved control of the exit key away from the keyboard devices, and moved it to ketsjiengine.
Added setExitKey and getExitKey to the python API
Diffstat (limited to 'source/gameengine/GamePlayer/ghost/GPG_Application.cpp')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index e0c903b591b..6bc8506cf41 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -622,7 +622,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) - m_keyboard->SetExitKey(ConvertKeyCode(gm->exitkey)); + KX_KetsjiEngine::SetExitKey(ConvertKeyCode(gm->exitkey)); #ifdef WITH_PYTHON CValue::SetDeprecationWarnings(nodepwarnings); #else @@ -902,7 +902,7 @@ bool GPG_Application::handleKey(GHOST_IEvent* event, bool isDown) GHOST_TEventDataPtr eventData = ((GHOST_IEvent*)event)->getData(); GHOST_TEventKeyData* keyData = static_cast<GHOST_TEventKeyData*>(eventData); - if (m_keyboard->ToNative(keyData->key) == m_keyboard->GetExitKey() && !m_keyboard->m_hookesc && !m_isEmbedded) { + if (m_keyboard->ToNative(keyData->key) == KX_KetsjiEngine::GetExitKey() && !m_keyboard->m_hookesc && !m_isEmbedded) { m_exitRequested = KX_EXIT_REQUEST_OUTSIDE; } m_keyboard->ConvertEvent(keyData->key, isDown); |