From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 22 Jan 2008 19:15:55 +0000 (+0000)
Subject: removed mcbsp map parsing
X-Git-Tag: xonotic-v0.1.0preview~2517
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eeccabbb650084531500c0e1d13d28dc5218ba8f;p=xonotic%2Fdarkplaces.git

removed mcbsp map parsing


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

diff --git a/console.c b/console.c
index a3d7bb5c..d7084e39 100644
--- a/console.c
+++ b/console.c
@@ -1547,7 +1547,7 @@ Prints not only map filename, but also
 its format (q1/q2/q3/hl) and even its message
 */
 //[515]: here is an ugly hack.. two gotos... oh my... *but it works*
-//LordHavoc: rewrote bsp type detection, added mcbsp support and rewrote message extraction to do proper worldspawn parsing
+//LordHavoc: rewrote bsp type detection, rewrote message extraction to do proper worldspawn parsing
 //LordHavoc: added .ent file loading, and redesigned error handling to still try the .ent file even if the map format is not recognized, this also eliminated one goto
 //LordHavoc: FIXME: man this GetMapList is STILL ugly code even after my cleanups...
 qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength)
@@ -1609,16 +1609,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 					lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen);
 				}
 			}
-			else if (!memcmp(buf, "MCBSPpad", 8))
-			{
-				p = LittleLong(((int *)buf)[2]);
-				if (p == MCBSPVERSION)
-				{
-					int numhulls = LittleLong(((int *)buf)[3]);
-					lumpofs = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+0]);
-					lumplen = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+1]);
-				}
-			}
 			else if((p = LittleLong(((int *)buf)[0])) == BSPVERSION || p == 30)
 			{
 				dheader_t *header = (dheader_t *)buf;
@@ -1679,7 +1669,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 		case Q3BSPVERSION:	strlcpy((char *)buf, "Q3", sizeof(buf));break;
 		case Q2BSPVERSION:	strlcpy((char *)buf, "Q2", sizeof(buf));break;
 		case BSPVERSION:	strlcpy((char *)buf, "Q1", sizeof(buf));break;
-		case MCBSPVERSION:	strlcpy((char *)buf, "MC", sizeof(buf));break;
 		case 30:			strlcpy((char *)buf, "HL", sizeof(buf));break;
 		default:			strlcpy((char *)buf, "??", sizeof(buf));break;
 		}