--- oup/current/Helper/LevelDB.pas	2007/03/30 02:08:49	142
+++ oup/current/Helper/LevelDB.pas	2007/04/03 02:59:20	167
@@ -24,7 +24,8 @@ var
 implementation
 {$R *.dfm}
 uses ABSMain, ABSDecUtil, Main,
-    ConnectionManager, TypeDefs, DataAccess, OniImgClass, Data, RawList;
+    ConnectionManager, TypeDefs, DataAccess, OniImgClass, Data, RawList, 
+  Access_OniArchive;
 
 var
   Converting:  Boolean = False;
@@ -44,6 +45,9 @@ end;
 
 
 procedure TForm_LevelDB.CreateLevel(Source, Target: String);
+const
+  EmptyBytes: Array[0..31] of Byte = (
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 );
 var
   DatHeader:        THeader;
   FilesHeader:      TFilesMap;
@@ -199,8 +203,13 @@ begin
   Stream_Names := TMemoryStream.Create;
   Stream_Dat   := TFileStream.Create(Target, fmCreate);
   Stream_Raw   := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.raw'), fmCreate);
+  Stream_Raw.Write(EmptyBytes[0], 32);
   if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
+  begin
     Stream_Sep := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.sep'), fmCreate);
+    Stream_Sep.Write(EmptyBytes[0], 32);
+  end;
+
 
   DoStep('Creating header');
   progress.Position      := 0;
@@ -335,9 +344,13 @@ begin
             begin
               RawLinks[i].RawAddr := Stream_Sep.Size;
               Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size);
+              if (Stream_Sep.Size mod 32) > 0 then
+                Stream_Sep.Write(EmptyBytes[0], 32 - (Stream_Sep.Size mod 32));
             end else begin
               RawLinks[i].RawAddr := Stream_Raw.Size;
               Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size);
+              if (Stream_Raw.Size mod 32) > 0 then
+                Stream_Raw.Write(EmptyBytes[0], 32 - (Stream_Raw.Size mod 32));
             end;
           end else
             RawLinks[i].RawAddr := 0;
@@ -347,6 +360,14 @@ begin
       end;
       DatFileStream.Seek(0, soFromBeginning);
       Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
+      if (Stream_Body.Size mod 32) > 0 then
+      begin
+        ShowMessage(
+            IntToStr(FileID) + '-' + FileInfo.Name + '.' + FileInfo.Extension + #13#10 +
+            IntToStr(FileInfo.Size) + ' - 0x' + IntToHex(FileInfo.Size, 6) + ' - real: ' + IntToStr(DatFileStream.Size) + ' - 0x' + IntToHex(DatFileStream.Size, 6) + #13#10 +
+            IntToStr(Stream_Body.Size) + ' - 0x' + IntToHex(Stream_Body.Size, 6) );
+        Stream_Body.Write(EmptyBytes[0], 32 - (Stream_Body.Size mod 32));
+      end;
     end
     else
       FilesHeader[FileID].DataAddr := 0;
@@ -377,12 +398,19 @@ begin
   for i := 0 to High(ExtensionsHeader) do
     Stream_Dat.Write(ExtensionsHeader[i], SizeOf(ExtensionsHeader[i]));
 
+  if (Stream_Dat.Size mod 32) > 0 then
+    Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
+
   DatHeader.DataSize  := Stream_Body.Size;
   DatHeader.NamesSize := Stream_Names.Size;
   DatHeader.DataAddr  := Stream_Dat.Size;
 
   Stream_Body.Seek(0, soFromBeginning);
   Stream_Dat.CopyFrom(Stream_Body, Stream_Body.Size);
+
+  if (Stream_Dat.Size mod 32) > 0 then
+    Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
+
   DatHeader.NamesAddr := Stream_Dat.Size;
   Stream_Names.Seek(0, soFromBeginning);
   Stream_Dat.CopyFrom(Stream_Names, Stream_Names.Size);
@@ -604,6 +632,8 @@ begin
   DoStep('Writing .dat-fileslist');
   Application.ProcessMessages;
 
+  TAccess_OniArchive(Connection).UnloadWhenUnused := False;
+
   FileTime := Time;
   Database.StartTransaction;
   for FileID := 0 to Connection.GetFileCount - 1 do
@@ -701,6 +731,7 @@ begin
   btn_abortok.Default := True;
 
   converting := False;
+  TAccess_OniArchive(Connection).UnloadWhenUnused := True;
 
   Query.Close;
   Query.Free;