ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Global/RawList.pas

Comparing:
oup/rewrite/Global/RawList.pas (file contents), Revision 97 by alloc, Mon Jan 22 23:05:45 2007 UTC vs.
oup/current/Global/RawList.pas (file contents), Revision 160 by alloc, Mon Apr 2 01:04:52 2007 UTC

#	Line 1 | Line 1
1		unit RawList;
2	–
2		interface
3	<
5	<	uses TypeDefs, ConnectionManager;
3	>	uses TypeDefs;
4
5		type
6		THandler = function(ConnectionID, FileID: Integer): TRawDataList;
7	<	TRawListHandlers = record
7	>	TRawListHandler = record
8		Ext:     String[4];
9		needed:  Boolean;
10		Handler: THandler;
11		end;
12	+	TRawListHandlers = array of TRawListHandler;
13
14		TRawLists = class
15		private
16		FRawListHandlers: TRawListHandlers;
17		public
18	+	property RawListHandlers: TRawListHandlers read FRawListHandlers;
19		procedure InsertRawListHandler(ext: String; needed: Boolean; handler: THandler);
20		function GetRawList(ConnectionID, FileID: Integer): TRawDataList;
21		function GetRawInfo(ConnectionID, FileID, DatOffset: Integer): TRawDataInfo;
#	Line 24 | Line 24 | type
24
25		var
26		RawLists: TRawLists;
27	<
27	>
28
29		implementation
30
31		uses
32	<	Template;
32	>	Template, ConnectionManager, Access_OniArchive, Classes, SysUtils, Math;
33
34
35		function AGDB(ConnectionID, FileID: Integer): TRawDataList;
#	Line 38 | Line 38 | var
38		links: Integer;
39		i:     Integer;
40		begin
41	<	if not connection.OSisMac then
41	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @links);
42	>	links := links * 2;
43	>	SetLength(Result, links);
44	>	for i := 0 to links - 1 do
45		begin
46	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @links);
47	<	links := links * 2;
48	<	SetLength(Result, links);
49	<	for i := 0 to links - 1 do
50	<	begin
48	<	Result[i].src_offset := $20 + i * 4;
49	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * 4, 4, @link);
50	<	Result[i].raw_addr := link;
51	<	Result[i].raw_size := 32;
52	<	Result[i].loc_sep  := False;
53	<	end;
46	>	Result[i].SrcOffset := $20 + i * 4;
47	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * 4, 4, @link);
48	>	Result[i].RawAddr := link;
49	>	Result[i].RawSize := 32;
50	>	Result[i].LocSep  := False;
51		end;
52		end;
53
#	Line 63 | Line 60 | var
60		links: Integer;
61		i:     Integer;
62		begin
63	<	if not connection.OSisMac then
63	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @links);
64	>	SetLength(Result, links);
65	>	for i := 0 to links - 1 do
66		begin
67	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @links);
68	<	SetLength(Result, links);
69	<	for i := 0 to links - 1 do
70	<	begin
71	<	Result[i].src_offset := $20 + i * $74 + $24;
72	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * $74 + $24, 4, @link);
74	<	Result[i].raw_addr := link;
75	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * $74 + $28, 4, @link);
76	<	Result[i].raw_size := link;
77	<	Result[i].loc_sep  := False;
78	<	end;
67	>	Result[i].SrcOffset := $20 + i * $74 + $24;
68	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * $74 + $24, 4, @link);
69	>	Result[i].RawAddr := link;
70	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * $74 + $28, 4, @link);
71	>	Result[i].RawSize := link;
72	>	Result[i].LocSep  := False;
73		end;
74		end;
75
#	Line 90 | Line 84 | begin
84		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link);
85		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $08, 4, @datasize);
86		SetLength(Result, 1);
87	<	Result[0].src_offset := $0C;
88	<	Result[0].raw_addr   := link;
89	<	Result[0].raw_size   := datasize;
90	<	Result[0].loc_sep    := connection.OSisMac;
87	>	Result[0].SrcOffset := $0C;
88	>	Result[0].RawAddr   := link;
89	>	Result[0].RawSize   := datasize;
90	>	Result[0].LocSep    := not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN);
91		end;
92
93
#	Line 107 | Line 101 | begin
101		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $08, 4, @datasize);
102		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link);
103		SetLength(Result, 1);
104	<	Result[0].src_offset := $0C;
105	<	Result[0].raw_addr   := link;
106	<	Result[0].raw_size   := datasize;
107	<	Result[0].loc_sep    := connection.OSisMac;
104	>	Result[0].SrcOffset := $0C;
105	>	Result[0].RawAddr   := link;
106	>	Result[0].RawSize   := datasize;
107	>	Result[0].LocSep     := not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN);
108		end;
109
110
#	Line 122 | Line 116 | var
116		datasize: Integer;
117		begin
118		SetLength(Result, 1);
119	<	if not connection.OSisMac then
119	>	if ConManager.Connection[ConnectionID].DataOS = DOS_MAC then
120		begin
121	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $40, 4, @datasize);
122	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $44, 4, @link);
123	<	Result[0].src_offset := $44;
121	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @datasize);
122	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link);
123	>	Result[0].SrcOffset := $14;
124		end
125		else
126		begin
127	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @datasize);
128	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link);
129	<	Result[0].src_offset := $14;
127	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $40, 4, @datasize);
128	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $44, 4, @link);
129	>	Result[0].SrcOffset := $44;
130		end;
131	<	Result[0].raw_addr := link;
132	<	Result[0].raw_size := datasize;
133	<	Result[0].loc_sep  := False;
131	>	Result[0].RawAddr := link;
132	>	Result[0].RawSize := datasize;
133	>	Result[0].LocSep  := False;
134		end;
135
136
#	Line 146 | Line 140 | function SUBT(ConnectionID, FileID: Inte
140		var
141		baselink, lastlink: Integer;
142		links: Integer;
143	<	j, k:  Integer;
144	<	Data:  TByteData;
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);
155	<	SetLength(Data, lastlink + 1024);
156	<	TOniDataDat(connection).LoadRawOffset(False,
157	<	baselink, lastlink + 1024, Data);
158	<	//      connection.LoadRawFile(fileid,$1C,baselink,lastlink+1024,False,@data[0]);
159	<	k := 0;
160	<	for j := 0 to 1024 do
161	<	begin
162	<	if (Data[lastlink + j] = $00) or (j = 1024) then
155	>	Data := nil;
156	>	TAccess_OniArchive(ConManager.Connection[ConnectionID]).LoadRawOffset(
157	>	False, baselink, lastlink + 1024, Data);
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
167	<	begin
168	<	if k = 0 then
169	<	begin
170	<	k := 1;
171	<	end
172	<	else
173	<	begin
174	<	SetLength(Result, 1);
175	<	Result[0].src_offset := $18;
176	<	Result[0].raw_addr   := baselink;
177	<	Result[0].raw_size   := lastlink + j;
178	<	Break;
179	<	end;
180	<	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;
179		end;
#	Line 202 | Line 197 | begin
197		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $16C, 2, @frames);
198		{y-pos}
199		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link);
200	<	Result[0].src_offset := $0C;
201	<	Result[0].raw_addr   := link;
202	<	Result[0].raw_size   := frames * 4;
200	>	Result[0].SrcOffset := $0C;
201	>	Result[0].RawAddr   := link;
202	>	Result[0].RawSize   := frames * 4;
203		{x-z-pos}
204		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @link);
205	<	Result[1].src_offset := $10;
206	<	Result[1].raw_addr   := link;
207	<	Result[1].raw_size   := frames * 8;
205	>	Result[1].SrcOffset := $10;
206	>	Result[1].RawAddr   := link;
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);
211	<	Result[2].src_offset := $14;
212	<	Result[2].raw_addr   := link;
213	<	Result[2].raw_size   := tempb * 32;
211	>	Result[2].SrcOffset := $14;
212	>	Result[2].RawAddr   := link;
213	>	Result[2].RawSize   := tempb * 32;
214		{damage}
215		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $183, 1, @tempb);
216		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $18, 4, @link);
217	<	Result[3].src_offset := $18;
218	<	Result[3].raw_addr   := link;
219	<	Result[3].raw_size   := tempb * 8;
217	>	Result[3].SrcOffset := $18;
218	>	Result[3].RawAddr   := link;
219	>	Result[3].RawSize   := tempb * 8;
220		{motionblur}
221		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $184, 1, @tempb);
222		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @link);
223	<	Result[4].src_offset := $1C;
224	<	Result[4].raw_addr   := link;
225	<	Result[4].raw_size   := tempb * 8;
223	>	Result[4].SrcOffset := $1C;
224	>	Result[4].RawAddr   := link;
225	>	Result[4].RawSize   := 12;
226		{shortcut}
227		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $185, 1, @tempb);
228		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20, 4, @link);
229	<	Result[5].src_offset := $20;
230	<	Result[5].raw_addr   := link;
231	<	Result[5].raw_size   := tempb * 8;
229	>	Result[5].SrcOffset := $20;
230	>	Result[5].RawAddr   := link;
231	>	Result[5].RawSize   := tempb * 8;
232		{throw}
233		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $24, 4, @link);
234	<	Result[6].src_offset := $24;
235	<	Result[6].raw_addr   := link;
234	>	Result[6].SrcOffset := $24;
235	>	Result[6].RawAddr   := link;
236		if link > 0 then
237	<	Result[6].raw_size := 24
237	>	Result[6].RawSize := 24
238		else
239	<	Result[6].raw_size := 0;
239	>	Result[6].RawSize := 0;
240		{footstep}
241		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $186, 1, @tempb);
242		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $28, 4, @link);
243	<	Result[7].src_offset := $28;
244	<	Result[7].raw_addr   := link;
245	<	Result[7].raw_size   := tempb * 4;
243	>	Result[7].SrcOffset := $28;
244	>	Result[7].RawAddr   := link;
245	>	Result[7].RawSize   := tempb * 4;
246		{particle}
247		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $187, 1, @tempb);
248		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $2C, 4, @link);
249	<	Result[8].src_offset := $2C;
250	<	Result[8].raw_addr   := link;
251	<	Result[8].raw_size   := tempb * 24;
249	>	Result[8].SrcOffset := $2C;
250	>	Result[8].RawAddr   := link;
251	>	Result[8].RawSize   := tempb * 24;
252		{position}
253		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $30, 4, @link);
254	<	Result[9].src_offset := $30;
255	<	Result[9].raw_addr   := link;
256	<	Result[9].raw_size   := frames * 8;
254	>	Result[9].SrcOffset := $30;
255	>	Result[9].RawAddr   := link;
256	>	Result[9].RawSize   := frames * 8;
257		{particle}
258		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $154, 2, @tempw);
259		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $38, 4, @link);
260	<	Result[11].src_offset := $38;
261	<	Result[11].raw_addr   := link;
262	<	Result[11].raw_size   := tempw * 34;
260	>	Result[11].SrcOffset := $38;
261	>	Result[11].RawAddr   := link;
262	>	Result[11].RawSize   := tempw * 34;
263		{extent}
264		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $138, 4, @templ);
265		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $13C, 4, @link);
266	<	Result[12].src_offset := $13C;
267	<	Result[12].raw_addr   := link;
268	<	Result[12].raw_size   := templ * 12;
266	>	Result[12].SrcOffset := $13C;
267	>	Result[12].RawAddr   := link;
268	>	Result[12].RawSize   := templ * 12;
269
270		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $34, 4, @link);
271		if link > 0 then
#	Line 279 | Line 274 | begin
274		frame_count := 0;
275		i := 0;
276		SetLength(Data, $FFFF);
277	<	TOniDataDat(connection).LoadRawOffset(False, link, $FFFF, Data);
277	>	TAccess_OniArchive(ConManager.Connection[ConnectionID]).LoadRawOffset(
278	>	False, link, $FFFF, Data);
279		offset := Data[$24] + Data[$25] * 256;
280		while (offset + i < Length(Data)) and (frame_count < frames - 1) do
281		begin
#	Line 290 | Line 286 | begin
286		if offset + i < Length(Data) then
287		begin
288		Inc(i, tempw);
289	<	Result[10].raw_size := offset + i;
289	>	Result[10].RawSize := offset + i;
290		end
291		else
292		begin
293	<	Result[10].raw_size := 0;
293	>	Result[10].RawSize := 0;
294		end;
295		end;
296	<	Result[10].src_offset := $34;
297	<	Result[10].raw_addr   := link;
296	>	Result[10].SrcOffset := $34;
297	>	Result[10].RawAddr   := link;
298		end;
299
300
#	Line 311 | Line 307 | var
307		x, y:      Word;
308		storetype: Byte;
309		datasize:  Integer;
310	+	mipmap:    Byte;
311	+
312	+	function GetImgSize(w,h, storetype: Integer): Integer;
313	+	begin
314	+	case storetype of
315	+	0, 1, 2:
316	+	Result := w*h*2;
317	+	8:
318	+	Result := w*h*4;
319	+	9:
320	+	Result :=  Max(1, w div 4) * Max(1, h div 4) * 8;
321	+	else
322	+	Result := -1;
323	+	end;
324	+	end;
325	+
326		begin
327	+	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(mipmap), @mipmap);
328		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8C, SizeOf(x), @x);
329		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8E, SizeOf(y), @y);
330		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(storetype), @storetype);
331		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, 4, @link_pc);
332		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, 4, @link_mac);
333	<	case storetype of
334	<	0, 1, 2:
335	<	datasize := x * y * 2;
336	<	8:
337	<	datasize := x * y * 4;
338	<	9:
339	<	datasize := x * y div 2;
333	>
334	>
335	>	datasize := GetImgSize(x, y, storetype);
336	>	if (mipmap and $01) > 0 then
337	>	begin
338	>	repeat
339	>	x    := Max(x div 2, 1);
340	>	y    := Max(y div 2, 1);
341	>	datasize := datasize + GetImgSize(x, y, storetype);
342	>	until (x = 1) and (y = 1);
343		end;
344	+
345		SetLength(Result, 1);
346	<	if not connection.OSisMac then
346	>	if ConManager.Connection[ConnectionID].DataOS = DOS_WIN then
347		begin
348	<	Result[0].src_offset := $9C;
349	<	Result[0].raw_addr   := link_pc;
348	>	Result[0].SrcOffset := $9C;
349	>	Result[0].RawAddr   := link_pc;
350		end
351		else
352		begin
353	<	Result[0].src_offset := $A0;
354	<	Result[0].raw_addr   := link_mac;
353	>	Result[0].SrcOffset := $A0;
354	>	Result[0].RawAddr   := link_mac;
355		end;
356	<	Result[0].raw_size := datasize;
357	<	Result[0].loc_sep  := connection.OSisMac;
356	>	Result[0].RawSize := datasize;
357	>	Result[0].LocSep  := not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN);
358		end;
359
360
#	Line 403 | 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)