diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index 6a3ee6e7..8f860b3c 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -163,6 +163,7 @@
+
diff --git a/ArcFormats/Eternity/ArcGLNK.cs b/ArcFormats/Eternity/ArcGLNK.cs
new file mode 100644
index 00000000..efb20c76
--- /dev/null
+++ b/ArcFormats/Eternity/ArcGLNK.cs
@@ -0,0 +1,77 @@
+//! \file ArcGLNK.cs
+//! \date 2018 Nov 10
+//! \brief Studio Miris archive implementation.
+//
+// Copyright (C) 2015-2018 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+
+namespace GameRes.Formats.Miris
+{
+ [Export(typeof(ArchiveFormat))]
+ public class GlnkOpener : ArchiveFormat
+ {
+ public override string Tag { get { return "GLNK/MIRIS"; } }
+ public override string Description { get { return "Studio Miris resource archive"; } }
+ public override uint Signature { get { return 0x4B4E4C47; } } // 'GLNK'
+ public override bool IsHierarchic { get { return false; } }
+ public override bool CanWrite { get { return false; } }
+
+ public GlnkOpener ()
+ {
+ Extensions = new string[] { "dat", "glk", "mlk", "slk", "gl", "ml", "sl", "ets", "etg", "etm" };
+ }
+
+ public override ArcFile TryOpen (ArcView file)
+ {
+ int version = file.View.ReadUInt16 (4);
+ int count = file.View.ReadInt32 (6);
+ if (!IsSaneCount (count))
+ return null;
+ long index_offset = file.View.ReadUInt32 (0xA);
+ int index_length = file.View.ReadInt32 (0xE);
+ if (index_length > file.View.Reserve (index_offset, (uint)index_length))
+ return null;
+ int entry_size = version >= 0x6E ? 12 : 8;
+
+ var dir = new List (count);
+ for (int i = 0; i < count; ++i)
+ {
+ if (index_length <= 0)
+ return null;
+ int name_length = file.View.ReadByte (index_offset++);
+ string name = file.View.ReadString (index_offset, (uint)name_length);
+ index_offset += name_length;
+ var entry = Create (name);
+ entry.Offset = file.View.ReadUInt32 (index_offset);
+ entry.Size = file.View.ReadUInt32 (index_offset+4);
+ if (!entry.CheckPlacement (file.MaxOffset))
+ return null;
+ dir.Add (entry);
+ index_offset += entry_size;
+ index_length -= 1+name_length + entry_size;
+ }
+ return new ArcFile (file, this, dir);
+ }
+ }
+}
diff --git a/ArcFormats/Eternity/ArcMiris.cs b/ArcFormats/Eternity/ArcMiris.cs
index 8d767056..e7950fcc 100644
--- a/ArcFormats/Eternity/ArcMiris.cs
+++ b/ArcFormats/Eternity/ArcMiris.cs
@@ -29,7 +29,6 @@ using System.ComponentModel.Composition;
using System.IO;
using System.Text.RegularExpressions;
using GameRes.Compression;
-using GameRes.Utility;
namespace GameRes.Formats.Miris
{
@@ -85,51 +84,4 @@ namespace GameRes.Formats.Miris
return new ArcFile (file, this, dir);
}
}
-
- [Export(typeof(ArchiveFormat))]
- public class GlnkOpener : ArchiveFormat
- {
- public override string Tag { get { return "GLNK/MIRIS"; } }
- public override string Description { get { return "Studio Miris resource archive"; } }
- public override uint Signature { get { return 0x4B4E4C47; } } // 'GLNK'
- public override bool IsHierarchic { get { return false; } }
- public override bool CanWrite { get { return false; } }
-
- public GlnkOpener ()
- {
- Extensions = new string[] { "dat", "glk", "mlk", "slk", "gl", "ml", "sl", "ets", "etg", "etm" };
- }
-
- public override ArcFile TryOpen (ArcView file)
- {
- int version = file.View.ReadUInt16 (4);
- int count = file.View.ReadInt32 (6);
- if (!IsSaneCount (count))
- return null;
- long index_offset = file.View.ReadUInt32 (0xA);
- int index_length = file.View.ReadInt32 (0xE);
- if (index_length > file.View.Reserve (index_offset, (uint)index_length))
- return null;
- int entry_size = version >= 0x6E ? 12 : 8;
-
- var dir = new List (count);
- for (int i = 0; i < count; ++i)
- {
- if (index_length <= 0)
- return null;
- int name_length = file.View.ReadByte (index_offset++);
- string name = file.View.ReadString (index_offset, (uint)name_length);
- index_offset += name_length;
- var entry = FormatCatalog.Instance.Create (name);
- entry.Offset = file.View.ReadUInt32 (index_offset);
- entry.Size = file.View.ReadUInt32 (index_offset+4);
- if (!entry.CheckPlacement (file.MaxOffset))
- return null;
- dir.Add (entry);
- index_offset += entry_size;
- index_length -= 1+name_length + entry_size;
- }
- return new ArcFile (file, this, dir);
- }
- }
}