ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/oup/current/DataAccess/Access_OniArchive.pas
(Generate patch)

Comparing oup/current/DataAccess/Access_OniArchive.pas (file contents):
Revision 229 by alloc, Wed Jun 20 10:57:51 2007 UTC vs.
Revision 321 by alloc, Wed May 6 13:47:23 2009 UTC

# Line 38 | Line 38 | type
38      function GetDatLink(FileID, DatOffset: Integer): TDatLink; override;
39      function GetRawList(FileID: Integer): TRawDataList; override;
40      function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override;
41 +    function GetRawsForType(RawType: String): TRawDataList; override;
42  
43      procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream); overload;
44      procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); overload;
# Line 284 | Line 285 | var
285   begin
286    list := TStringList.Create;
287    list.Sorted := True;
288 +  if ext = '*' then
289 +    ext := '';
290    for i := 0 to GetFileCount - 1 do
291    begin
292      if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
# Line 371 | Line 374 | begin
374    begin
375      if not Assigned(Target) then
376        Target := TMemoryStream.Create;
377 <    if not FDatOpened then
375 <      Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
376 <    Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
377 <    streampos := Target.Position;
378 <    Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
379 <    Target.Seek(streampos, soFromBeginning);
380 <    if UnloadWhenUnused then
377 >    if GetFileInfo(FileID).Size > 0 then
378      begin
379 <      Fdat_file.Free;
380 <      FDatOpened := False;
381 <    end
382 <    else
383 <      FDatOpened := True;
379 >      if not FDatOpened then
380 >        Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
381 >      Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
382 >      streampos := Target.Position;
383 >      Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
384 >      Target.Seek(streampos, soFromBeginning);
385 >      if UnloadWhenUnused then
386 >      begin
387 >        Fdat_file.Free;
388 >        FDatOpened := False;
389 >      end
390 >      else
391 >        FDatOpened := True;
392 >    end;
393    end;
394   end;
395  
# Line 488 | Line 494 | begin
494   end;
495  
496  
497 + function TAccess_OniArchive.GetRawsForType(RawType: String): TRawDataList;
498 + var
499 +  i, j: Integer;
500 +  dats: TStrings;
501 +  list: TRawDataList;
502 + begin
503 +  dats := nil;
504 +  dats := GetFilesList(MidStr(RawType, 1, 4), '', True, ST_IDAsc);
505 +  for i := 0 to dats.Count - 1 do
506 +  begin
507 +    list := GetRawList(StrToInt(MidStr(dats.Strings[i], 1, 5)));
508 +    for j := 0 to Length(list) - 1 do
509 +    begin
510 +      if (list[j].RawType = RawType) and (list[j].RawSize > 0) then
511 +      begin
512 +        SetLength(Result, Length(Result)+1);
513 +        Result[High(Result)] := list[j];
514 +      end;
515 +    end;
516 +  end;
517 + end;
518 +
519 +
520   function TAccess_OniArchive.GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo;
521   begin
522    Result := RawLists.GetRawInfo(FConnectionID, FileID, DatOffset);
# Line 559 | Line 588 | begin
588    if fileid < GetFileCount then
589    begin
590      raw_info := Self.GetRawInfo(FileID, DatOffset);
591 +    if raw_info.RawSize = 0 then
592 +      exit;
593      if not raw_info.LocSep then
594      begin
595        if not FRawOpened then

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)