Changeset 129 for oup/current

Timestamp:

Mar 28, 2007, 3:12:22 AM (18 years ago)

Author:

alloc

Message:

 

Location:

oup/current

Files:

• Helper/LevelDB.pas (modified) (13 diffs)
• Main.pas (modified) (3 diffs)
• OniUnPacker.dpr (modified) (2 diffs)
• _exe/OniUnPacker.exe (modified) ( previous)

oup/current/Helper/LevelDB.pas

@@ -324 +324 @@
           end else
             RawLinks[i].RawAddr := 0;
+          DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning);
+          DatFileStream.Write(RawLinks[i].RawAddr, 4);
         end;
       end;
-
-{
-            Data[rawlist[j].src_offset + 0] := (rawlist[j].raw_addr) and $FF;
-            Data[rawlist[j].src_offset + 1] := (rawlist[j].raw_addr shr 8) and $FF;
-            Data[rawlist[j].src_offset + 2] := (rawlist[j].raw_addr shr 16) and $FF;
-            Data[rawlist[j].src_offset + 3] := (rawlist[j].raw_addr shr 24) and $FF;
-}
-      Stream_Body.Write(Data[0], Length(Data));
-      //
+      DatFileStream.Seek(0, soFromBeginning);
+      Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
     end
     else
@@ -381 +376 @@
   Stream_Names.Free;
   Stream_Raw.Free;
-  if OniDataConnection.OSisMac then
+
+  if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
     Stream_Sep.Free;
 
@@ -397 +393 @@
   converting := False;
 
-  CloseDataConnection(DataConnections[conIndex]);
+//  CloseDataConnection(DataConnections[conIndex]);
 end;
 
@@ -407 +403 @@
   i: Byte;
 begin
-  for i := 1 to Length(ConvertHandlers) do
+{  for i := 1 to Length(ConvertHandlers) do
     if UpperCase(ConvertHandlers[i].Ext) = UpperCase(ext) then
       if ConvertHandlers[i].needed then
@@ -416 +412 @@
       else
         Break;
-end;
+}end;
 
 
@@ -422 +418 @@
 
 procedure TForm_LevelDB.CreateDatabase(Source, target: String);
+{
 var
   DataBase:    TABSDatabase;
@@ -453 +450 @@
       group_progress.Caption := 'Creating DB (FINISHED)';
   end;
-
-begin
-  if CreateDataConnection(Source, ODB_Dat) = nil then
+}
+
+begin
+{  if CreateDataConnection(Source, ODB_Dat) = nil then
   begin
     ShowMessage('Could not connect to .dat-file');
@@ -658 +656 @@
 
   CloseDataConnection(DataConnections[conIndex]);
-end;
-
-
-
-
-procedure TForm_LevelDB.stop_convert;
-begin
-  btn_abortok.Caption := '&Close';
+}
+end;
+
+
+
+
+procedure TForm_LevelDB.StopConvert;
+begin
+{  btn_abortok.Caption := '&Close';
   btn_abortok.Default := True;
   converting := False;
@@ -676 +675 @@
     DeleteFile(loaded_filename);
   end;
-end;
+}end;
 
 
@@ -699 +698 @@
 
 
-
+{
 procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
 var
@@ -1731 +1730 @@
   end;
 end;
-
-
-
-
+}
+
+
+{
 procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
 begin
@@ -1742 +1741 @@
   ConvertHandlers[High(ConvertHandlers)].handler := handler;
 end;
-
-begin
-  InsertHandler('ABNA', False, nil);
+}
+begin
+{  InsertHandler('ABNA', False, nil);
   //  InsertHandler('AGDB',True,AGDB);
   InsertHandler('AGDB', False, nil);
@@ -1842 +1841 @@
   InsertHandler('WMMB', True, WMMB);
   InsertHandler('WPGE', True, WPGE);
-end.
+}end.

oup/current/Main.pas

@@ -138 +138 @@
 implementation
 
+uses
+  LevelDB;
+
 {$R *.dfm}
 
@@ -562 +565 @@
 procedure TForm_Main.menu_createlvlClick(Sender: TObject);
 begin
-  ShowMessage('Not yet usable');
-{
+//  ShowMessage('Not yet usable');
+
   opend.Filter     := 'OUP-Level-DB (*.oldb)|*.oldb';
   saved.Filter     := 'Oni-Dat-Files|*.dat';
@@ -570 +573 @@
     if saved.Execute then
       Form_LevelDB.CreateLevel(opend.FileName, saved.FileName);
-}
+
 end;
 

oup/current/OniUnPacker.dpr

@@ -29 +29 @@
   DatLinks in 'Global\DatLinks.pas',
   _DataTypes in 'FileClasses\_DataTypes.pas',
-  _FileTypes in 'FileClasses\_FileTypes.pas';
+  _FileTypes in 'FileClasses\_FileTypes.pas',
+  LevelDB in 'Helper\LevelDB.pas' {Form_LevelDB};
 
 {$R *.res}
@@ -41 +42 @@
   Application.CreateForm(TForm_ValueEdit, Form_ValueEdit);
   Application.CreateForm(TForm_WhatLinksHere, Form_WhatLinksHere);
+  Application.CreateForm(TForm_LevelDB, Form_LevelDB);
   Application.Run;
 end.