Changeset 173


Ignore:
Timestamp:
May 2, 2007, 3:19:40 PM (14 years ago)
Author:
alloc
Message:
 
Location:
oup/current
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • oup/current/DataAccess/Access_OUP_ADB.pas

    r159 r173  
    9191    if FQuery.FieldByName('name').AsString = 'lvl' then
    9292      FLevelNumber := StrToInt(FQuery.FieldByName('value').AsString);
    93     if FQuery.FieldByName('name').AsString = 'DataOS' then
     93    if FQuery.FieldByName('name').AsString = 'os' then
    9494    begin
    9595      if FQuery.FieldByName('value').AsString = 'WIN' then
  • oup/current/DataAccess/Access_OniArchive.pas

    r148 r173  
    647647
    648648function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
     649const
     650  EmptyBytes: Array[0..31] of Byte = (
     651      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 );
    649652begin
    650653  if not LocSep then
     
    653656      Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
    654657        fmOpenReadWrite);
     658    if (Fraw_file.Size mod 32) > 0 then
     659      Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
    655660    Result := Fraw_file.Size;
    656661    Fraw_file.Seek(0, soFromEnd);
    657662    Fraw_file.CopyFrom(Src, Src.Size);
     663    if (Fraw_file.Size mod 32) > 0 then
     664      Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
    658665    if UnloadWhenUnused then
    659666    begin
     
    669676      Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
    670677        fmOpenReadWrite);
     678    if (Fsep_file.Size mod 32) > 0 then
     679      Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
    671680    Result := Fsep_file.Size;
    672681    Fsep_file.Seek(0, soFromEnd);
    673682    Fsep_file.CopyFrom(Src, Src.Size);
     683    if (Fsep_file.Size mod 32) > 0 then
     684      Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
    674685    if UnloadWhenUnused then
    675686    begin
  • oup/current/Global/RawList.pas

    r171 r173  
    117117begin
    118118  SetLength(Result, 1);
    119   if ConManager.Connection[ConnectionID].DataOS = DOS_MAC then
     119  if ConManager.Connection[ConnectionID].DataOS in [DOS_MACBETA, DOS_MAC] then
    120120  begin
    121121    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @datasize);
  • oup/current/Helper/LevelDB.pas

    r167 r173  
    239239    case Connection.DataOS of
    240240      DOS_WIN: DatHeader.OSIdent[i] := HeaderOSIdentWin[i];
    241       DOS_MAC: DatHeader.OSIdent[i] := HeaderOSIdentMac[i];
     241      DOS_MAC, DOS_WINDEMO: DatHeader.OSIdent[i] := HeaderOSIdentMac[i];
    242242      DOS_MACBETA: DatHeader.OSIdent[i] := HeaderOSIdentMacBeta[i];
    243243    end;
     
    280280      case Connection.DataOS of
    281281        DOS_WIN:     ExtensionsHeader[i].Ident := FileTypes[j].IdentWin;
    282         DOS_WINDEMO: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
     282        DOS_WINDEMO:
     283            if FileTypes[j].Extension = 'SNDD' then
     284              ExtensionsHeader[i].Ident := FileTypes[j].IdentWin
     285            else
     286              ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
    283287        DOS_MAC:     ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
    284288        DOS_MACBETA: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
     
    492496      DeleteFile(target);
    493497    end;
    494 end;
     498  end;
    495499
    496500
Note: See TracChangeset for help on using the changeset viewer.