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

Comparing oup/current/Global/RawList.pas (file contents):
Revision 128 by alloc, Wed Mar 28 00:57:53 2007 UTC vs.
Revision 149 by alloc, Sun Apr 1 16:44:29 2007 UTC

# Line 141 | Line 141 | var
141    baselink, lastlink: Integer;
142    links: Integer;
143    Data:  TStream;
144 +  read:  Integer;
145 +  char:  Byte;
146 +  foundzeros: Byte;
147   begin
148 +  SetLength(Result, 0);
149 +
150    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $18, 4, @baselink);
151    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @links);
152    if links > 0 then
153    begin
154      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + (links - 1) * 4, 4, @lastlink);
150 //    SetLength(Data, lastlink + 1024);
155      Data := nil;
156      TAccess_OniArchive(ConManager.Connection[ConnectionID]).LoadRawOffset(
157            False, baselink, lastlink + 1024, Data);
158 < //    TOniDataDat(connection).LoadRawOffset(False, baselink, lastlink + 1024, Data);
159 <    //      connection.LoadRawFile(fileid,$1C,baselink,lastlink+1024,False,@data[0]);
160 <    raise ENotImplemented.Create('RawList.SUBT');
161 <  end;
162 < {
163 <    k := 0;
160 <    for j := 0 to 1024 do
161 <    begin
162 <      if (Data[lastlink + j] = $00) or (j = 1024) then
158 >    Data.Seek(lastlink, soFromBeginning);
159 >
160 >    foundzeros := 0;
161 >    repeat
162 >      read := Data.Read(char, 1);
163 >      if (read > 0) and (char = 0) then
164        begin
165 <        if j < 1024 then
165 <        begin
166 <          if k = 0 then
167 <          begin
168 <            k := 1;
169 <          end
170 <          else
171 <          begin
172 <            SetLength(Result, 1);
173 <            Result[0].src_offset := $18;
174 <            Result[0].raw_addr   := baselink;
175 <            Result[0].raw_size   := lastlink + j;
176 <            Break;
177 <          end;
178 <        end;
165 >        Inc(foundzeros);
166        end;
167 +    until (read = 0) or (foundzeros = 2);
168 +
169 +    if foundzeros = 2 then
170 +    begin
171 +      SetLength(Result, 1);
172 +      Result[0].SrcID     := FileID;
173 +      Result[0].SrcOffset := $18;
174 +      Result[0].RawAddr   := baselink;
175 +      Result[0].RawSize   := Data.Position;
176 +      Result[0].LocSep    := False;
177      end;
178    end;
182 }
179   end;
180  
181  
# Line 424 | Line 420 | end;
420  
421   initialization
422    RawLists := TRawLists.Create;
423 <  RawLists.InsertRawListHandler('AGDB',False,AGDB);
423 >  RawLists.InsertRawListHandler('AGDB', False, AGDB);
424    RawLists.InsertRawListHandler('AKVA', True, AKVA);
425    RawLists.InsertRawListHandler('BINA', True, BINA);
426    RawLists.InsertRawListHandler('OSBD', True, OSBD);

Diff Legend

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