MenuAction menuaction = MENU_ACTION_NONE;
bool show_menu;
bool menu_change;
-texture_type checkbox, checkbox_checked, back, arrow_left, arrow_right;
+
+Surface* checkbox;
+Surface* checkbox_checked;
+Surface* back;
+Surface* arrow_left;
+Surface* arrow_right;
Menu* main_menu = 0;
Menu* game_menu = 0;
+Menu* worldmap_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* contrib_menu = 0;
+Menu* contrib_subset_menu = 0;
Menu* current_menu = 0;
}
/* Return a pointer to a new menu item */
-menu_item_type* menu_item_create(MenuItemKind kind, char *text, int init_toggle, Menu* target_menu)
+MenuItem*
+MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu* target_menu_)
{
- menu_item_type *pnew_item = (menu_item_type*) malloc(sizeof(menu_item_type));
- pnew_item->kind = kind;
- pnew_item->text = (char*) malloc(sizeof(char) * (strlen(text) + 1));
- strcpy(pnew_item->text,text);
- if(kind == MN_TOGGLE)
- pnew_item->toggled = init_toggle;
+ MenuItem *pnew_item = new MenuItem;
+
+ pnew_item->kind = kind_;
+ pnew_item->text = (char*) malloc(sizeof(char) * (strlen(text_) + 1));
+ strcpy(pnew_item->text, text_);
+
+ if(kind_ == MN_TOGGLE)
+ pnew_item->toggled = init_toggle_;
else
pnew_item->toggled = false;
- pnew_item->target_menu = target_menu;
+
+ pnew_item->target_menu = target_menu_;
pnew_item->input = (char*) malloc(sizeof(char));
pnew_item->input[0] = '\0';
- if(kind == MN_STRINGSELECT)
+
+ if(kind_ == MN_STRINGSELECT)
{
pnew_item->list = (string_list_type*) malloc(sizeof(string_list_type));
string_list_init(pnew_item->list);
return pnew_item;
}
-void menu_item_change_text(menu_item_type* pmenu_item,const char *text)
+void
+MenuItem::change_text(const char *text_)
{
- if(text)
+ if (text_)
{
- free(pmenu_item->text);
- pmenu_item->text = (char*) malloc(sizeof(char )*(strlen(text)+1));
- strcpy(pmenu_item->text,text);
+ free(text);
+ text = (char*) malloc(sizeof(char )*(strlen(text_)+1));
+ strcpy(text, text_);
}
}
-void menu_item_change_input(menu_item_type* pmenu_item,const char *text)
+
+void
+MenuItem::change_input(const char *text_)
{
if(text)
{
- free(pmenu_item->input);
- pmenu_item->input = (char*) malloc(sizeof(char )*(strlen(text)+1));
- strcpy(pmenu_item->input,text);
+ free(input);
+ input = (char*) malloc(sizeof(char )*(strlen(text_)+1));
+ strcpy(input, text_);
}
}
/* Free a menu and all its items */
Menu::~Menu()
{
- if(num_items != 0 && item != NULL)
+ if(item.size() != 0)
{
- for(int i = 0; i < num_items; ++i)
+ for(unsigned int i = 0; i < item.size(); ++i)
{
free(item[i].text);
free(item[i].input);
string_list_free(item[i].list);
}
- free(item);
}
}
pos_y = screen->h/2;
last_menu = 0;
arrange_left = 0;
- num_items = 0;
active_item = 0;
last_menu = 0;
- item = NULL;
effect.init(false);
}
}
void
-Menu::additem(MenuItemKind kind, char *text, int toggle, Menu* menu)
+Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* menu_)
{
- additem(menu_item_create(kind, text, toggle, menu));
+ additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_));
}
/* Add an item to a menu */
void
-Menu::additem(menu_item_type* pmenu_item)
+Menu::additem(MenuItem* pmenu_item)
+{
+ item.push_back(*pmenu_item);
+ delete pmenu_item;
+}
+
+void
+Menu::clear()
{
- ++num_items;
- item = (menu_item_type*)realloc(item, sizeof(menu_item_type) * num_items);
- memcpy(&item[num_items-1],pmenu_item,sizeof(menu_item_type));
- free(pmenu_item);
+ item.clear();
}
/* Process actions done on the menu */
void
Menu::action()
{
- if(num_items != 0 && item != NULL)
+ if(item.size() != 0)
{
switch(menuaction)
{
if (active_item > 0)
--active_item;
else
- active_item = num_items-1;
+ active_item = int(item.size())-1;
break;
case MENU_ACTION_DOWN:
- if(active_item < num_items-1)
+ if(active_item < int(item.size())-1)
++active_item;
else
active_item = 0;
}
}
- menu_item_type& new_item = item[active_item];
+ MenuItem& new_item = item[active_item];
if(new_item.kind == MN_DEACTIVE
|| new_item.kind == MN_LABEL
|| new_item.kind == MN_HL)
if(menuaction != MENU_ACTION_UP && menuaction != MENU_ACTION_DOWN)
menuaction = MENU_ACTION_DOWN;
- if(num_items > 1)
+ if(item.size() > 1)
action();
}
}
int
Menu::check()
{
- if(num_items != 0 && item != NULL)
+ if (item.size() != 0)
{
if((item[active_item].kind == MN_ACTION
|| item[active_item].kind == MN_TEXTFIELD
int menu_width,
int menu_height)
{
- int font_width = 16;
-
- const menu_item_type& pitem = item[index];
+ const MenuItem& pitem = item[index];
+ int font_width = 16;
int effect_offset = 0;
{
int effect_time = 0;
+
if(effect.check())
- effect_time = timer_get_left(&effect) / 4;
+ effect_time = effect.get_left() / 4;
effect_offset = (index % 2) ? effect_time : -effect_time;
}
int text_width = strlen(pitem.text) * font_width;
int input_width = strlen(pitem.input) * font_width;
int list_width = strlen(string_list_active(pitem.list)) * font_width;
- text_type* text_font = &white_text;
+ Text* text_font = white_text;
if (arrange_left)
x_pos += 24 - menu_width/2 + (text_width + input_width + list_width)/2;
if(index == active_item)
{
shadow_size = 3;
- text_font = &blue_text;
+ text_font = blue_text;
}
switch (pitem.kind)
{
case MN_DEACTIVE:
{
- text_draw_align(&black_text, pitem.text,
- x_pos, y_pos,
- A_HMIDDLE, A_VMIDDLE, 2);
+ black_text->draw_align(pitem.text,
+ x_pos, y_pos,
+ A_HMIDDLE, A_VMIDDLE, 2);
break;
}
}
case MN_LABEL:
{
- text_draw_align(&white_big_text, pitem.text,
- x_pos, y_pos,
- A_HMIDDLE, A_VMIDDLE, 2);
+ white_big_text->draw_align(pitem.text,
+ x_pos, y_pos,
+ A_HMIDDLE, A_VMIDDLE, 2);
break;
}
case MN_TEXTFIELD:
input_width + font_width, 18,
0,0,0,128);
- text_draw_align(&gold_text, pitem.input,
- x_pos + text_pos, y_pos,
- A_HMIDDLE, A_VMIDDLE, 2);
+ gold_text->draw_align(pitem.input,
+ x_pos + text_pos, y_pos,
+ A_HMIDDLE, A_VMIDDLE, 2);
- text_draw_align(text_font, pitem.text,
- x_pos - (input_width + font_width)/2, y_pos,
- A_HMIDDLE, A_VMIDDLE, shadow_size);
+ text_font->draw_align(pitem.text,
+ x_pos - (input_width + font_width)/2, y_pos,
+ A_HMIDDLE, A_VMIDDLE, shadow_size);
break;
}
case MN_STRINGSELECT:
int text_pos = (text_width + font_width)/2;
/* Draw arrows */
- texture_draw(&arrow_left, x_pos - list_pos + text_pos - 17, y_pos - 8);
- texture_draw(&arrow_right, x_pos - list_pos + text_pos - 1 + list_pos_2, y_pos - 8);
+ arrow_left->draw( x_pos - list_pos + text_pos - 17, y_pos - 8);
+ arrow_right->draw( x_pos - list_pos + text_pos - 1 + list_pos_2, y_pos - 8);
/* Draw input background */
fillrect(x_pos - list_pos + text_pos - 1, y_pos - 10,
list_pos_2, 18,
0,0,0,128);
- text_draw_align(&gold_text, string_list_active(pitem.list),
+ gold_text->draw_align(string_list_active(pitem.list),
x_pos + text_pos, y_pos,
A_HMIDDLE, A_VMIDDLE,2);
- text_draw_align(text_font, pitem.text,
+ text_font->draw_align(pitem.text,
x_pos - list_pos_2/2, y_pos,
A_HMIDDLE, A_VMIDDLE, shadow_size);
break;
}
case MN_BACK:
{
- text_draw_align(text_font, pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
- texture_draw(&back, x_pos + text_width/2 + font_width, y_pos - 8);
+ text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+ back->draw( x_pos + text_width/2 + font_width, y_pos - 8);
break;
}
case MN_TOGGLE:
{
- text_draw_align(text_font, pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+ text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
if(pitem.toggled)
- texture_draw(&checkbox_checked,
+ checkbox_checked->draw(
x_pos + (text_width+font_width)/2,
y_pos - 8);
else
- texture_draw(&checkbox,
+ checkbox->draw(
x_pos + (text_width+font_width)/2,
y_pos - 8);
break;
}
case MN_ACTION:
- text_draw_align(text_font, pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+ text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
break;
case MN_GOTO:
- text_draw_align(text_font, pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+ text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
break;
}
}
/* The width of the menu has to be more than the width of the text
with the most characters */
int menu_width = 0;
- for(int i = 0; i < num_items; ++i)
+ for(unsigned int i = 0; i < item.size(); ++i)
{
int w = strlen(item[i].text) + (item[i].input ? strlen(item[i].input) + 1 : 0) + strlen(string_list_active(item[i].list));
if( w > menu_width )
int Menu::height()
{
- return ((num_items) * 24);
+ return item.size() * 24;
}
/* Draw the current menu. */
/* Draw a transparent background */
fillrect(pos_x - menu_width/2,
- pos_y - 24*num_items/2 - 10,
+ pos_y - 24*item.size()/2 - 10,
menu_width,menu_height + 20,
150,180,200,125);
- for(int i = 0; i < num_items; ++i)
+ for(unsigned int i = 0; i < item.size(); ++i)
{
draw_item(i, menu_width, menu_height);
}
}
/* Check for menu event */
-void menu_event(SDL_Event& event)
+void
+Menu::event(SDL_Event& event)
{
SDLKey key;
switch(event.type)
menu_change = true;
break;
case SDLK_SPACE:
- if(current_menu->item[current_menu->active_item].kind == MN_TEXTFIELD)
+ if(item[active_item].kind == MN_TEXTFIELD)
{
menuaction = MENU_ACTION_INPUT;
menu_change = true;
case SDL_MOUSEBUTTONDOWN:
x = event.motion.x;
y = event.motion.y;
- if(x > current_menu->pos_x - current_menu->width()/2 &&
- x < current_menu->pos_x + current_menu->width()/2 &&
- y > current_menu->pos_y - current_menu->height()/2 &&
- y < current_menu->pos_y + current_menu->height()/2)
+ if(x > pos_x - width()/2 &&
+ x < pos_x + width()/2 &&
+ y > pos_y - height()/2 &&
+ y < pos_y + height()/2)
{
menuaction = MENU_ACTION_HIT;
}
case SDL_MOUSEMOTION:
x = event.motion.x;
y = event.motion.y;
- if(x > current_menu->pos_x - current_menu->width()/2 &&
- x < current_menu->pos_x + current_menu->width()/2 &&
- y > current_menu->pos_y - current_menu->height()/2 &&
- y < current_menu->pos_y + current_menu->height()/2)
+ if(x > pos_x - width()/2 &&
+ x < pos_x + width()/2 &&
+ y > pos_y - height()/2 &&
+ y < pos_y + height()/2)
{
- current_menu->active_item = (y - (current_menu->pos_y - current_menu->height()/2)) / 24;
+ active_item = (y - (pos_y - height()/2)) / 24;
menu_change = true;
mouse_cursor->set_state(MC_LINK);
}
projects / supertux.git / blobdiff