Removed obsolete "levels" option. des files to load should be specified in loadmaps.lua and nowhere else.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2663 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 0 insertions, 17 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 856cfc7ea5..b252433227 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -1467,8 +1467,6 @@ public:
     std::string morgue_dir;     // Directory where character dumps and morgue
                                 // dumps are saved. Overrides crawl_dir.
 
-    std::vector<std::string> extra_levels;
-
     std::string player_name;
 
 #ifdef DGL_SIMPLE_MESSAGING
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index fbd6685bde..609eac8be8 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -755,8 +755,6 @@ void game_options::reset_options()
         channels[i] = MSGCOL_DEFAULT;
 
     // Clear vector options.
-    extra_levels.clear();
-    
     dump_order.clear();
     new_dump_fields("header,hiscore,stats,misc,inventory,"
                     "skills,spells,overview,mutations,messages,screenshot,"
@@ -1787,10 +1785,6 @@ void game_options::read_option_line(const std::string &str, bool runscript)
         // As a suggestion, try "rxvt -rv -fn 10x20" under Un*xes
         friend_brand = curses_attribute(field);
     }
-    else if (key == "levels" || key == "level" || key == "entries")
-    {
-        extra_levels.push_back(field);
-    }
     else if (key == "stab_brand")
     {
         stab_brand = curses_attribute(field);
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 02b45e4744..912780d62d 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -671,15 +671,6 @@ void read_maps()
 {
     if (dlua.execfile("clua/loadmaps.lua", true, true))
         end(1, false, "Lua error: %s", dlua.error.c_str());
-    
-    for (int i = 0, size = Options.extra_levels.size(); i < size; ++i)
-    {
-        lc_desfile = datafile_path( Options.extra_levels[i] + ".des", false );
-        if (lc_desfile.empty())
-            continue;
-
-        parse_maps( lc_desfile );
-    }
 
     // Clean up cached environments.
     dlua.callfn("dgn_flush_map_environments", 0, 0);