--- oup/current/Global/RawList.pas 2007/04/03 15:43:53 169 +++ oup/current/Global/RawList.pas 2007/06/04 22:07:29 209 @@ -116,7 +116,7 @@ var datasize: Integer; begin SetLength(Result, 1); - if ConManager.Connection[ConnectionID].DataOS = DOS_MAC then + if ConManager.Connection[ConnectionID].DataOS in [DOS_MACBETA, DOS_MAC] then begin ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @datasize); ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link); @@ -195,19 +195,16 @@ var begin SetLength(Result, 13); ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $16C, 2, @frames); - {y-pos} + {x-z-pos} ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link); Result[0].SrcOffset := $0C; Result[0].RawAddr := link; - Result[0].RawSize := frames * 4; - {x-z-pos} + Result[0].RawSize := frames * 4; + {y-pos} ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @link); Result[1].SrcOffset := $10; Result[1].RawAddr := link; - if link > 0 then - Result[1].RawSize := frames * 8 - else - Result[1].RawSize := 0; + Result[1].RawSize := frames * 8; {attacks} ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $182, 1, @tempb); ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link); @@ -236,10 +233,7 @@ begin ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $24, 4, @link); Result[6].SrcOffset := $24; Result[6].RawAddr := link; - if link > 0 then - Result[6].RawSize := 24 - else - Result[6].RawSize := 0; + Result[6].RawSize := 24; {footstep} ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $186, 1, @tempb); ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $28, 4, @link); @@ -406,6 +400,10 @@ begin Result := FRawListHandlers[i].Handler(ConnectionID, FileID); Break; end; + if Length(Result) > 0 then + for i := 0 to High(Result) do + if Result[i].RawAddr = 0 then + Result[i].RawSize := 0; end; procedure TRawLists.InsertRawListHandler(ext: String; needed: Boolean; handler: THandler);