diff --git a/KKdBaseLib/KKdBaseLib.csproj b/KKdBaseLib/KKdBaseLib.csproj
index b100d6d..d381552 100644
--- a/KKdBaseLib/KKdBaseLib.csproj
+++ b/KKdBaseLib/KKdBaseLib.csproj
@@ -6,12 +6,12 @@
korenkonder (C) 2019-2020
A base library
- 0.4.9.5
+ 0.4.9.6
KKdBaseLib
KKdBaseLib
net461
KKdBaseLib
- 0.4.9.5
+ 0.4.9.6
AnyCPU
diff --git a/KKdBaseLib/KKdList.cs b/KKdBaseLib/KKdList.cs
index 0cb8d79..58fc062 100644
--- a/KKdBaseLib/KKdList.cs
+++ b/KKdBaseLib/KKdList.cs
@@ -107,13 +107,15 @@ namespace KKdBaseLib
}
public void Sort()
- { List List = (List)this; List.Sort(); array = List.ToArray(); count = List.Count; }
+ { Capacity = Count; List List = (List)this; List.Sort();
+ array = List.ToArray(); count = List.Count; }
public static explicit operator KKdList( List list) =>
new KKdList { array = list.ToArray(), count = list.Count };
public static explicit operator List(KKdList list)
- { List outList = new List(); for (int i = 0; i < list.Count; i++) outList.Add(list[i]); return outList; }
+ { list.Capacity = list.Count; List outList = new List();
+ for (int i = 0; i < list.Count; i++) outList.Add(list[i]); return outList; }
public override string ToString() =>
$"(Count: {Count}; Capacity: {Capacity}; Current: {Current})";
diff --git a/KKdMainLib/DEX.cs b/KKdMainLib/DEX.cs
index 80b01dd..b22a14d 100644
--- a/KKdMainLib/DEX.cs
+++ b/KKdMainLib/DEX.cs
@@ -55,6 +55,7 @@ namespace KKdMainLib
if (element.Frame == 999999 || element.Both == 0xFFFF) break;
Dex[i].Main.Add(element);
}
+ Dex[i].Main.Capacity = Dex[i].Main.Count;
Dex[i].Eyes = KKdList.New;
s.P = Dex[i].EyesOffset;
@@ -68,6 +69,7 @@ namespace KKdMainLib
if (element.Frame == 999999 || element.Both == 0xFFFF) break;
Dex[i].Eyes.Add(element);
}
+ Dex[i].Eyes.Capacity = Dex[i].Eyes.Count;
Dex[i].Name = s.RSaO(Dex[i].NameOffset);
}
@@ -191,7 +193,7 @@ namespace KKdMainLib
{
Dex[i0].Eyes = KKdList.New;
Dex[i0].Eyes.Capacity = temp.Array.Length;
- for (i1 = 0; i1 < this.Dex[i0].Eyes.Capacity; i1++)
+ for (i1 = 0; i1 < Dex[i0].Eyes.Capacity; i1++)
Dex[i0].Eyes.Add(EXPElement.Read(temp[i1]));
}
temp.Dispose();
diff --git a/KKdMainLib/Extensions.cs b/KKdMainLib/Extensions.cs
index 6f17490..d586a27 100644
--- a/KKdMainLib/Extensions.cs
+++ b/KKdMainLib/Extensions.cs
@@ -137,6 +137,7 @@ namespace KKdMainLib
else { stream.PI64 -= header.Length; break; }
lastSig = sig;
}
+ subStructs.Capacity = subStructs.Count;
if (subStructs.Capacity > 0) @struct.SubStructs = subStructs.ToArray();
return @struct;
diff --git a/KKdMainLib/IO/Extensions.cs b/KKdMainLib/IO/Extensions.cs
index 307d04e..045d845 100644
--- a/KKdMainLib/IO/Extensions.cs
+++ b/KKdMainLib/IO/Extensions.cs
@@ -18,6 +18,7 @@ namespace KKdMainLib.IO
if (a == end) break;
else s.Add(a);
}
+ s.Capacity = s.Count;
return s.ToArray();
}
diff --git a/KKdMainLib/IO/JSON.cs b/KKdMainLib/IO/JSON.cs
index d00bb3b..3e3ea49 100644
--- a/KKdMainLib/IO/JSON.cs
+++ b/KKdMainLib/IO/JSON.cs
@@ -104,7 +104,7 @@ namespace KKdMainLib.IO
else if (c == ',') { _IO.RCUTF8(); continue; }
else return KKdList.Null;
}
-
+ obj.Capacity = obj.Count;
return obj;
}
@@ -125,6 +125,7 @@ namespace KKdMainLib.IO
else if (c == ',') { _IO.RCUTF8(); continue; }
else return null;
}
+ obj.Capacity = obj.Count;
return obj.ToArray();
}
diff --git a/KKdMainLib/KKdMainLib.csproj b/KKdMainLib/KKdMainLib.csproj
index dc01c43..553e8a4 100644
--- a/KKdMainLib/KKdMainLib.csproj
+++ b/KKdMainLib/KKdMainLib.csproj
@@ -6,12 +6,12 @@
korenkonder (C) 2018-2020
A simple library for working with Project Diva AC/DT/F/AFT/F2/X/FT/M39 files
- 0.4.9.5
+ 0.4.9.6
KKdMainLib
KKdMainLib
net461
KKdMainLib
- 0.4.9.5
+ 0.4.9.6
AnyCPU
diff --git a/PD_Tool/Program.cs b/PD_Tool/Program.cs
index 0feeb66..8eb7d3e 100644
--- a/PD_Tool/Program.cs
+++ b/PD_Tool/Program.cs
@@ -47,7 +47,7 @@ namespace PD_Tool
private static void MainMenu()
{
- Console.Title = "PD_Tool v0.4.9.4";
+ Console.Title = "PD_Tool v0.4.9.6";
Console.Clear();
ConsoleDesign(true);
diff --git a/PD_Tool/Properties/AssemblyInfo.cs b/PD_Tool/Properties/AssemblyInfo.cs
index 4632d9f..c6ae30b 100644
--- a/PD_Tool/Properties/AssemblyInfo.cs
+++ b/PD_Tool/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E")]
-[assembly: AssemblyVersion("0.4.9.4")]
-[assembly: AssemblyFileVersion("0.4.9.4")]
+[assembly: AssemblyVersion("0.4.9.6")]
+[assembly: AssemblyFileVersion("0.4.9.6")]