Permalink
Browse files

Pack-selection more intuitive.

  • Loading branch information...
1 parent 7e9f5a9 commit e19543ea69e0c5a6878c1663ad49d4d3f7593170 @DusteDdk committed Jun 5, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 menu.c
View
6 menu.c
@@ -955,7 +955,8 @@ int runMenu(SDL_Surface* screen)
starField(screen, 1);
fireWorks(screen);
txtWriteCenter(screen, FONTMEDIUM, STR_MENU_SELECT_PACK, HSCREENW, HSCREENH-106);
- if(dir) txtWriteCenter(screen, FONTSMALL, STR_MENU_SELECT_PACK_PRESS_CTRL, HSCREENW, HSCREENH-84);
+ getInpPointerState()->escEnable=1;
+ if(dir && !(getInpPointerState()->timeSinceMoved < POINTER_SHOW_TIMEOUT )) txtWriteCenter(screen, FONTSMALL, STR_MENU_SELECT_PACK_PRESS_CTRL, HSCREENW, HSCREENH-84);
menuMaxY= packState()->numPacks-1;
ul=0;
scroll=0;
@@ -1000,9 +1001,10 @@ int runMenu(SDL_Surface* screen)
if(dir) txtWrite(screen, FONTSMALL, STR_MENU_PACKS_MORE, HSCREENW+100, HSCREENH+108);
}
- if( getButton(C_BTNB) || (!isAnyBoxHit() && isPointerClicked()) )
+ if( getButton(C_BTNB) || isPointerEscapeClicked() )
{
resetBtn(C_BTNB);
+ resetMouseBtn();
packFreeGfx();
//If it's a different pack
if(menuPosY != packState()->selected)

0 comments on commit e19543e

Please sign in to comment.