Merge branch 'optional_q3map2_type' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 5 Jun 2018 10:03:31 +0000 (10:03 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 5 Jun 2018 10:03:31 +0000 (10:03 +0000)
Fix BSP import error when q3map2_type is missing from gamepack xml

See merge request xonotic/netradiant!96

radiant/map.cpp

index 5e26422..2cecfe3 100644 (file)
@@ -1641,7 +1641,7 @@ bool Map_ImportFile(const char *filename)
 
     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"))) {