--- oup/current/Helper/LevelDB.pas 2007/02/25 17:20:22 113 +++ oup/current/Helper/LevelDB.pas 2007/03/28 01:12:22 129 @@ -78,10 +78,16 @@ var Connection: TDataAccess; ConRepMsg: TStatusMessages; + FileID: Integer; + Strings: TStrings; i, j: Integer; temps: String; + tempi: Integer; + tempb: Byte; FileInfo: TFileInfo; + DatLinks: TDatLinkList; + RawLinks: TRawDataList; DatFileStream, RawFileStream: TMemoryStream; const @@ -270,72 +276,59 @@ begin Application.ProcessMessages; FileTime := Time; - for i := 0 to DatHeader.Files - 1 do + for FileID := 0 to DatHeader.Files - 1 do begin - FileInfo := Connection.GetFileInfo(i); + FileInfo := Connection.GetFileInfo(FileID); for j := 0 to 3 do - FilesHeader[i].Extension[j] := FileInfo.Extension[4 - j]; + FilesHeader[FileID].Extension[j] := FileInfo.Extension[4 - j]; if FileInfo.Size > 0 then begin - // DatLinks:=; - FilesHeader[i].DataAddr := Stream_Body.Size + 8; + FilesHeader[FileID].DataAddr := Stream_Body.Size + 8; DatFileStream := TMemoryStream.Create; - Connection.LoadDatFile(i, DatFileStream); + Connection.LoadDatFile(FileID, TStream(DatFileStream)); DatFileStream.Seek(4, soFromBeginning); DatFileStream.Write(LevelID, 4); - if (Pos(UpperCase(fileinfo.Extension), UpperCase(raws)) mod 4) = 1 then + DatLinks := Connection.GetDatLinks(FileID); + if Length(DatLinks) > 0 then begin - rawlist := OniDataConnection.GetRawList(i); - if Length(rawlist) > 0 then + for i := 0 to High(DatLinks) do begin - for j := 0 to High(rawlist) do + DatFileStream.Seek(DatLinks[i].SrcOffset, soFromBeginning); + if DatLinks[i].DestID < 0 then + tempi := 0 + else + tempi := DatLinks[i].DestID * 256 + 1; + DatFileStream.Write(tempi, 4); + end; + end; + + RawLinks := Connection.GetRawList(FileID); + if Length(RawLinks) > 0 then + begin + for i := 0 to High(RawLinks) do + begin + if RawLinks[i].RawSize > 0 then begin - if rawlist[j].raw_size > 0 then + RawFileStream := TMemoryStream.Create; + Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, TStream(RawFileStream)); + RawFileStream.Seek(0, soFromBeginning); + if RawLinks[i].LocSep then begin - if (UpperCase(fileinfo.Extension) = 'TXMP') and - ((Data[$88] and $01) > 0) then - begin - OniImage.LoadFromTXMP(Connection, i); - OniImage.GetMipMappedImage(rawdata); - rawlist[j].raw_size := OniImage.GetImageDataSize(True); - Data[$90] := $08; - Data[$89] := 32; -{ if data[$90]<>OniImage.StoreType then begin - data[$90]:=OniImage.StoreType; - data[$89]:=(data[$89] and $CF) or $20; - end; -} end - else - begin - SetLength(rawdata, rawlist[j].raw_size); - OniDataConnection.LoadRawFile(i, rawlist[j].src_offset, @rawdata[0]); - end; - // data[$88]:=data[$88] and $FE; - - if rawlist[j].loc_sep then - begin - rawlist[j].raw_addr := Stream_Sep.Size; - Stream_Sep.Write(rawdata[0], Length(rawdata)); - end - else - begin - rawlist[j].raw_addr := Stream_Raw.Size; - Stream_Raw.Write(rawdata[0], Length(rawdata)); - end; - end - else - rawlist[j].raw_addr := 0; - 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; - end; + RawLinks[i].RawAddr := Stream_Sep.Size; + Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size); + end else begin + RawLinks[i].RawAddr := Stream_Raw.Size; + Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size); + end; + end else + RawLinks[i].RawAddr := 0; + DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning); + DatFileStream.Write(RawLinks[i].RawAddr, 4); end; end; - - Stream_Body.Write(Data[0], Length(Data)); - // + DatFileStream.Seek(0, soFromBeginning); + Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size); end else FilesHeader[i].DataAddr := 0; @@ -382,7 +375,8 @@ begin Stream_Body.Free; Stream_Names.Free; Stream_Raw.Free; - if OniDataConnection.OSisMac then + + if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then Stream_Sep.Free; progress.Position := progress.Max; @@ -398,7 +392,7 @@ begin converting := False; - CloseDataConnection(DataConnections[conIndex]); +// CloseDataConnection(DataConnections[conIndex]); end; @@ -408,7 +402,7 @@ procedure TForm_LevelDB.HandleFile; var 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 begin @@ -417,12 +411,13 @@ begin end else Break; -end; +}end; procedure TForm_LevelDB.CreateDatabase(Source, target: String); +{ var DataBase: TABSDatabase; Query: TABSQuery; @@ -454,9 +449,10 @@ const else group_progress.Caption := 'Creating DB (FINISHED)'; end; +} begin - if CreateDataConnection(Source, ODB_Dat) = nil then +{ if CreateDataConnection(Source, ODB_Dat) = nil then begin ShowMessage('Could not connect to .dat-file'); Exit; @@ -659,14 +655,15 @@ begin database.Free; CloseDataConnection(DataConnections[conIndex]); +} end; -procedure TForm_LevelDB.stop_convert; +procedure TForm_LevelDB.StopConvert; begin - btn_abortok.Caption := '&Close'; +{ btn_abortok.Caption := '&Close'; btn_abortok.Default := True; converting := False; lbl_estimation.Caption := 'ABORTED'; @@ -677,7 +674,7 @@ begin begin DeleteFile(loaded_filename); end; -end; +}end; @@ -700,7 +697,7 @@ end; - +{ procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord); var link: LongWord; @@ -1732,10 +1729,10 @@ begin begin end; end; +} - - +{ procedure InsertHandler(ext: String; needed: Boolean; handler: THandler); begin SetLength(ConvertHandlers, Length(ConvertHandlers) + 1); @@ -1743,9 +1740,9 @@ begin ConvertHandlers[High(ConvertHandlers)].needed := needed; ConvertHandlers[High(ConvertHandlers)].handler := handler; end; - +} begin - InsertHandler('ABNA', False, nil); +{ InsertHandler('ABNA', False, nil); // InsertHandler('AGDB',True,AGDB); InsertHandler('AGDB', False, nil); InsertHandler('AGQC', False, nil); @@ -1843,4 +1840,4 @@ begin InsertHandler('WMM_', False, nil); InsertHandler('WMMB', True, WMMB); InsertHandler('WPGE', True, WPGE); -end. +}end.