load entities string from an optional file maps/<map>.ent

Author: sweet235

src/common/cm/cm_load.cpp

@@ -514,16 +514,26 @@ static void CMod_LoadBrushSides(const byte *const cmod_base, const lump_t *l)
 CMod_LoadEntityString
 =================
 */
-static void CMod_LoadEntityString(const byte *const cmod_base, const lump_t *l)
+static void CMod_LoadEntityString(const byte *const cmod_base, const lump_t *l, std::string &externalEntities)
 {
 	const char *p, *token;
 	char keyname[ MAX_TOKEN_CHARS ];
 	char value[ MAX_TOKEN_CHARS ];
 
-	cm.entityString = ( char * ) CM_Alloc( l->filelen + 1);
-	cm.numEntityChars = l->filelen;
-	memcpy( cm.entityString, cmod_base + l->fileofs, l->filelen );
-	cm.entityString[l->filelen] = '\0';
+	if ( externalEntities.empty() )
+	{
+		cm.entityString = ( char * ) CM_Alloc( l->filelen + 1);
+		cm.numEntityChars = l->filelen;
+		memcpy( cm.entityString, cmod_base + l->fileofs, l->filelen );
+		cm.entityString[l->filelen] = '\0';
+	}
+	else
+	{
+		int len = externalEntities.length();
+		cm.entityString = ( char * ) CM_Alloc( len + 1 );
+		cm.numEntityChars = len;
+		memcpy( cm.entityString, externalEntities.c_str(), len + 1 );
+	}
 
 	p = cm.entityString;
 
@@ -764,6 +774,17 @@ void CM_LoadMap(Str::StringRef name)
 		Sys::Drop("Could not load %s", mapFile.c_str());
 	}
 
+	std::string externalEntities = FS::PakPath::ReadFile( "maps/" + name + ".ent", err );
+	if ( err )
+	{
+		const std::error_code notFound( Util::ordinal( FS::filesystem_error::no_such_file ), FS::filesystem_category() );
+		if ( err != notFound )
+		{
+			Sys::Drop( "Could not read file 'maps/%s.ent': %s", name.c_str(), err.message() );
+		}
+		externalEntities = "";
+	}
+
 	// clear collision map data
 	CM_ClearMap();
 
@@ -801,7 +822,7 @@ void CM_LoadMap(Str::StringRef name)
 	CMod_LoadBrushes(cmod_base, &header.lumps[LUMP_BRUSHES]);
 	CMod_LoadSubmodels(cmod_base, &header.lumps[LUMP_MODELS]);
 	CMod_LoadNodes(cmod_base, &header.lumps[LUMP_NODES]);
-	CMod_LoadEntityString(cmod_base, &header.lumps[LUMP_ENTITIES]);
+	CMod_LoadEntityString(cmod_base, &header.lumps[LUMP_ENTITIES], externalEntities);
 	CMod_LoadVisibility(cmod_base, &header.lumps[LUMP_VISIBILITY]);
 	CMod_LoadSurfaces(cmod_base,
 					  &header.lumps[LUMP_SURFACES], &header.lumps[LUMP_DRAWVERTS], &header.lumps[LUMP_DRAWINDEXES]);

src/engine/renderer/tr_bsp.cpp

@@ -4281,7 +4281,7 @@ void R_LoadLightGrid( lump_t *l )
 R_LoadEntities
 ================
 */
-void R_LoadEntities( lump_t *l )
+void R_LoadEntities( lump_t *l, std::string &externalEntities )
 {
 	int          i;
 	const char *p, *pOld, *token;
@@ -4305,9 +4305,18 @@ void R_LoadEntities( lump_t *l )
 	w->lightGridSize[ 2 ] = 128;
 
 	// store for reference by the cgame
-	w->entityString = (char*) ri.Hunk_Alloc( l->filelen + 1, ha_pref::h_low );
-	//strcpy(w->entityString, (char *)(fileBase + l->fileofs));
-	Q_strncpyz( w->entityString, ( char * )( fileBase + l->fileofs ), l->filelen + 1 );
+	if ( externalEntities.empty() )
+	{
+		w->entityString = (char*) ri.Hunk_Alloc( l->filelen + 1, ha_pref::h_low );
+		//strcpy(w->entityString, (char *)(fileBase + l->fileofs));
+		Q_strncpyz( w->entityString, ( char * )( fileBase + l->fileofs ), l->filelen + 1 );
+	}
+	else
+	{
+		w->entityString = (char*) ri.Hunk_Alloc( externalEntities.length() + 1, ha_pref::h_low );
+		Q_strncpyz( w->entityString, externalEntities.c_str(), externalEntities.length() + 1 );
+	}
+
 	w->entityParsePoint = w->entityString;
 
 	p = w->entityString;
@@ -6942,7 +6951,19 @@ void RE_LoadWorldMap( const char *name )
 	}
 
 	// load into heap
-	R_LoadEntities( &header->lumps[ LUMP_ENTITIES ] );
+
+	std::string externalEntitiesFileName = FS::Path::StripExtension( name ) + ".ent";
+	std::string externalEntities = FS::PakPath::ReadFile( externalEntitiesFileName, err );
+	if ( err )
+	{
+		const std::error_code notFound( Util::ordinal( FS::filesystem_error::no_such_file ), FS::filesystem_category() );
+		if ( err != notFound )
+		{
+			Sys::Drop( "Could not read file '%s': %s", externalEntitiesFileName.c_str(), err.message() );
+		}
+		externalEntities = "";
+	}
+	R_LoadEntities( &header->lumps[ LUMP_ENTITIES ], externalEntities );
 
 	R_LoadShaders( &header->lumps[ LUMP_SHADERS ] );