Changeset 209

Timestamp:

Jun 5, 2007, 12:07:29 AM (17 years ago)

Author:

alloc

Message:

 

Location:

oup/current

Files:

• DataAccess/Access_OniArchive.pas (modified) (2 diffs)
• FileClasses/TXMP.pas (modified) (3 diffs)
• FileClasses/_FileManager.pas (added)
• FileClasses/_FileTypes.pas (modified) (6 diffs)
• Global/RawList.pas (modified) (3 diffs)
• Main.dfm (modified) (5 diffs)
• Main.pas (modified) (3 diffs)
• OniUnPacker.bdsproj (modified) (1 diff)
• OniUnPacker.dpr (modified) (1 diff)
• Tools/MetaEditor.dfm (added)
• Tools/MetaEditor.pas (added)
• Tools/Preview.dfm (modified) (1 diff)
• Tools/TxmpReplace.dfm (modified) (1 diff)
• Tools/TxmpReplace.pas (modified) (1 diff)
• _exe/OniUnPacker.exe (modified) ( previous)

oup/current/DataAccess/Access_OniArchive.pas

@@ -16 +16 @@
     FRawOpened:          Boolean;
     FSepOpened:          Boolean;
+    procedure SetUnloadWhenUnused(doit: Boolean);
   protected
   public
-    property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write FUnloadWhenUnused;
+    property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write SetUnloadWhenUnused;
 
     constructor Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages); override;
@@ -161 +162 @@
   FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw];
 end;
+
+
+
+
+procedure TAccess_OniArchive.SetUnloadWhenUnused(doit: Boolean);
+begin
+  FUnloadWhenUnused := doit;
+  if FUnloadWhenUnused then
+  begin
+    if FDatOpened then
+    begin
+      FDatOpened := False;
+      Fdat_file.Free;
+    end;
+    if FRawOpened then
+    begin
+      FRawOpened := False;
+      Fraw_file.Free;
+    end;
+    if FSepOpened then
+    begin
+      FSepOpened := False;
+      Fsep_file.Free;
+    end;
+  end
+  else
+  begin
+    if not FDatOpened then
+    begin
+      Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
+      FDatOpened := True;
+    end;
+    if not FRawOpened then
+    begin
+      Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
+        fmOpenReadWrite);
+      FRawOpened := True;
+    end;
+    if (not FSepOpened) and (FDataOS <> DOS_WIN) then
+    begin
+      Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
+        fmOpenReadWrite);
+      FSepOpened := True;
+    end;
+  end;
+end;
+
 
 

oup/current/FileClasses/TXMP.pas

@@ -4 +4 @@
 
 uses
-  TypeDefs, _FileTypes, _DataTypes;
+  _FileTypes;
 
 type
@@ -17 +17 @@
 
 uses
-  ConnectionManager, Math, Classes;
+  ConnectionManager, Math, Classes, TypeDefs, _DataTypes;
 
-{ TFile_SNDD }
-
-procedure TFile_TXMP.InitDatLinks;
-begin
-  SetLength(FDatLinks, 2);
-  FDatLinks[0].SrcOffset := $94;
-  FDatLinks[0].DestID := -1;
-  FDatLinks[0].PosDestExts := '*';
-  FDatLinks[1].SrcOffset := $98;
-  FDatLinks[1].DestID := -1;
-  FDatLinks[1].PosDestExts := 'TXMP';
-end;
-
+{ TFile_TXMP }
 
 procedure TFile_TXMP.InitDataFields;
@@ -119 +107 @@
 
 
+procedure TFile_TXMP.InitDatLinks;
+begin
+  SetLength(FDatLinks, 2);
+  FDatLinks[0].SrcOffset := $94;
+  FDatLinks[0].DestID := GetDatLinkValue(FFile, $94);
+  FDatLinks[0].PosDestExts := '*';
+  FDatLinks[1].SrcOffset := $98;
+  FDatLinks[1].DestID := GetDatLinkValue(FFile, $98);
+  FDatLinks[1].PosDestExts := 'TXMP';
+end;
+
+
 procedure TFile_TXMP.InitRawList;
 var

oup/current/FileClasses/_FileTypes.pas

@@ -12 +12 @@
       FConnectionID: Integer;
       FFileID: Integer;
+      FFileName: String;
       FFile: TMemoryStream;
 
@@ -34 +35 @@
       property FileStream: TMemoryStream read FFile;
       property FileID: Integer read FFileID;
+      property FileName: String read FFileName;
       property ConnectionID: Integer read FConnectionID;
 
@@ -50 +52 @@
 
 
+function GetDatLinkValue(stream: TStream; offset: Integer): Integer;
+
+
+
 implementation
 
@@ -63 +69 @@
   FConnectionID := ConnectionID;
   FFileID := FileID;
-  FFile := nil;
+  FFileName := ConManager.Connection[ConnectionID].GetFileInfo(FileID).Name;
 
   FFile := TMemoryStream.Create;
@@ -71 +77 @@
   InitDataFields();
   InitRawList();
-
-  if FDataFields.FieldCount > 0 then
-  begin
-    for i := 0 to FDataFields.FieldCount - 1 do
-    begin
-      ShowMessage(FDataFields.FieldByIndex[i].ValueAsString);
-    end;
-  end;
 
   FFile.Free;
@@ -171 +169 @@
 end;
 
+
+
+function GetDatLinkValue(stream: TStream; offset: Integer): Integer;
+begin
+  stream.Seek(Offset, soFromBeginning);
+  stream.Read(Result, 4);
+  if Result > 0 then
+    Result := Result div 256
+  else
+    Result := -1;
+end;
+
 end.

oup/current/Global/RawList.pas

@@ -200 +200 @@
   Result[0].SrcOffset := $0C;
   Result[0].RawAddr   := link;
-  if link > 0 then
-    Result[0].RawSize := frames * 4
-  else
-    Result[0].RawSize := 0;
+  Result[0].RawSize := frames * 4;
   {y-pos}
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @link);
   Result[1].SrcOffset := $10;
   Result[1].RawAddr   := link;
-  if link > 0 then
-    Result[1].RawSize := frames * 8
-  else
-    Result[1].RawSize := 0;
+  Result[1].RawSize := frames * 8;
   {attacks}
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $182, 1, @tempb);
@@ -240 +234 @@
   Result[6].SrcOffset := $24;
   Result[6].RawAddr   := link;
-  if link > 0 then
-    Result[6].RawSize := 24
-  else
-    Result[6].RawSize := 0;
+  Result[6].RawSize := 24;
   {footstep}
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $186, 1, @tempb);
@@ -410 +401 @@
       Break;
     end;
+  if Length(Result) > 0 then
+    for i := 0 to High(Result) do
+      if Result[i].RawAddr = 0 then
+        Result[i].RawSize := 0;
 end;
 

oup/current/Main.dfm

@@ -6 +6 @@
   Caption = 'Form_Main'
   ClientHeight = 571
-  ClientWidth = 742
+  ClientWidth = 842
   Color = clBtnFace
   Constraints.MinHeight = 500
@@ -26 +26 @@
     Left = 0
     Top = 554
-    Width = 742
+    Width = 842
     Height = 17
     BiDiMode = bdLeftToRight
@@ -43 +43 @@
       end>
     ParentBiDiMode = False
+    ExplicitWidth = 742
   end
   object DockTop: TTBDock
     Left = 0
     Top = 0
-    Width = 742
+    Width = 842
     Height = 75
+    ExplicitWidth = 742
     object MainMenu: TTBToolbar
       Left = 0
@@ -135 +137 @@
         object menu_meta: TTBItem
           Caption = '&Meta editor'
-          Enabled = False
           ImageIndex = 11
           ShortCut = 16461
@@ -353 +354 @@
   end
   object DockRight: TTBDock
-    Left = 733
+    Left = 833
     Top = 75
     Width = 9
     Height = 470
     Position = dpRight
+    ExplicitLeft = 733
   end
   object DockBottom: TTBDock
     Left = 0
     Top = 545
-    Width = 742
+    Width = 842
     Height = 9
     Position = dpBottom
+    ExplicitWidth = 742
   end
   object opend: TOpenDialog

oup/current/Main.pas

@@ -136 +136 @@
 
 uses
-  LevelDB;
+  LevelDB, MetaEditor;
 
 {$R *.dfm}
@@ -415 +415 @@
   tb_txmpreplacer.Enabled := active;
   tb_extractor.Enabled := active;
+  tb_meta.Enabled := active;
 //  tb_compare.Enabled := active;
 //  tb_structure.Enabled := active;
@@ -605 +606 @@
 
 procedure TForm_Main.menu_metaClick(Sender: TObject);
-begin
-  ShowMessage('TBD');
+var
+  toolform:    TForm_Meta;
+  i:           Integer;
+  tag:         Integer;
+  iconindex:   Integer;
+begin
+  tag := 1;
+  if MDIChildCount > 0 then
+    for i := 0 to MDIChildCount - 1 do
+      if MDIChildren[i].Tag >= tag then
+        tag := MDIChildren[i].Tag + 1;
+
+  iconindex := -1;
+
+  toolform := nil;
+
+  toolform         := TForm_Meta.Create(Self);
+  toolform.Caption := 'MetaEditor' + ' ' + IntToStr(tag) + '       ';
+  iconindex        := 11;
+
+  if Assigned(toolform) then
+  begin
+    toolform.Name    := 'meta' + IntToStr(tag);
+    toolform.Tag     := tag;
+    MDITab.AddTab(TForm(toolform), iconindex);
+    toolform.Caption := AnsiReplaceStr(toolform.Caption, '       ', '');
+  end;
 end;
 

oup/current/OniUnPacker.bdsproj

@@ -176 +176 @@
                         <Language Name="ProjectLang">$00000000</Language>
                         <Language Name="RootDir"></Language>
-                </Language>  
-    
-    
-    
-    <Excluded_Packages>
+                </Language>  <Excluded_Packages>
       <Excluded_Packages Name="d:\programme\borland\bds\3.0\Bin\dbwebxprt.bpl">Borland Web Wizard Package</Excluded_Packages>
     </Excluded_Packages>

oup/current/OniUnPacker.dpr

@@ -32 +32 @@
   LevelDB in 'Helper\LevelDB.pas' {Form_LevelDB},
   Img_DDSTypes in 'Global\Img_DDSTypes.pas',
-  TXMP in 'FileClasses\TXMP.pas';
+  TXMP in 'FileClasses\TXMP.pas',
+  MetaEditor in 'Tools\MetaEditor.pas' {Form_Meta},
+  _FileManager in 'FileClasses\_FileManager.pas';
 
 {$R *.res}

oup/current/Tools/Preview.dfm

@@ -27 +27 @@
     end
     object img: TImage
-      Left = 0
-      Top = 20
-      Width = 283
-      Height = 403
+      AlignWithMargins = True
+      Left = 3
+      Top = 23
+      Width = 277
+      Height = 397
       Align = alClient
+      ExplicitLeft = 0
+      ExplicitTop = 20
       ExplicitWidth = 313
       ExplicitHeight = 453

oup/current/Tools/TxmpReplace.dfm

@@ -84 +84 @@
       TabOrder = 0
       object image_bmppreview: TImage
-        Left = 2
-        Top = 45
-        Width = 279
-        Height = 297
+        AlignWithMargins = True
+        Left = 5
+        Top = 48
+        Width = 273
+        Height = 291
         Align = alClient
+        ExplicitLeft = 2
+        ExplicitTop = 45
         ExplicitWidth = 182
         ExplicitHeight = 302

oup/current/Tools/TxmpReplace.pas

@@ -234 +234 @@
   Self.OnNewFileSelected := SelectFile;
   opend.Filter := saved.Filter;
-
-  TXMP := TFile_TXMP.Create(ConnectionID, 8552);
-  TXMP.Free;
 end;