}
}
- MenuItem& new_item = item[active_item];
- if(new_item.kind == MN_DEACTIVE
- || new_item.kind == MN_LABEL
- || new_item.kind == MN_HL)
+ if(active_item > 0 && active_item < (int)item.size())
{
+ // FIXME: wtf?! having a hack to avoid horizontal lines...
+ // Elegant solution would be to check for horizontal lines, right
+ // when it was asked to move menu up and down
+ MenuItem& new_item = item[active_item];
+ if(new_item.kind == MN_DEACTIVE ||
+ new_item.kind == MN_LABEL ||
+ new_item.kind == MN_HL)
+ {
// Skip the horzontal line item
if (menuaction != MENU_ACTION_UP && menuaction != MENU_ACTION_DOWN)
menuaction = MENU_ACTION_DOWN;
if (item.size() > 1)
action();
+ }
}
menuaction = MENU_ACTION_NONE;
int text_width = int(text_font->get_text_width(pitem.text));
int input_width = int(text_font->get_text_width(pitem.input) + 10);
int list_width = 0;
- if(pitem.list.second != 0)
+ std::set<std::string>::iterator tmp = 0;
+ if(pitem.list.second != tmp)
list_width = int(text_font->get_text_width((*pitem.list.second)));
if (arrange_left)
/* An International Character. */
}
- if(item[active_item].kind == MN_CONTROLFIELD_KB)
+ if(item.size() > 0 && item[active_item].kind == MN_CONTROLFIELD_KB)
{
if(key == SDLK_ESCAPE)
{
menuaction = MENU_ACTION_RIGHT;
break;
case SDLK_SPACE:
- if(item[active_item].kind == MN_TEXTFIELD)
+ if(item.size() > 0 && item[active_item].kind == MN_TEXTFIELD)
{
menuaction = MENU_ACTION_INPUT;
mn_input_char = ' ';
}
break;
case SDL_JOYBUTTONDOWN:
- if (item[active_item].kind == MN_CONTROLFIELD_JS)
+ if (item.size() > 0 && item[active_item].kind == MN_CONTROLFIELD_JS)
{
// FIXME: This next line does nothing useable, right?
// *item[active_item].int_p = key;