Fix Input Handling
This commit is contained in:
BeaR 2012-05-02 13:53:28 +02:00 committed by oy
parent 86fe9757c5
commit 0adaf8a752
2 changed files with 15 additions and 5 deletions

View file

@ -35,6 +35,7 @@ CInput::CInput()
m_InputCurrent = 0;
m_InputGrabbed = 0;
m_InputDispatched = false;
m_LastRelease = 0;
m_ReleaseDelta = -1;
@ -116,10 +117,14 @@ int CInput::Update()
/*if(!input_grabbed && Graphics()->WindowActive())
Input()->MouseModeRelative();*/
// clear and begin count on the other one
m_InputCurrent^=1;
mem_zero(&m_aInputCount[m_InputCurrent], sizeof(m_aInputCount[m_InputCurrent]));
mem_zero(&m_aInputState[m_InputCurrent], sizeof(m_aInputState[m_InputCurrent]));
if(m_InputDispatched)
{
// clear and begin count on the other one
m_InputCurrent^=1;
mem_zero(&m_aInputCount[m_InputCurrent], sizeof(m_aInputCount[m_InputCurrent]));
mem_zero(&m_aInputState[m_InputCurrent], sizeof(m_aInputState[m_InputCurrent]));
m_InputDispatched = false;
}
{
int i;

View file

@ -38,6 +38,7 @@ protected:
unsigned char m_aInputState[2][1024];
int m_InputCurrent;
bool m_InputDispatched;
int KeyWasPressed(int Key) { return m_aInputState[m_InputCurrent^1][Key]; }
@ -51,7 +52,11 @@ public:
// events
int NumEvents() const { return m_NumEvents; }
void ClearEvents() { m_NumEvents = 0; }
void ClearEvents()
{
m_NumEvents = 0;
m_InputDispatched = true;
}
CEvent GetEvent(int Index) const
{
if(Index < 0 || Index >= m_NumEvents)