diff --git a/client/tileset/tilespec.cpp b/client/tileset/tilespec.cpp index 3b325106aa..a71dd861ad 100644 --- a/client/tileset/tilespec.cpp +++ b/client/tileset/tilespec.cpp @@ -364,9 +364,6 @@ struct tileset { int replaced_hue; // -1 means no replacement struct color_system *color_system; struct extra_type_list *style_lists[ESTYLE_COUNT]; - - int num_preferred_themes; - char **preferred_themes; }; struct tileset *tileset; @@ -904,15 +901,6 @@ static void tileset_free_toplevel(struct tileset *t) { int i; - if (t->preferred_themes) { - for (i = 0; i < t->num_preferred_themes; i++) { - delete[] t->preferred_themes[i]; - } - delete[] t->preferred_themes; - t->preferred_themes = nullptr; - } - t->num_preferred_themes = 0; - if (t->estyle_hash) { delete t->estyle_hash; t->estyle_hash = nullptr; @@ -1646,7 +1634,6 @@ static struct tileset *tileset_read_toplevel(const QString &tileset_name, const char **spec_filenames; size_t num_layers; const char **layer_order = nullptr; - size_t num_preferred_themes; struct section_list *sections = nullptr; const char *file_capstr; bool duplicates_ok, is_hex; @@ -2171,23 +2158,6 @@ static struct tileset *tileset_read_toplevel(const QString &tileset_name, t->color_system = color_system_read(file); - // FIXME: remove this hack. - t->preferred_themes = const_cast(secfile_lookup_str_vec( - file, &num_preferred_themes, "tilespec.preferred_themes")); - if (num_preferred_themes <= 0) { - t->preferred_themes = const_cast(secfile_lookup_str_vec( - file, &num_preferred_themes, "tilespec.prefered_themes")); - if (num_preferred_themes > 0) { - qCWarning(deprecations_category, - "Entry tilespec.prefered_themes in tilespec." - " Use correct spelling tilespec.preferred_themes instead"); - } - } - t->num_preferred_themes = num_preferred_themes; - for (i = 0; i < t->num_preferred_themes; i++) { - t->preferred_themes[i] = fc_strdup(t->preferred_themes[i]); - } - secfile_check_unused(file); secfile_destroy(file); qDebug("finished reading \"%s\".", fname);