Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-23 12:33:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

more error-prone archive loading

Browse source
This commit is contained in:
in0finite 2021-01-31 00:14:40 +01:00
parent cf322da937
commit 3e764a7b59
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Assets/Scripts/Importing/Archive/ImageArchive.cs
View file

@ -43,6 +43,8 @@ namespace SanAndreasUnity.Importing.Archive
{ {
_stream = stream; _stream = stream;
string archiveName = _stream is FileStream fs ? Path.GetFileName(fs.Name) : string.Empty;
var reader = new BinaryReader(stream); var reader = new BinaryReader(stream);
Version = new String(reader.ReadChars(4)); Version = new String(reader.ReadChars(4));
EntryCount = reader.ReadUInt32(); EntryCount = reader.ReadUInt32();
@ -51,9 +53,22 @@ namespace SanAndreasUnity.Importing.Archive
_fileDict = new Dictionary<string, ImageArchiveEntry>(StringComparer.InvariantCultureIgnoreCase); _fileDict = new Dictionary<string, ImageArchiveEntry>(StringComparer.InvariantCultureIgnoreCase);
_extDict = new Dictionary<string, List<string>>(StringComparer.InvariantCultureIgnoreCase); _extDict = new Dictionary<string, List<string>>(StringComparer.InvariantCultureIgnoreCase);
if (Version != "VER2")
{
UnityEngine.Debug.LogWarning($"Archive {archiveName} has unsupported version {Version}");
return;
}
for (var i = 0; i < EntryCount; ++i) for (var i = 0; i < EntryCount; ++i)
{ {
var entry = new ImageArchiveEntry(reader); var entry = new ImageArchiveEntry(reader);
if (_fileDict.ContainsKey(entry.Name))
{
UnityEngine.Debug.LogWarning($"file entry (name: {entry.Name}, size: {entry.Size}) already exists in archive {archiveName}");
continue;
}
_entries.Add(entry); _entries.Add(entry);
_fileDict.Add(entry.Name, entry); _fileDict.Add(entry.Name, entry);