openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix bottom buttons not working in fullscreen mode

Browse Source 
Fixes #50
This commit is contained in:
Celtic Minstrel
2017-02-08 11:00:46 -05:00
parent 92ba1e0fb0
commit ae02ac4793
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/boe.actions.cpp
View File

@@ -988,22 +988,8 @@ bool handle_action(sf::Event event) {
location the_point,point_in_area; location the_point,point_in_area;
the_point = location(event.mouseButton.x, event.mouseButton.y); the_point = location(event.mouseButton.x, event.mouseButton.y);
the_point.x -= ul.x;
the_point.y -= ul.y;
end_scenario = false; end_scenario = false;
// Now split off the extra stuff, like talking and shopping.
if(overall_mode == MODE_TALKING) {
handle_talk_event(the_point);
if(overall_mode != MODE_TALKING)
return false;
}
if(overall_mode == MODE_SHOPPING) {
handle_shop_event(the_point);
if(overall_mode != MODE_SHOPPING)
return false;
}
// MARK: First, figure out where party is // MARK: First, figure out where party is
switch(overall_mode) { switch(overall_mode) {
case MODE_OUTDOORS: case MODE_LOOK_OUTDOORS: case MODE_OUTDOORS: case MODE_LOOK_OUTDOORS:
@@ -1037,6 +1023,21 @@ bool handle_action(sf::Event event) {
return are_done; return are_done;
} }
the_point.x -= ul.x;
the_point.y -= ul.y;
// Now split off the extra stuff, like talking and shopping.
if(overall_mode == MODE_TALKING) {
handle_talk_event(the_point);
if(overall_mode != MODE_TALKING)
return false;
}
if(overall_mode == MODE_SHOPPING) {
handle_shop_event(the_point);
if(overall_mode != MODE_SHOPPING)
return false;
}
// MARK: Then, handle a button being hit. // MARK: Then, handle a button being hit.
if(button_hit != 12) if(button_hit != 12)
switch(button_hit) { switch(button_hit) {