cosmetic changes.

This commit is contained in:
morkt 2014-09-08 07:36:20 +04:00
parent c5982da278
commit 5d4696de4c
4 changed files with 11 additions and 5 deletions

View File

@ -294,9 +294,12 @@ namespace GameRes.Formats
return packed_size; return packed_size;
} }
static Lazy<GrpFormat> s_grp_format = new Lazy<GrpFormat> (() =>
FormatCatalog.Instance.ImageFormats.OfType<GrpFormat>().FirstOrDefault());
uint WriteImageEntry (PackedEntry entry, Stream input, Stream output) uint WriteImageEntry (PackedEntry entry, Stream input, Stream output)
{ {
var grp = FormatCatalog.Instance.ImageFormats.OfType<GrpFormat>().FirstOrDefault(); var grp = s_grp_format.Value;
if (null == grp) // probably never happens if (null == grp) // probably never happens
throw new FileFormatException ("GRP image encoder not available"); throw new FileFormatException ("GRP image encoder not available");
bool is_grp = grp.Signature == FormatCatalog.ReadSignature (input); bool is_grp = grp.Signature == FormatCatalog.ReadSignature (input);

View File

@ -174,12 +174,15 @@ namespace GameRes.Formats.Kogado
try try
{ {
string name = Path.GetFileNameWithoutExtension (entry.Name); string name = Path.GetFileNameWithoutExtension (entry.Name);
string ext = Path.GetExtension (entry.Name).TrimStart ('.').ToLowerInvariant(); string ext = Path.GetExtension (entry.Name);
byte[] name_buf = new byte[0x15]; byte[] name_buf = new byte[0x15];
byte[] ext_buf = new byte[3]; byte[] ext_buf = new byte[3];
encoding.GetBytes (name, 0, name.Length, name_buf, 0); encoding.GetBytes (name, 0, name.Length, name_buf, 0);
if (!string.IsNullOrEmpty (ext)) if (!string.IsNullOrEmpty (ext))
{
ext = ext.TrimStart ('.').ToLowerInvariant();
encoding.GetBytes (ext, 0, ext.Length, ext_buf, 0); encoding.GetBytes (ext, 0, ext.Length, ext_buf, 0);
}
var out_entry = new OutputEntry var out_entry = new OutputEntry
{ {
Name = entry.Name, Name = entry.Name,

View File

@ -594,9 +594,9 @@ namespace GameRes.Formats.NitroPlus
private bool m_read_mode; private bool m_read_mode;
private long m_base_pos; private long m_base_pos;
public override bool CanRead { get { return m_read_mode; } } public override bool CanRead { get { return m_read_mode && m_stream.CanRead; } }
public override bool CanSeek { get { return m_stream.CanSeek; } } public override bool CanSeek { get { return m_stream.CanSeek; } }
public override bool CanWrite { get { return !m_read_mode; } } public override bool CanWrite { get { return !m_read_mode && m_stream.CanWrite; } }
public override long Length { get { return m_stream.Length - m_base_pos; } } public override long Length { get { return m_stream.Length - m_base_pos; } }
public override long Position public override long Position
{ {

View File

@ -222,7 +222,7 @@ namespace GameRes.Formats.YuRis
writer.Write (name_len); writer.Write (name_len);
writer.Write (entry.IndexName); writer.Write (entry.IndexName);
writer.Write (entry.FileType); writer.Write (entry.FileType);
writer.Write ((byte)(entry.IsPacked ? 1 : 0)); writer.Write (entry.IsPacked);
writer.Write (entry.UnpackedSize); writer.Write (entry.UnpackedSize);
writer.Write (entry.Size); writer.Write (entry.Size);
writer.Write ((uint)entry.Offset); writer.Write ((uint)entry.Offset);