Merge of Marshall/master into BL/master.

Merge of SDL code from feature branch into BL/master.
This commit is contained in:
Ben Lankamp
2020-06-20 11:41:29 +02:00
28 changed files with 427 additions and 774 deletions
+2 -7
View File
@@ -1784,13 +1784,8 @@ int RadarClass::RTacticalClass::Action(unsigned flags, KeyNumType & key)
** or release event, special mouse queuing storage variables are used. Other
** events must use the current mouse position globals.
*/
if (flags & (LEFTPRESS|LEFTRELEASE|RIGHTPRESS|RIGHTRELEASE)) {
x = Keyboard->MouseQX;
y = Keyboard->MouseQY;
} else {
x = Get_Mouse_X();
y = Get_Mouse_Y();
}
x = Get_Mouse_X();
y = Get_Mouse_Y();
/*
** See if the mouse is over the radar general area, but not yet