From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 14 Jul 2010 10:13:50 +0000 (+0000)
Subject: allow loading non-bsp files as world models (no longer always appends
X-Git-Tag: xonotic-v0.1.0preview~230^2~155
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=8208cec06dd1a4a263a0de114279ab3afcf5890b

allow loading non-bsp files as world models (no longer always appends
.bsp suffix)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10323 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/sv_main.c b/sv_main.c
index 119fc9ed..5a82ab16 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -3075,12 +3075,16 @@ void SV_SpawnServer (const char *server)
 
 	Con_DPrintf("SpawnServer: %s\n", server);
 
-	dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", server);
+	dpsnprintf (modelname, sizeof(modelname), "maps/%s", server);
 
 	if (!FS_FileExists(modelname))
 	{
-		Con_Printf("SpawnServer: no map file named %s\n", modelname);
-		return;
+		dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", server);
+		if (!FS_FileExists(modelname))
+		{
+			Con_Printf("SpawnServer: no map file named %s\n", modelname);
+			return;
+		}
 	}
 
 	if (cls.state != ca_dedicated)