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 178 by alloc, Sat May 12 13:24:54 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 >  if link > 0 then
203 >    Result[0].RawSize := frames * 4
204 >  else
205 >    Result[0].RawSize := 0;
206 >  {y-pos}
207    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @link);
208    Result[1].SrcOffset := $10;
209    Result[1].RawAddr   := link;
210 <  Result[1].RawSize   := frames * 8;
210 >  if link > 0 then
211 >    Result[1].RawSize := frames * 8
212 >  else
213 >    Result[1].RawSize := 0;
214    {attacks}
215    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $182, 1, @tempb);
216    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link);
# Line 222 | Line 228 | begin
228    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @link);
229    Result[4].SrcOffset := $1C;
230    Result[4].RawAddr   := link;
231 <  Result[4].RawSize   := tempb * 8;
231 >  Result[4].RawSize   := tempb * 12;
232    {shortcut}
233    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $185, 1, @tempb);
234    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20, 4, @link);

Diff Legend

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