diff --git a/client/options.cpp b/client/options.cpp index 86cde2a90d..a5f838c485 100644 --- a/client/options.cpp +++ b/client/options.cpp @@ -4783,43 +4783,6 @@ const char *tileset_name_for_topology(int topology_id) return tsn; } -/** - Set given tileset as the default for suitable topology - */ -void option_set_default_ts(struct tileset *t) -{ - const char *optname = ""; - struct option *opt; - - switch (tileset_topo_index(t)) { - case TS_TOPO_SQUARE: - // Overhead - optname = "default_tileset_square_name"; - break; - case TS_TOPO_HEX: - // Hex - optname = "default_tileset_hex_name"; - break; - case TS_TOPO_ISOHEX: - // Isohex - optname = "default_tileset_isohex_name"; - break; - } - - opt = optset_option_by_name(client_optset, optname); - - if (opt == nullptr) { - qCritical("Unknown option name \"%s\" in option_set_default_ts()", - optname); - return; - } - - /* Do not call option_str_set() since we don't want option changed callback - * to reload this tileset. */ - opt->str_vtable->set(opt, tileset_basename(t)); - option_gui_update(opt); -} - /** Does topology-specific tileset option lack value? */ diff --git a/client/options.h b/client/options.h index 1678aba22d..89dc98fbf7 100644 --- a/client/options.h +++ b/client/options.h @@ -322,5 +322,4 @@ extern int messages_where[]; // OR-ed MW_ values [E_COUNT] struct tileset; const char *tileset_name_for_topology(int topology_id); -void option_set_default_ts(struct tileset *t); void fill_topo_ts_default(); diff --git a/client/tileset/tilespec.cpp b/client/tileset/tilespec.cpp index 4f021277c8..2336b12e35 100644 --- a/client/tileset/tilespec.cpp +++ b/client/tileset/tilespec.cpp @@ -973,7 +973,6 @@ bool tilespec_try_read(const QString &tileset_name, bool verbose, } else { original = true; } - option_set_default_ts(tileset); return original; }