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 149 by alloc, Sun Apr 1 16:44:29 2007 UTC vs.
Revision 209 by alloc, Mon Jun 4 22:07:29 2007 UTC

# Line 116 | Line 116 | var
116    datasize: Integer;
117   begin
118    SetLength(Result, 1);
119 <  if ConManager.Connection[ConnectionID].DataOS = DOS_MAC then
119 >  if ConManager.Connection[ConnectionID].DataOS in [DOS_MACBETA, DOS_MAC] then
120    begin
121      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @datasize);
122      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link);
# Line 191 | Line 191 | var
191    templ:  Integer;
192    Data:   TByteData;
193    offset: Word;
194 <  frame_count: Byte;
194 >  frame_count: Integer;
195   begin
196    SetLength(Result, 13);
197    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $16C, 2, @frames);
198 <  {y-pos}
198 >  {x-z-pos}
199    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link);
200    Result[0].SrcOffset := $0C;
201    Result[0].RawAddr   := link;
202 <  Result[0].RawSize   := frames * 4;
203 <  {x-z-pos}
202 >  Result[0].RawSize := frames * 4;
203 >  {y-pos}
204    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @link);
205    Result[1].SrcOffset := $10;
206    Result[1].RawAddr   := link;
207 <  Result[1].RawSize   := frames * 8;
207 >  Result[1].RawSize := frames * 8;
208    {attacks}
209    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $182, 1, @tempb);
210    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link);
# Line 222 | Line 222 | begin
222    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @link);
223    Result[4].SrcOffset := $1C;
224    Result[4].RawAddr   := link;
225 <  Result[4].RawSize   := tempb * 8;
225 >  Result[4].RawSize   := tempb * 12;
226    {shortcut}
227    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $185, 1, @tempb);
228    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20, 4, @link);
# Line 233 | Line 233 | begin
233    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $24, 4, @link);
234    Result[6].SrcOffset := $24;
235    Result[6].RawAddr   := link;
236 <  if link > 0 then
237 <    Result[6].RawSize := 24
238 <  else
239 <    Result[6].RawSize := 0;
236 >  Result[6].RawSize := 24;
237    {footstep}
238    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $186, 1, @tempb);
239    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $28, 4, @link);
# Line 403 | Line 400 | begin
400          Result := FRawListHandlers[i].Handler(ConnectionID, FileID);
401        Break;
402      end;
403 +  if Length(Result) > 0 then
404 +    for i := 0 to High(Result) do
405 +      if Result[i].RawAddr = 0 then
406 +        Result[i].RawSize := 0;
407   end;
408  
409   procedure TRawLists.InsertRawListHandler(ext: String; needed: Boolean; handler: THandler);

Diff Legend

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