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 171 by alloc, Tue Apr 3 16:03:00 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 196 | 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);
203	–	{y-pos}
204	–	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link);
205	–	Result[0].src_offset := $0C;
206	–	Result[0].raw_addr   := link;
207	–	Result[0].raw_size   := frames * 4;
198		{x-z-pos}
199	+	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link);
200	+	Result[0].SrcOffset := $0C;
201	+	Result[0].RawAddr   := link;
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].src_offset := $10;
209	<	Result[1].raw_addr   := link;
210	<	Result[1].raw_size   := frames * 8;
208	>	Result[1].SrcOffset := $10;
209	>	Result[1].RawAddr   := link;
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);
217	<	Result[2].src_offset := $14;
218	<	Result[2].raw_addr   := link;
219	<	Result[2].raw_size   := tempb * 32;
217	>	Result[2].SrcOffset := $14;
218	>	Result[2].RawAddr   := link;
219	>	Result[2].RawSize   := tempb * 32;
220		{damage}
221		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $183, 1, @tempb);
222		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $18, 4, @link);
223	<	Result[3].src_offset := $18;
224	<	Result[3].raw_addr   := link;
225	<	Result[3].raw_size   := tempb * 8;
223	>	Result[3].SrcOffset := $18;
224	>	Result[3].RawAddr   := link;
225	>	Result[3].RawSize   := tempb * 8;
226		{motionblur}
227		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $184, 1, @tempb);
228		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @link);
229	<	Result[4].src_offset := $1C;
230	<	Result[4].raw_addr   := link;
231	<	Result[4].raw_size   := tempb * 8;
229	>	Result[4].SrcOffset := $1C;
230	>	Result[4].RawAddr   := link;
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);
235	<	Result[5].src_offset := $20;
236	<	Result[5].raw_addr   := link;
237	<	Result[5].raw_size   := tempb * 8;
235	>	Result[5].SrcOffset := $20;
236	>	Result[5].RawAddr   := link;
237	>	Result[5].RawSize   := tempb * 8;
238		{throw}
239		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $24, 4, @link);
240	<	Result[6].src_offset := $24;
241	<	Result[6].raw_addr   := link;
240	>	Result[6].SrcOffset := $24;
241	>	Result[6].RawAddr   := link;
242		if link > 0 then
243	<	Result[6].raw_size := 24
243	>	Result[6].RawSize := 24
244		else
245	<	Result[6].raw_size := 0;
245	>	Result[6].RawSize := 0;
246		{footstep}
247		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $186, 1, @tempb);
248		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $28, 4, @link);
249	<	Result[7].src_offset := $28;
250	<	Result[7].raw_addr   := link;
251	<	Result[7].raw_size   := tempb * 4;
249	>	Result[7].SrcOffset := $28;
250	>	Result[7].RawAddr   := link;
251	>	Result[7].RawSize   := tempb * 4;
252		{particle}
253		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $187, 1, @tempb);
254		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $2C, 4, @link);
255	<	Result[8].src_offset := $2C;
256	<	Result[8].raw_addr   := link;
257	<	Result[8].raw_size   := tempb * 24;
255	>	Result[8].SrcOffset := $2C;
256	>	Result[8].RawAddr   := link;
257	>	Result[8].RawSize   := tempb * 24;
258		{position}
259		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $30, 4, @link);
260	<	Result[9].src_offset := $30;
261	<	Result[9].raw_addr   := link;
262	<	Result[9].raw_size   := frames * 8;
260	>	Result[9].SrcOffset := $30;
261	>	Result[9].RawAddr   := link;
262	>	Result[9].RawSize   := frames * 8;
263		{particle}
264		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $154, 2, @tempw);
265		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $38, 4, @link);
266	<	Result[11].src_offset := $38;
267	<	Result[11].raw_addr   := link;
268	<	Result[11].raw_size   := tempw * 34;
266	>	Result[11].SrcOffset := $38;
267	>	Result[11].RawAddr   := link;
268	>	Result[11].RawSize   := tempw * 34;
269		{extent}
270		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $138, 4, @templ);
271		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $13C, 4, @link);
272	<	Result[12].src_offset := $13C;
273	<	Result[12].raw_addr   := link;
274	<	Result[12].raw_size   := templ * 12;
272	>	Result[12].SrcOffset := $13C;
273	>	Result[12].RawAddr   := link;
274	>	Result[12].RawSize   := templ * 12;
275
276		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $34, 4, @link);
277		if link > 0 then
#	Line 279 | Line 280 | begin
280		frame_count := 0;
281		i := 0;
282		SetLength(Data, $FFFF);
283	<	TOniDataDat(connection).LoadRawOffset(False, link, $FFFF, Data);
283	>	TAccess_OniArchive(ConManager.Connection[ConnectionID]).LoadRawOffset(
284	>	False, link, $FFFF, Data);
285		offset := Data[$24] + Data[$25] * 256;
286		while (offset + i < Length(Data)) and (frame_count < frames - 1) do
287		begin
#	Line 290 | Line 292 | begin
292		if offset + i < Length(Data) then
293		begin
294		Inc(i, tempw);
295	<	Result[10].raw_size := offset + i;
295	>	Result[10].RawSize := offset + i;
296		end
297		else
298		begin
299	<	Result[10].raw_size := 0;
299	>	Result[10].RawSize := 0;
300		end;
301		end;
302	<	Result[10].src_offset := $34;
303	<	Result[10].raw_addr   := link;
302	>	Result[10].SrcOffset := $34;
303	>	Result[10].RawAddr   := link;
304		end;
305
306
#	Line 311 | Line 313 | var
313		x, y:      Word;
314		storetype: Byte;
315		datasize:  Integer;
316	+	mipmap:    Byte;
317	+
318	+	function GetImgSize(w,h, storetype: Integer): Integer;
319	+	begin
320	+	case storetype of
321	+	0, 1, 2:
322	+	Result := w*h*2;
323	+	8:
324	+	Result := w*h*4;
325	+	9:
326	+	Result :=  Max(1, w div 4) * Max(1, h div 4) * 8;
327	+	else
328	+	Result := -1;
329	+	end;
330	+	end;
331	+
332		begin
333	+	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(mipmap), @mipmap);
334		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8C, SizeOf(x), @x);
335		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8E, SizeOf(y), @y);
336		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(storetype), @storetype);
337		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, 4, @link_pc);
338		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, 4, @link_mac);
339	<	case storetype of
340	<	0, 1, 2:
341	<	datasize := x * y * 2;
342	<	8:
343	<	datasize := x * y * 4;
344	<	9:
345	<	datasize := x * y div 2;
339	>
340	>
341	>	datasize := GetImgSize(x, y, storetype);
342	>	if (mipmap and $01) > 0 then
343	>	begin
344	>	repeat
345	>	x    := Max(x div 2, 1);
346	>	y    := Max(y div 2, 1);
347	>	datasize := datasize + GetImgSize(x, y, storetype);
348	>	until (x = 1) and (y = 1);
349		end;
350	+
351		SetLength(Result, 1);
352	<	if not connection.OSisMac then
352	>	if ConManager.Connection[ConnectionID].DataOS = DOS_WIN then
353		begin
354	<	Result[0].src_offset := $9C;
355	<	Result[0].raw_addr   := link_pc;
354	>	Result[0].SrcOffset := $9C;
355	>	Result[0].RawAddr   := link_pc;
356		end
357		else
358		begin
359	<	Result[0].src_offset := $A0;
360	<	Result[0].raw_addr   := link_mac;
359	>	Result[0].SrcOffset := $A0;
360	>	Result[0].RawAddr   := link_mac;
361		end;
362	<	Result[0].raw_size := datasize;
363	<	Result[0].loc_sep  := connection.OSisMac;
362	>	Result[0].RawSize := datasize;
363	>	Result[0].LocSep  := not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN);
364		end;
365
366
#	Line 403 | Line 426 | end;
426
427		initialization
428		RawLists := TRawLists.Create;
429	<	RawLists.InsertRawListHandler('AGDB',False,AGDB);
429	>	RawLists.InsertRawListHandler('AGDB', False, AGDB);
430		RawLists.InsertRawListHandler('AKVA', True, AKVA);
431		RawLists.InsertRawListHandler('BINA', True, BINA);
432		RawLists.InsertRawListHandler('OSBD', True, OSBD);

Diff Legend

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