Merge branch 'optional_q3map2_type' into 'master'

Fix BSP import error when q3map2_type is missing from gamepack xml

See merge request xonotic/netradiant!96

diff --combined radiant/map.cpp
index 5e26422d99f5ad0479d98df598646d68ea741092,bedfe813f32837ff34af45bf4041eca14bfdde4e..2cecfe3cd81bc572af7b0c7299a69ac487ba6bdd
--- 1/radiant/map.cpp
--- 2/radiant/map.cpp
+++ b/radiant/map.cpp
@@@ -1050,9 -1050,9 +1050,9 @@@ void Map_LoadFile(const char *filename
  
      g_currentMap = &g_map;
  
 -    // restart VFS to apply new pak filtering based on mapname
 +    // refresh VFS to apply new pak filtering based on mapname
      // needed for daemon DPK VFS
 -    VFS_Restart();
 +    VFS_Refresh();
  }
  
  class Excluder {
@@@ -1641,7 -1641,7 +1641,7 @@@ bool Map_ImportFile(const char *filenam
  
      tryDecompile:
  
-     const char *type = GlobalRadiant().getRequiredGameDescriptionKeyValue("q3map2_type");
+     const char *type = GlobalRadiant().getGameDescriptionKeyValue("q3map2_type");
      int n = string_length(path_get_extension(filename));
      if (n && (extension_equal(path_get_extension(filename), "bsp") ||
                extension_equal(path_get_extension(filename), "map"))) {