X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fleveleditor.cpp;h=c7776a3f53b80257916a659a7aa58f554270497a;hb=256958447aec9101378c9a0afea9146e5912c5ec;hp=0ecf74a10b0ff138cd857a608c8f6209da9d4695;hpb=ec0373a227beda2c2058d9e6fb127d93469960d5;p=supertux.git diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp index 0ecf74a10..c7776a3f5 100644 --- a/src/leveleditor.cpp +++ b/src/leveleditor.cpp @@ -489,63 +489,63 @@ int le_init() } menu_init(&leveleditor_menu); - menu_additem(&leveleditor_menu,menu_item_create(MN_LABEL,"Level Editor Menu",0,0)); - menu_additem(&leveleditor_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&leveleditor_menu,menu_item_create(MN_ACTION,"Return To Level Editor",0,0)); - menu_additem(&leveleditor_menu,menu_item_create(MN_DEACTIVE,"Level Subset Settings",0,&subset_settings_menu)); - menu_additem(&leveleditor_menu,menu_item_create(MN_GOTO,"Load Level Subset",0,&subset_load_menu)); - menu_additem(&leveleditor_menu,menu_item_create(MN_GOTO,"New Level Subset",0,&subset_new_menu)); - menu_additem(&leveleditor_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&leveleditor_menu,menu_item_create(MN_ACTION,"Quit Level Editor",0,0)); + menu_additem(&leveleditor_menu, MN_LABEL,"Level Editor Menu",0,0); + menu_additem(&leveleditor_menu, MN_HL,"",0,0); + menu_additem(&leveleditor_menu, MN_ACTION,"Return To Level Editor",0,0); + menu_additem(&leveleditor_menu, MN_DEACTIVE,"Level Subset Settings",0,&subset_settings_menu); + menu_additem(&leveleditor_menu, MN_GOTO,"Load Level Subset",0,&subset_load_menu); + menu_additem(&leveleditor_menu, MN_GOTO,"New Level Subset",0,&subset_new_menu); + menu_additem(&leveleditor_menu, MN_HL,"",0,0); + menu_additem(&leveleditor_menu, MN_ACTION,"Quit Level Editor",0,0); menu_reset(); menu_set_current(&leveleditor_menu); show_menu = YES; menu_init(&subset_load_menu); - menu_additem(&subset_load_menu,menu_item_create(MN_LABEL,"Load Level Subset",0,0)); - menu_additem(&subset_load_menu,menu_item_create(MN_HL,"",0,0)); + menu_additem(&subset_load_menu,MN_LABEL,"Load Level Subset",0,0); + menu_additem(&subset_load_menu,MN_HL,"",0,0); for(i = 0; i < level_subsets.num_items; ++i) { - menu_additem(&subset_load_menu,menu_item_create(MN_ACTION,level_subsets.item[i],0,0)); + menu_additem(&subset_load_menu,MN_ACTION,level_subsets.item[i],0,0); } - menu_additem(&subset_load_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&subset_load_menu,menu_item_create(MN_BACK,"Back",0,0)); + menu_additem(&subset_load_menu,MN_HL,"",0,0); + menu_additem(&subset_load_menu,MN_BACK,"Back",0,0); menu_init(&subset_new_menu); - menu_additem(&subset_new_menu,menu_item_create(MN_LABEL,"New Level Subset",0,0)); - menu_additem(&subset_new_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&subset_new_menu,menu_item_create(MN_TEXTFIELD,"Enter Name",0,0)); - menu_additem(&subset_new_menu,menu_item_create(MN_ACTION,"Create",0,0)); - menu_additem(&subset_new_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&subset_new_menu,menu_item_create(MN_BACK,"Back",0,0)); + menu_additem(&subset_new_menu,MN_LABEL,"New Level Subset",0,0); + menu_additem(&subset_new_menu,MN_HL,"",0,0); + menu_additem(&subset_new_menu,MN_TEXTFIELD,"Enter Name",0,0); + menu_additem(&subset_new_menu,MN_ACTION,"Create",0,0); + menu_additem(&subset_new_menu,MN_HL,"",0,0); + menu_additem(&subset_new_menu,MN_BACK,"Back",0,0); menu_init(&subset_settings_menu); - menu_additem(&subset_settings_menu,menu_item_create(MN_LABEL,"Level Subset Settings",0,0)); - menu_additem(&subset_settings_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&subset_settings_menu,menu_item_create(MN_TEXTFIELD,"Title",0,0)); - menu_additem(&subset_settings_menu,menu_item_create(MN_TEXTFIELD,"Description",0,0)); - menu_additem(&subset_settings_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&subset_settings_menu,menu_item_create(MN_ACTION,"Save Changes",0,0)); - menu_additem(&subset_settings_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&subset_settings_menu,menu_item_create(MN_BACK,"Back",0,0)); + menu_additem(&subset_settings_menu,MN_LABEL,"Level Subset Settings",0,0); + menu_additem(&subset_settings_menu,MN_HL,"",0,0); + menu_additem(&subset_settings_menu,MN_TEXTFIELD,"Title",0,0); + menu_additem(&subset_settings_menu,MN_TEXTFIELD,"Description",0,0); + menu_additem(&subset_settings_menu,MN_HL,"",0,0); + menu_additem(&subset_settings_menu,MN_ACTION,"Save Changes",0,0); + menu_additem(&subset_settings_menu,MN_HL,"",0,0); + menu_additem(&subset_settings_menu,MN_BACK,"Back",0,0); menu_init(&level_settings_menu); level_settings_menu.arrange_left = YES; - menu_additem(&level_settings_menu,menu_item_create(MN_LABEL,"Level Settings",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_TEXTFIELD,"Name ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_STRINGSELECT,"Theme ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_STRINGSELECT,"Song ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_STRINGSELECT,"Bg-Image",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_NUMFIELD,"Length ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_NUMFIELD,"Time ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_NUMFIELD,"Gravity",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_NUMFIELD,"Red ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_NUMFIELD,"Green ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_NUMFIELD,"Blue ",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&level_settings_menu,menu_item_create(MN_ACTION,"Apply Changes",0,0)); + menu_additem(&level_settings_menu,MN_LABEL,"Level Settings",0,0); + menu_additem(&level_settings_menu,MN_HL,"",0,0); + menu_additem(&level_settings_menu,MN_TEXTFIELD,"Name ",0,0); + menu_additem(&level_settings_menu,MN_STRINGSELECT,"Theme ",0,0); + menu_additem(&level_settings_menu,MN_STRINGSELECT,"Song ",0,0); + menu_additem(&level_settings_menu,MN_STRINGSELECT,"Bg-Image",0,0); + menu_additem(&level_settings_menu,MN_NUMFIELD,"Length ",0,0); + menu_additem(&level_settings_menu,MN_NUMFIELD,"Time ",0,0); + menu_additem(&level_settings_menu,MN_NUMFIELD,"Gravity",0,0); + menu_additem(&level_settings_menu,MN_NUMFIELD,"Red ",0,0); + menu_additem(&level_settings_menu,MN_NUMFIELD,"Green ",0,0); + menu_additem(&level_settings_menu,MN_NUMFIELD,"Blue ",0,0); + menu_additem(&level_settings_menu,MN_HL,"",0,0); + menu_additem(&level_settings_menu,MN_ACTION,"Apply Changes",0,0); SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); @@ -801,7 +801,7 @@ void le_drawinterface() button_panel_draw(&le_bad_panel); sprintf(str, "%d/%d", le_level,le_level_subset.levels); - text_drawf(&white_text, str, -8, 16, A_RIGHT, A_NONE, 1, NO_UPDATE); + text_drawf(&white_text, str, -8, 16, A_RIGHT, A_TOP, 1, NO_UPDATE); text_draw(&white_small_text, "F1 for Help", 10, 430, 1, NO_UPDATE); } @@ -817,7 +817,7 @@ void le_drawinterface() void le_drawlevel() { - int y,x,i,s; + unsigned int y,x,i,s; /* Draw the real background */ if(le_current_level->bkgd_image[0] != '\0') @@ -1043,13 +1043,13 @@ void le_checkevents() { /* Check for button events */ button_event(&le_test_level_bt,&event); - if(button_get_state(&le_test_level_bt) == BN_CLICKED) + if(button_get_state(&le_test_level_bt) == BUTTON_CLICKED) le_testlevel(); button_event(&le_save_level_bt,&event); - if(button_get_state(&le_save_level_bt) == BN_CLICKED) + if(button_get_state(&le_save_level_bt) == BUTTON_CLICKED) level_save(le_current_level,le_level_subset.name.c_str(),le_level); button_event(&le_next_level_bt,&event); - if(button_get_state(&le_next_level_bt) == BN_CLICKED) + if(button_get_state(&le_next_level_bt) == BUTTON_CLICKED) { if(le_level < le_level_subset.levels) { @@ -1095,23 +1095,23 @@ void le_checkevents() } } button_event(&le_previous_level_bt,&event); - if(button_get_state(&le_previous_level_bt) == BN_CLICKED) + if(button_get_state(&le_previous_level_bt) == BUTTON_CLICKED) { if(le_level > 1) le_goto_level(--le_level); } button_event(&le_rubber_bt,&event); - if(button_get_state(&le_rubber_bt) == BN_CLICKED) + if(button_get_state(&le_rubber_bt) == BUTTON_CLICKED) le_current_tile = '.'; button_event(&le_select_mode_one_bt,&event); - if(button_get_state(&le_select_mode_one_bt) == BN_CLICKED) + if(button_get_state(&le_select_mode_one_bt) == BUTTON_CLICKED) le_selection_mode = CURSOR; button_event(&le_select_mode_two_bt,&event); - if(button_get_state(&le_select_mode_two_bt) == BN_CLICKED) + if(button_get_state(&le_select_mode_two_bt) == BUTTON_CLICKED) le_selection_mode = SQUARE; button_event(&le_bad_bt,&event); - if(button_get_state(&le_bad_bt) == BN_CLICKED) + if(button_get_state(&le_bad_bt) == BUTTON_CLICKED) { le_bad_panel.hidden = NO; le_fgd_panel.hidden = YES; @@ -1119,21 +1119,21 @@ void le_checkevents() } button_event(&le_fgd_bt,&event); - if(button_get_state(&le_fgd_bt) == BN_CLICKED) + if(button_get_state(&le_fgd_bt) == BUTTON_CLICKED) { le_bad_panel.hidden = YES; le_fgd_panel.hidden = NO; le_bkgd_panel.hidden = YES; } button_event(&le_bkgd_bt,&event); - if(button_get_state(&le_bkgd_bt) == BN_CLICKED) + if(button_get_state(&le_bkgd_bt) == BUTTON_CLICKED) { le_bad_panel.hidden = YES; le_fgd_panel.hidden = YES; le_bkgd_panel.hidden = NO; } button_event(&le_settings_bt,&event); - if(button_get_state(&le_settings_bt) == BN_CLICKED) + if(button_get_state(&le_settings_bt) == BUTTON_CLICKED) { if(show_menu == NO) { @@ -1149,7 +1149,7 @@ void le_checkevents() } if((pbutton = button_panel_event(&le_bkgd_panel,&event)) != NULL) { - if(button_get_state(pbutton) == BN_CLICKED) + if(button_get_state(pbutton) == BUTTON_CLICKED) { char c = '\0'; if(pbutton->tag >= 0 && pbutton->tag <= 3) @@ -1166,7 +1166,7 @@ void le_checkevents() } if((pbutton = button_panel_event(&le_fgd_panel,&event)) != NULL) { - if(button_get_state(pbutton) == BN_CLICKED) + if(button_get_state(pbutton) == BUTTON_CLICKED) { char c = '\0'; if(pbutton->tag == 0) @@ -1211,7 +1211,7 @@ void le_checkevents() } if((pbutton = button_panel_event(&le_bad_panel,&event)) != NULL) { - if(button_get_state(pbutton) == BN_CLICKED) + if(button_get_state(pbutton) == BUTTON_CLICKED) { char c = '\0'; if(pbutton->tag >= 0 && pbutton->tag <= 2) @@ -1224,7 +1224,7 @@ void le_checkevents() else { button_event(&le_settings_bt,&event); - if(button_get_state(&le_settings_bt) == BN_CLICKED) + if(button_get_state(&le_settings_bt) == BUTTON_CLICKED) { if(show_menu == NO) { @@ -1254,20 +1254,20 @@ void le_checkevents() } if(show_menu == NO) { - if(button_get_state(&le_move_left_bt) == BN_PRESSED) + if(button_get_state(&le_move_left_bt) == BUTTON_PRESSED) { pos_x -= 192; } - else if(button_get_state(&le_move_left_bt) == BN_HOVER) + else if(button_get_state(&le_move_left_bt) == BUTTON_HOVER) { pos_x -= 96; } - if(button_get_state(&le_move_right_bt) == BN_PRESSED) + if(button_get_state(&le_move_right_bt) == BUTTON_PRESSED) { pos_x += 192; } - else if(button_get_state(&le_move_right_bt) == BN_HOVER) + else if(button_get_state(&le_move_right_bt) == BUTTON_HOVER) { pos_x += 96; } @@ -1312,8 +1312,9 @@ void le_change(float x, float y, unsigned char c) { if(le_current_level != NULL) { - int xx,yy,i; + int xx,yy; int x1, x2, y1, y2; + unsigned int i; /* level_changed = YES; */