Changed: #945 Reverted because it brokes mouse under Windows (if we really need to have both motion and click events, we can send them directly from NeL driver)

This commit is contained in:
kervala 2010-11-02 21:26:49 +01:00
parent b744f44c67
commit 5152c3bf7c

View file

@ -325,7 +325,6 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
_MouseButtonsState = (TMouseButton) (_MouseButtonsState | pEvent->Button); _MouseButtonsState = (TMouseButton) (_MouseButtonsState | pEvent->Button);
rIP.setButtonState(_MouseButtonsState); rIP.setButtonState(_MouseButtonsState);
updateMousePos((CEventMouse&)event, eventDesc);
// handle Event // handle Event
if(pEvent->Button & leftButton) if(pEvent->Button & leftButton)
@ -350,7 +349,6 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
_MouseButtonsState = (TMouseButton) (_MouseButtonsState & ~(pEvent->Button)); _MouseButtonsState = (TMouseButton) (_MouseButtonsState & ~(pEvent->Button));
rIP.setButtonState(_MouseButtonsState); rIP.setButtonState(_MouseButtonsState);
updateMousePos((CEventMouse&)event, eventDesc);
// handle Event // handle Event
if(pEvent->Button & leftButton) if(pEvent->Button & leftButton)
@ -370,7 +368,6 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
// TODO: yoyo make it work if needed (for now, seems preferable to manage in each ActionHandler) // TODO: yoyo make it work if needed (for now, seems preferable to manage in each ActionHandler)
CEventMouseDblClk* pEvent=(CEventMouseDblClk*)&event; CEventMouseDblClk* pEvent=(CEventMouseDblClk*)&event;
updateMousePos((CEventMouse&)event, eventDesc);
// handle Event // handle Event
if(pEvent->Button & leftButton) if(pEvent->Button & leftButton)
@ -398,8 +395,6 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
else else
_MouseWheel -= 1; _MouseWheel -= 1;
updateMousePos((CEventMouse&)event, eventDesc);
// handle Event now. // handle Event now.
if (_MouseWheel != 0) if (_MouseWheel != 0)
{ {