Skip to content

Commit

Permalink
Removed the shortcut bar stuff from the gumps manager
Browse files Browse the repository at this point in the history
AFAIU the code this was not needed for in game gumps and it crashed the setup in the main Exult menu
  • Loading branch information
DominusExult committed Jul 19, 2015
1 parent 8c1a827 commit bce2c6c
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions gumps/Gump_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,6 @@ void Gump_manager::paint(bool modal) {
#ifdef UNDER_CE
gkeyboard->paint();
#endif
#ifdef __IPHONEOS__
g_shortcutBar->paint();
#endif
}


Expand Down Expand Up @@ -476,10 +473,6 @@ int Gump_manager::handle_modal_gump_event(
#ifdef UNDER_CE
if (gkeyboard->handle_event(&event))
break;
#endif
#ifdef __IPHONEOS__
if (g_shortcutBar->handle_event(&event))
break;
#endif
if (event.button.button == 1) {
gump->mouse_down(gx, gy, event.button.button);
Expand All @@ -504,10 +497,6 @@ int Gump_manager::handle_modal_gump_event(
#ifdef UNDER_CE
if (gkeyboard->handle_event(&event))
break;
#endif
#ifdef __IPHONEOS__
if (g_shortcutBar->handle_event(&event))
break;
#endif
if (event.button.button != 3)
gump->mouse_up(gx, gy, event.button.button);
Expand Down Expand Up @@ -627,7 +616,6 @@ int Gump_manager::do_modal_gump(
#endif
#ifdef __IPHONEOS__
touchui->hideGameControls();
g_shortcutBar->paint();
#endif
do {
Delay(); // Wait a fraction of a second.
Expand All @@ -648,9 +636,6 @@ int Gump_manager::do_modal_gump(
Mouse::mouse->blit_dirty();
#ifdef UNDER_CE
gkeyboard->paint();
#endif
#ifdef __IPHONEOS__
g_shortcutBar->paint();
#endif
} while (!gump->is_done() && !escaped);
Mouse::mouse->hide();
Expand Down

0 comments on commit bce2c6c

Please sign in to comment.