MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some nesting

develop
Robob27 2023-02-02 02:22:49 -05:00
parent a14de11a13
commit 576fcfbeab
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/confirm.cpp
Unescape Escape View File

@ -324,44 +324,35 @@ public:
else if (state == INACTIVE) else if (state == INACTIVE)
{ {
if(mouseExit) { if(mouseExit) {
if(intercept_key("MOUSE_RIGHT")) { if(intercept_key("MOUSE_RIGHT") && set_state(ACTIVE)) {
if (set_state(ACTIVE))
{
df::global::enabler->mouse_rbut = 0; df::global::enabler->mouse_rbut = 0;
df::global::enabler->mouse_rbut_down = 0; df::global::enabler->mouse_rbut_down = 0;
mouse_pos = df::coord2d(df::global::gps->mouse_x, df::global::gps->mouse_y); mouse_pos = df::coord2d(df::global::gps->mouse_x, df::global::gps->mouse_y);
last_key_is_right_click = true; last_key_is_right_click = true;
return true; return true;
} }
}
} else } else
last_key_is_right_click = false; last_key_is_right_click = false;
if(mouseSelect) { if(mouseSelect) {
if(intercept_key("MOUSE_LEFT")) { if(intercept_key("MOUSE_LEFT") && set_state(ACTIVE)) {
if (set_state(ACTIVE))
{
df::global::enabler->mouse_lbut = 0; df::global::enabler->mouse_lbut = 0;
df::global::enabler->mouse_lbut_down = 0; df::global::enabler->mouse_lbut_down = 0;
mouse_pos = df::coord2d(df::global::gps->mouse_x, df::global::gps->mouse_y); mouse_pos = df::coord2d(df::global::gps->mouse_x, df::global::gps->mouse_y);
last_key_is_left_click = true; last_key_is_left_click = true;
return true; return true;
} }
}
} else } else
last_key_is_left_click = false; last_key_is_left_click = false;
for (df::interface_key key : *input) for (df::interface_key key : *input)
{ {
if (intercept_key(key)) if (intercept_key(key) && set_state(ACTIVE))
{
if (set_state(ACTIVE))
{ {
last_key = key; last_key = key;
return true; return true;
} }
} }
}
return false; return false;
} }
else if (state == ACTIVE) else if (state == ACTIVE)