From: Zack Middleton <zack@cloemail.com>
Date: Tue, 22 May 2018 20:44:57 +0000 (-0500)
Subject: Fix BSP import error when q3map2_type is missing from gamepack xml
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F96%2Fhead;p=xonotic%2Fnetradiant.git

Fix BSP import error when q3map2_type is missing from gamepack xml

Using File -> Import... to import a BSP using a gamepack that does not
specify q3map2_type (such as the Quake 3 gamepack) resulted in a fatal
error:

    runtime error: game attribute "q3map2_type" not found in "q3.game"

The code already has a fallback to use type "quake3" if q3map2_type is
missing so don't require gamepacks to specify it.
---

diff --git a/radiant/map.cpp b/radiant/map.cpp
index adf69f46..bedfe813 100644
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -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"))) {