Versioned map entity patches

Misc/qs_pak/Makefile

@@ -1,10 +1,10 @@
 INPUT := gfx/conback.lmp \
-	maps/e1m1.ent \
+	maps/e1m1@c49d.ent \
-	maps/e1m2.ent \
+	maps/e1m2@0caa.ent \
-	maps/e1m4.ent \
+	maps/e1m4@958e.ent \
-	maps/e2m2.ent \
+	maps/e2m2@fbfe.ent \
-	maps/e2m3.ent \
+	maps/e2m3@237a.ent \
-	maps/e2m7.ent \
+	maps/e2m7@10a8.ent \
 	default.cfg
 
 OUTPUT := quakespasm.pak

Quake/gl_model.c

@@ -796,20 +796,34 @@ Mod_LoadEntities
 */
 void Mod_LoadEntities (lump_t *l)
 {
+	char	basemapname[MAX_QPATH];
 	char	entfilename[MAX_QPATH];
 	char		*ents;
 	int		mark;
 	unsigned int	path_id;
+	unsigned int	crc = 0;
 
 	if (! external_ents.value)
 		goto _load_embedded;
 
-	q_strlcpy(entfilename, loadmodel->name, sizeof(entfilename));
+	if (l->filelen > 0)
-	COM_StripExtension(entfilename, entfilename, sizeof(entfilename));
+		crc = CRC_Block(mod_base + l->fileofs, l->filelen);
-	q_strlcat(entfilename, ".ent", sizeof(entfilename));
-	Con_DPrintf2("trying to load %s\n", entfilename);
 	mark = Hunk_LowMark();
+
+	q_strlcpy(basemapname, loadmodel->name, sizeof(basemapname));
+	COM_StripExtension(basemapname, basemapname, sizeof(basemapname));
+
+	q_snprintf(entfilename, sizeof(entfilename), "%s@%04x.ent", basemapname, crc);
+	Con_DPrintf2("trying to load %s\n", entfilename);
 	ents = (char *) COM_LoadHunkFile (entfilename, &path_id);
+
+	if (!ents)
+	{
+		q_snprintf(entfilename, sizeof(entfilename), "%s.ent", basemapname);
+		Con_DPrintf2("trying to load %s\n", entfilename);
+		ents = (char *) COM_LoadHunkFile (entfilename, &path_id);
+	}
+
 	if (ents)
 	{
 		// use ent file only from the same gamedir as the map