X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_packmap.pas;h=0c361c52e5ba19bac69a6d399ed6e039851f0716;hb=8c3e397c5920444fc9c1a5c44747708acf1e0467;hp=bf3965687da05c7e7564592291a47d6420ef102c;hpb=50ffde8289d5e7220f1906a393047c3a1389d051;p=d2df-editor.git

diff --git a/src/editor/f_packmap.pas b/src/editor/f_packmap.pas
index bf39656..0c361c5 100644
--- a/src/editor/f_packmap.pas
+++ b/src/editor/f_packmap.pas
@@ -53,7 +53,7 @@ implementation
 
 uses
   BinEditor, WADEDITOR, g_map, MAPREADER, MAPWRITER, MAPSTRUCT,
-  f_main, math, g_language;
+  f_main, math, g_language, g_resources;
 
 {$R *.lfm}
 
@@ -70,71 +70,39 @@ begin
     eWAD.Text := SaveDialog.FileName;
 end;
 
-function ProcessResource(wad_to: TWADEditor_1;
-           section_to, filename, section, resource: String): Boolean;
-var
-  wad2: TWADEditor_1;
-  data: Pointer;
-  reslen: Integer;
-  //s: string;
-
+function ProcessResource(wad_to, section_to, filename, section, resource: String): Boolean;
+  var
+    data: Pointer;
+    res, len: Integer;
 begin
-  Result := False;
- 
   if filename = '' then
     g_ProcessResourceStr(OpenedMap, @filename, nil, nil)
   else
-    filename := EditorDir+'wads/'+filename;
-
-// Читаем ресурс из WAD-файла карты или какого-то другого:
-  wad2 := TWADEditor_1.Create();
-
-  if not wad2.ReadFile(filename) then
-  begin
-    MessageBox(0, PChar(Format(_lc[I_MSG_WAD_ERROR],
-                                   [ExtractFileName(filename)])),
-               PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
-    wad2.Free();
-    Exit;
-  end;
+    filename := EditorDir + 'wads/' + filename;
 
-  if not wad2.GetResource(utf2win(section), utf2win(resource), data, reslen) then
+  g_ReadResource(filename, section, resource, data, len);
+  if data <> nil then
   begin
-    MessageBox(0, PChar(Format(_lc[I_MSG_RES_ERROR],
-                                   [filename, section, resource])),
-               PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
-    wad2.Free();
-    Exit;
-  end;
-
-  wad2.Free();
-
- {if wad_to.HaveResource(utf2win(section_to), utf2win(resource)) then
- begin
-  for a := 2 to 256 do
-  begin
-   s := IntToStr(a);
-   if not wad_to.HaveResource(utf2win(section_to), utf2win(resource+s)) then Break;
-  end;
-  resource := resource+s;
- end;}
-
-// Если такого ресурса нет в WAD-файле-назначении, то копируем:
-  if not wad_to.HaveResource(utf2win(section_to), utf2win(resource)) then
+    (* Write resource only if it does not exists *)
+    g_ExistsResource(wad_to, section_to, resource, res);
+    if res <> 0 then
+    begin
+      g_AddResource(wad_to, section_to, resource, data, len, res);
+      ASSERT(res = 0)
+    end;
+    FreeMem(data);
+    Result := True
+  end
+  else
   begin
-    if not wad_to.HaveSection(utf2win(section_to)) then
-      wad_to.AddSection(utf2win(section_to));
-    wad_to.AddResource(data, reslen, utf2win(resource), utf2win(section_to));
-  end;
-
-  FreeMem(data);
-
-  Result := True;
+    //MessageBox(0, PChar(Format(_lc[I_MSG_WAD_ERROR], [ExtractFileName(filename)])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
+    MessageBox(0, PChar(Format(_lc[I_MSG_RES_ERROR], [filename, section, resource])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
+    Result := False
+  end
 end;
 
 procedure TPackMapForm.bPackClick(Sender: TObject);
 var
-  WAD: TWADEditor_1;
   mr: TMapReader_1;
   mw: TMapWriter_1;
   data: Pointer;
@@ -159,12 +127,16 @@ begin
   if data = nil then
     Exit;
 
-  WAD := TWADEditor_1.Create();
-
 // Не перезаписывать WAD, а дополнить:
-  if cbAdd.Checked then
-    if WAD.ReadFile(eWAD.Text) then
-      WAD.CreateImage();
+  if not cbAdd.Checked then
+  begin
+    if FileExists(eWAD.Text) then
+    begin
+      if FileExists(eWAD.Text + '.bak0') then
+        ASSERT(DeleteFile(eWAD.Text + '.bak0'));
+      ASSERT(RenameFile(eWAD.Text, eWAD.Text + '.bak0'))
+    end
+  end;
 
 // Читаем карту из памяти:
   mr := TMapReader_1.Create();
@@ -190,10 +162,9 @@ begin
            (AnsiLowerCase(filename) <> SHRSHADE_WAD) ) then
       begin
       // Копируем ресурс текстуры:
-        if not f_packmap.ProcessResource(WAD, tsection, filename, section, resource) then
+        if not f_packmap.ProcessResource(eWAD.Text, tsection, filename, section, resource) then
         begin
           mr.Free();
-          WAD.Free();
           Exit;
         end;
 
@@ -219,10 +190,9 @@ begin
          (AnsiLowerCase(filename) <> SHRSHADE_WAD) ) then
     begin
     // Копируем ресурс неба:
-      if not f_packmap.ProcessResource(WAD, ssection, filename, section, resource) then
+      if not f_packmap.ProcessResource(eWAD.Text, ssection, filename, section, resource) then
       begin
         mr.Free();
-        WAD.Free();
         Exit;
       end;
 
@@ -245,10 +215,9 @@ begin
          (AnsiLowerCase(filename) <> SHRSHADE_WAD) ) then
     begin
     // Копируем ресурс музыки:
-      if not f_packmap.ProcessResource(WAD, msection, filename, section, resource) then
+      if not f_packmap.ProcessResource(eWAD.Text, msection, filename, section, resource) then
       begin
         mr.Free();
-        WAD.Free();
         Exit;
       end;
 
@@ -306,7 +275,7 @@ begin
                (AnsiLowerCase(filename) <> SHRSHADE_WAD) ) then
           begin
           // Копируем ресурс дополнительной текстуры:
-            if f_packmap.ProcessResource(WAD, tsection, filename, section, resource) then
+            if f_packmap.ProcessResource(eWAD.Text, tsection, filename, section, resource) then
             begin
 
               Нужно проверять есть такая текстура textures и есть ли она вообще?
@@ -338,18 +307,13 @@ begin
 
 // Сохраняем карту из памяти под новым именем в WAD-файл:
   len := mw.SaveMap(data);
-  WAD.AddResource(data, len, eResource.Text, '');
-  WAD.SaveTo(eWAD.Text);
-
+  g_AddResource(eWAD.Text, '', eResource.Text, data, len, a);
   mw.Free();
   mr.Free();
-  WAD.Free();
-
-  MessageDlg(Format(_lc[I_MSG_PACKED],
-                    [eResource.Text, ExtractFileName(eWAD.Text)]),
-             mtInformation, [mbOK], 0);
-
   Close();
+
+  ASSERT(a = 0); (* saved *)
+  MessageDlg(Format(_lc[I_MSG_PACKED], [eResource.Text, ExtractFileName(eWAD.Text)]), mtInformation, [mbOK], 0);
 end;
 
 procedure TPackMapForm.FormCreate(Sender: TObject);