X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=0c065762676cf00ea4414de701941997cda8b449;hb=4e9530d1cc582e710761b638de9dcb39935484f2;hp=8da3feb9c03aa11ddf7e3055e2f686b64406bf00;hpb=3a3108d045227e21342a915ffc7e022e8eecbedc;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 8da3feb9..0c065762 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1297,7 +1297,6 @@ static struct ElementInfo custom_element; static char levelset_name[MAX_LEVEL_NAME_LEN + 1]; static char levelset_author[MAX_LEVEL_AUTHOR_LEN + 1]; static int levelset_num_levels = 100; -static int levelset_first_level_nr = 1; static int levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE; static struct @@ -5689,6 +5688,10 @@ static void ReinitializeElementList() num_editor_elements += num_editor_el_empty; } + else + { + num_editor_el_empty = 0; + } editor_elements = checked_malloc(num_editor_elements * sizeof(int)); @@ -7591,7 +7594,7 @@ static void ModifyLevelInfoForSavingIntoPersonalLevelSet(char *former_name) } if (level_nr > leveldir_current->last_level) - UpdateUserLevelSet(getLoginName(), NULL, NULL, level_nr + 9, -1); + UpdateUserLevelSet(getLoginName(), NULL, NULL, level_nr + 9); // else: allow the save even if annotation failed @@ -8230,8 +8233,7 @@ static void InitLevelSetInfo() snprintf(levelset_author, MAX_LEVEL_AUTHOR_LEN + 1, "%s", leveldir_current->author); - levelset_num_levels = leveldir_current->levels; - levelset_first_level_nr = leveldir_current->first_level; + levelset_num_levels = leveldir_current->levels; levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE; } @@ -12640,8 +12642,7 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi) if (UpdateUserLevelSet(levelset_subdir, levelset_name, levelset_author, - levelset_num_levels, - levelset_first_level_nr)) + levelset_num_levels)) { Request("Level set updated!", REQ_CONFIRM); } @@ -12655,8 +12656,7 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi) if (CreateUserLevelSet(levelset_subdir, levelset_name, levelset_author, - levelset_num_levels, - levelset_first_level_nr)) + levelset_num_levels)) { Request("New level set created!", REQ_CONFIRM);