diff options
| author | oy <Tom_Adams@web.de> | 2010-08-15 20:04:03 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-08-15 20:04:03 +0200 |
| commit | 678fe76566863b4ab441f303c488b04998100c8e (patch) | |
| tree | 89a5f0dae166ced4172b31ec8513d1aaa5e062d6 | |
| parent | 02c7e3642adf7d9401c3abd192d1db0e26c1b89d (diff) | |
| download | zcatch-678fe76566863b4ab441f303c488b04998100c8e.tar.gz zcatch-678fe76566863b4ab441f303c488b04998100c8e.zip | |
reverted input key handling back to 0.52(the keyboard layout problem should be fixed with sdl 1.3 or a customised one). Closes #3. Closes #15.
| -rw-r--r-- | src/engine/client/input.cpp | 14 | ||||
| -rw-r--r-- | src/engine/client/input.h | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/engine/client/input.cpp b/src/engine/client/input.cpp index 9f546226..32e61bbb 100644 --- a/src/engine/client/input.cpp +++ b/src/engine/client/input.cpp @@ -31,7 +31,6 @@ CInput::CInput() { mem_zero(m_aInputCount, sizeof(m_aInputCount)); mem_zero(m_aInputState, sizeof(m_aInputState)); - mem_zero(m_Keys, sizeof(m_Keys)); m_InputCurrent = 0; m_InputGrabbed = 0; @@ -146,20 +145,11 @@ void CInput::Update() // handle keys case SDL_KEYDOWN: AddEvent(Event.key.keysym.unicode, 0, 0); // ignore_convention - if(Event.key.keysym.unicode != 0 && Event.key.keysym.unicode < 256) // ignore_convention - { - Key = Event.key.keysym.unicode; // ignore_convention - m_Keys[Event.key.keysym.sym] = Event.key.keysym.unicode; // ignore_convention - } - else - Key = Event.key.keysym.sym; // ignore_convention + Key = Event.key.keysym.sym; // ignore_convention break; case SDL_KEYUP: Action = IInput::FLAG_RELEASE; - if(m_Keys[Event.key.keysym.sym] != 0) // ignore_convention - Key = m_Keys[Event.key.keysym.sym]; // ignore_convention - else - Key = Event.key.keysym.sym; // ignore_convention + Key = Event.key.keysym.sym; // ignore_convention break; // handle mouse buttons diff --git a/src/engine/client/input.h b/src/engine/client/input.h index bf7739ab..cc4e32e3 100644 --- a/src/engine/client/input.h +++ b/src/engine/client/input.h @@ -10,8 +10,6 @@ class CInput : public IEngineInput unsigned int m_LastRelease; unsigned int m_ReleaseDelta; - int m_Keys[1024]; - void AddEvent(int Unicode, int Key, int Flags); IEngineGraphics *Graphics() { return m_pGraphics; } |