Add more magic numbers for up and comming version of ancient.

mywave82 · Dec 20, 2024 · 6b4bf82 · 6b4bf82
1 parent 17e9f1e
commit 6b4bf82
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/filesel/filesystem-ancient.cpp b/filesel/filesystem-ancient.cpp
@@ -108,6 +108,7 @@ static struct ocpfilehandle_t *ancient_filehandle_srcbuffer (char *compressionme
 struct ocpfilehandle_t *ancient_filehandle (char *compressionmethod, int compressionmethod_len, struct ocpfilehandle_t *s)
 {
 	uint32_t magic;
+	uint32_t footer = 0;
 
 	s->seek_set (s, 0);
 	if (ocpfilehandle_read_uint32_be (s, &magic))
@@ -131,6 +132,17 @@ struct ocpfilehandle_t *ancient_filehandle (char *compressionmethod, int compres
 		}
 	}
 
+	if (s->filesize_ready(s) && (s->filesize(s) < 0x10000) && (s->filesize(s) > 4))
+	{
+		s->seek_set (s, s->filesize(s) - 4);
+		if (ocpfilehandle_read_uint32_be (s, &footer))
+		{
+			s->seek_set (s, 0);
+			return 0;
+		}
+		s->seek_set (s, 0);
+	}
+
 	if (((magic & 0xffffff00U)==FourCC("BZh\0") && (magic & 0xffU) >= '1' && (magic & 0xffU) <= '9') ||
 	    ((magic >> 16) == 0x1f8b) ||
 	    (magic == FourCC("CrM!")) ||
@@ -187,7 +199,13 @@ struct ocpfilehandle_t *ancient_filehandle (char *compressionmethod, int compres
 	    (magic == FourCC("RVV!")) ||                   /* Hoi AGA Remix,                    will be added in v2.2.0 src/PPDecompressor.cpp */
 	    (magic == FourCC("...\001")) ||                /* Total Carnage,                    will be added in v2.2.0 src/RNCDecompressor.cpp */
 	    (magic == FourCC("Vice")) ||                   /*                                   will be added in v2.2.0 src/VicXDecompressor.cpp */
-	    (magic == FourCC("Vic2"))                      /*                                   will be added in v2.2.0 src/VicXDecompressor.cpp */
+	    (magic == FourCC("Vic2")) ||                   /*                                   will be added in v2.2.0 src/VicXDecompressor.cpp */
+	    (footer== FourCC("Ice!")) ||                   /* ICE version 0                         will be added in v2.3.0 src/IceXDecompressor.cpp */
+	    (magic == FourCC("Ice!")) ||                   /* ICE version 1                         will be added in v2.3.0 src/IceXDecompressor.cpp */
+	    (magic == FourCC("TMM!")) ||                   /* ICE version 1, Demo Numb/Movement,    will be added in v2.3.0 src/IceXDecompressor.cpp */
+	    (magic == FourCC("TSM!")) ||                   /* ICE version 1, Lots of Amiga games,   will be added in v2.3.0 src/IceXDecompressor.cpp */
+	    (magic == FourCC("SHE!")) ||                   /* ICE version 1, Demo Overload2/JetSet, will be added in v2.3.0 src/IceXDecompressor.cpp */
+	    (magic == FourCC("ICE!"))                      /* ICE version 2                         will be added in v2.3.0 src/IceXDecompressor.cpp */
 	   )
 	{
 isancient: