Menu* main_menu = 0;
Menu* game_menu = 0;
Menu* options_menu = 0;
+Menu* options_controls_menu = 0;
Menu* highscore_menu = 0;
Menu* load_game_menu = 0;
Menu* save_game_menu = 0;
Menu* current_menu = 0;
-Menu* last_menu = 0;
/* input implementation variables */
int delete_character;
if(pmenu != current_menu)
{
menu_change = true;
- last_menu = current_menu;
+ Menu* tmp = current_menu;
current_menu = pmenu;
+ if(tmp)
+ if(tmp->last_menu != pmenu)
+ current_menu->last_menu = tmp;
+
timer_start(&pmenu->effect, 500);
}
}
timer_init(&effect,false);
}
-menu_item_type*
+void
Menu::additem(MenuItemKind kind, char *text, int toggle, Menu* menu)
{
additem(menu_item_create(kind, text, toggle, menu));
}
/* Add an item to a menu */
-void
+void
Menu::additem(menu_item_type* pmenu_item)
{
++num_items;
case MENU_ACTION_LEFT:
if(item[active_item].kind == MN_STRINGSELECT
- && item[active_item].list->num_items != 0)
+ && item[active_item].list->num_items != 0)
{
if(item[active_item].list->active_item > 0)
--item[active_item].list->active_item;
}
break;
case MENU_ACTION_RIGHT:
- if(item[active_item].kind == MN_STRINGSELECT
- && item[active_item].list->num_items != 0)
+ if(item[active_item].kind == MN_STRINGSELECT
+ && item[active_item].list->num_items != 0)
{
if(item[active_item].list->active_item < item[active_item].list->num_items-1)
++item[active_item].list->active_item;
{
switch (item[active_item].kind)
{
- case MN_GOTO:
+ case MN_GOTO:
if (item[active_item].target_menu != NULL)
Menu::set_current(item[active_item].target_menu);
else
puts("NULLL");
break;
-
+
case MN_TOGGLE:
item[active_item].toggled = !item[active_item].toggled;
menu_change = true;
break;
-
+
case MN_ACTION:
case MN_TEXTFIELD:
case MN_NUMFIELD:
+ case MN_CONTROLFIELD:
item[active_item].toggled = true;
break;
case MENU_ACTION_REMOVE:
if(item[active_item].kind == MN_TEXTFIELD
- || item[active_item].kind == MN_NUMFIELD)
+ || item[active_item].kind == MN_NUMFIELD)
{
if(item[active_item].input != NULL)
{
case MENU_ACTION_INPUT:
if(item[active_item].kind == MN_TEXTFIELD
- || (item[active_item].kind == MN_NUMFIELD && mn_input_char >= '0' && mn_input_char <= '9'))
+ || (item[active_item].kind == MN_NUMFIELD && mn_input_char >= '0' && mn_input_char <= '9'))
{
if(item[active_item].input != NULL)
{
menu_item_type& new_item = item[active_item];
if(new_item.kind == MN_DEACTIVE
- || new_item.kind == MN_LABEL
- || new_item.kind == MN_HL)
+ || new_item.kind == MN_LABEL
+ || new_item.kind == MN_HL)
{
// Skip the horzontal line item
if(menuaction != MENU_ACTION_UP && menuaction != MENU_ACTION_DOWN)
{
if(num_items != 0 && item != NULL)
{
- if((item[active_item].kind == MN_ACTION || item[active_item].kind == MN_TEXTFIELD || item[active_item].kind == MN_NUMFIELD) && item[active_item].toggled == true)
+ if((item[active_item].kind == MN_ACTION
+ || item[active_item].kind == MN_TEXTFIELD
+ || item[active_item].kind == MN_NUMFIELD)
+ && item[active_item].toggled)
{
item[active_item].toggled = false;
show_menu = 0;
void
Menu::draw_item(int index, // Position of the current item in the menu
- int menu_width,
+ int menu_width,
int menu_height)
{
int font_width = 16;
int list_width = strlen(string_list_active(pitem.list)) * font_width;
text_type* text_font = &white_text;
- if(arrange_left == true)
+ if (arrange_left)
x_pos += 24 - menu_width/2 + (text_width + input_width + list_width)/2;
-
+
if(index == active_item)
{
shadow_size = 3;
{
case MN_DEACTIVE:
{
- text_draw_align(&black_text, pitem.text,
+ text_draw_align(&black_text, pitem.text,
x_pos, y_pos,
A_HMIDDLE, A_VMIDDLE, 2);
break;
case MN_HL:
{
- int x = pos_x - menu_width/2;
+ int x = pos_x - menu_width/2;
int y = y_pos - 12 - effect_offset;
/* Draw a horizontal line with a little 3d effect */
fillrect(x, y + 6,
menu_width, 4,
210,50,50,225);
- fillrect(x, y + 6,
+ fillrect(x, y + 6,
menu_width, 2,
0,0,0,255);
break;
}
case MN_LABEL:
{
- text_draw_align(&white_big_text, pitem.text,
+ text_draw_align(&white_big_text, pitem.text,
x_pos, y_pos,
A_HMIDDLE, A_VMIDDLE, 2);
break;
}
case MN_TEXTFIELD:
case MN_NUMFIELD:
+ case MN_CONTROLFIELD:
{
int input_pos = input_width/2;
int text_pos = (text_width + font_width)/2;
0,0,0,128);
text_draw_align(&gold_text, pitem.input,
- x_pos + text_pos, y_pos,
+ x_pos + text_pos, y_pos,
A_HMIDDLE, A_VMIDDLE, 2);
- text_draw_align(text_font, pitem.text,
+ text_draw_align(text_font, pitem.text,
x_pos - (input_width + font_width)/2, y_pos,
A_HMIDDLE, A_VMIDDLE, shadow_size);
break;
list_pos_2, 18,
0,0,0,128);
- text_draw_align(&gold_text, string_list_active(pitem.list),
+ text_draw_align(&gold_text, string_list_active(pitem.list),
x_pos + text_pos, y_pos,
A_HMIDDLE, A_VMIDDLE,2);
case MN_TOGGLE:
{
text_draw_align(text_font, pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
-
- if(pitem.toggled == true)
- texture_draw(&checkbox_checked,
+
+ if(pitem.toggled)
+ texture_draw(&checkbox_checked,
x_pos + (text_width+font_width)/2,
y_pos - 8);
else
- texture_draw(&checkbox,
+ texture_draw(&checkbox,
x_pos + (text_width+font_width)/2,
y_pos - 8);
break;
{
int menu_height;
int menu_width;
-
+
/* The width of the menu has to be more than the width of the text
with the most characters */
menu_width = 0;
show_menu = false;
menuaction = MENU_ACTION_NONE;
current_menu = NULL;
- last_menu = NULL;
delete_character = 0;
mn_input_char = '\0';
}
/* Check for menu event */
-void menu_event(SDL_keysym* keysym)
+void menu_event(SDL_Event& event)
{
- SDLKey key = keysym->sym;
- SDLMod keymod;
- char ch[2];
- keymod = SDL_GetModState();
-
- /* If the current unicode character is an ASCII character,
- assign it to ch. */
- if ( (keysym->unicode & 0xFF80) == 0 )
- {
- ch[0] = keysym->unicode & 0x7F;
- ch[1] = '\0';
- }
- else
+ SDLKey key;
+ switch(event.type)
{
- /* An International Character. */
- }
+ case SDL_KEYDOWN:
+ key = event.key.keysym.sym;
+ SDLMod keymod;
+ char ch[2];
+ keymod = SDL_GetModState();
+
+ /* If the current unicode character is an ASCII character,
+ assign it to ch. */
+ if ( (event.key.keysym.unicode & 0xFF80) == 0 )
+ {
+ ch[0] = event.key.keysym.unicode & 0x7F;
+ ch[1] = '\0';
+ }
+ else
+ {
+ /* An International Character. */
+ }
- switch(key)
- {
- case SDLK_UP: /* Menu Up */
- menuaction = MENU_ACTION_UP;
- menu_change = true;
- break;
- case SDLK_DOWN: /* Menu Down */
- menuaction = MENU_ACTION_DOWN;
- menu_change = true;
- break;
- case SDLK_LEFT: /* Menu Up */
- menuaction = MENU_ACTION_LEFT;
- menu_change = true;
- break;
- case SDLK_RIGHT: /* Menu Down */
- menuaction = MENU_ACTION_RIGHT;
- menu_change = true;
- break;
- case SDLK_SPACE:
- if(current_menu->item[current_menu->active_item].kind == MN_TEXTFIELD)
+ switch(key)
{
- menuaction = MENU_ACTION_INPUT;
+ case SDLK_UP: /* Menu Up */
+ menuaction = MENU_ACTION_UP;
menu_change = true;
- mn_input_char = ' ';
break;
- }
- case SDLK_RETURN: /* Menu Hit */
- menuaction = MENU_ACTION_HIT;
- menu_change = true;
- break;
- case SDLK_DELETE:
- case SDLK_BACKSPACE:
- menuaction = MENU_ACTION_REMOVE;
- menu_change = true;
- delete_character++;
- break;
- default:
- if( (key >= SDLK_0 && key <= SDLK_9) || (key >= SDLK_a && key <= SDLK_z) || (key >= SDLK_SPACE && key <= SDLK_SLASH))
- {
- menuaction = MENU_ACTION_INPUT;
+ case SDLK_DOWN: /* Menu Down */
+ menuaction = MENU_ACTION_DOWN;
+ menu_change = true;
+ break;
+ case SDLK_LEFT: /* Menu Up */
+ menuaction = MENU_ACTION_LEFT;
+ menu_change = true;
+ break;
+ case SDLK_RIGHT: /* Menu Down */
+ menuaction = MENU_ACTION_RIGHT;
menu_change = true;
- mn_input_char = *ch;
+ break;
+ case SDLK_SPACE:
+ if(current_menu->item[current_menu->active_item].kind == MN_TEXTFIELD)
+ {
+ menuaction = MENU_ACTION_INPUT;
+ menu_change = true;
+ mn_input_char = ' ';
+ break;
+ }
+ case SDLK_RETURN: /* Menu Hit */
+ menuaction = MENU_ACTION_HIT;
+ menu_change = true;
+ break;
+ case SDLK_DELETE:
+ case SDLK_BACKSPACE:
+ menuaction = MENU_ACTION_REMOVE;
+ menu_change = true;
+ delete_character++;
+ break;
+ default:
+ if( (key >= SDLK_0 && key <= SDLK_9) || (key >= SDLK_a && key <= SDLK_z) || (key >= SDLK_SPACE && key <= SDLK_SLASH))
+ {
+ menuaction = MENU_ACTION_INPUT;
+ menu_change = true;
+ mn_input_char = *ch;
+ }
+ else
+ {
+ mn_input_char = '\0';
+ }
+ break;
}
- else
+ break;
+ case SDL_JOYAXISMOTION:
+ if(event.jaxis.axis == JOY_Y)
{
- mn_input_char = '\0';
+ if (event.jaxis.value > 1024)
+ menuaction = MENU_ACTION_DOWN;
+ else if (event.jaxis.value < -1024)
+ menuaction = MENU_ACTION_UP;
}
break;
+ case SDL_JOYBUTTONDOWN:
+ menuaction = MENU_ACTION_HIT;
+ break;
+ default:
+ break;
}
-
-
/* FIXME: NO JOYSTICK SUPPORT */
/*#ifdef JOY_YES
else if (event.type == SDL_JOYBUTTONDOWN)
projects / supertux.git / blobdiff