Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix MMB use." 

open ticket:2578

This reverts commit b3dcccba1d.

Conflicts:

	lib/framework/wzapp.cpp
master
Buginator 2011-03-24 22:36:01 -04:00
parent 8ffb1379f3
commit 60099b70d6
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/framework/wzapp.cpp
View File

@ -869,12 +869,7 @@ void SetMousePos(uint16_t x, uint16_t y)
/* This returns true if the mouse key is currently depressed */ /* This returns true if the mouse key is currently depressed */
bool mouseDown(MOUSE_KEY_CODE code) bool mouseDown(MOUSE_KEY_CODE code)
{ {
return ((aMouseState[code].state != KEY_UP) return (aMouseState[code].state != KEY_UP);
||
// holding down LMB and RMB counts as holding down MMB
(code == MOUSE_MMB)
||
(aMouseState[MOUSE_LMB].state != KEY_UP && aMouseState[MOUSE_RMB].state != KEY_UP));
} }
/* This returns true if the mouse key was double clicked */ /* This returns true if the mouse key was double clicked */
@ -902,13 +897,7 @@ bool mouseReleased(MOUSE_KEY_CODE code)
/* Check for a mouse drag, return the drag start coords if dragging */ /* Check for a mouse drag, return the drag start coords if dragging */
bool mouseDrag(MOUSE_KEY_CODE code, UDWORD *px, UDWORD *py) bool mouseDrag(MOUSE_KEY_CODE code, UDWORD *px, UDWORD *py)
{ {
if (aMouseState[code].state == KEY_DRAG)
if ((aMouseState[code].state == KEY_DRAG)
||
(code == MOUSE_MMB )
||
// dragging LMB and RMB counts as dragging MMB
(aMouseState[MOUSE_LMB].state != KEY_UP && aMouseState[MOUSE_RMB].state == KEY_DRAG))
{ {
*px = dragX; *px = dragX;
*py = dragY; *py = dragY;