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 124 by alloc, Fri Mar 23 03:07:58 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;
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;
150	<	Data:  TByteData;
143	>	Data:  TStream;
144		begin
145		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $18, 4, @baselink);
146		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @links);
147		if links > 0 then
148		begin
149		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + (links - 1) * 4, 4, @lastlink);
150	<	SetLength(Data, lastlink + 1024);
151	<	TOniDataDat(connection).LoadRawOffset(False,
152	<	baselink, lastlink + 1024, Data);
150	>	//    SetLength(Data, lastlink + 1024);
151	>	Data := nil;
152	>	TAccess_OniArchive(ConManager.Connection[ConnectionID]).LoadRawOffset(
153	>	False, baselink, lastlink + 1024, Data);
154	>	//    TOniDataDat(connection).LoadRawOffset(False, baselink, lastlink + 1024, Data);
155		//      connection.LoadRawFile(fileid,$1C,baselink,lastlink+1024,False,@data[0]);
156	+	raise ENotImplemented.Create('RawList.SUBT');
157	+	end;
158	+	{
159		k := 0;
160		for j := 0 to 1024 do
161		begin
#	Line 181 | Line 179 | begin
179		end;
180		end;
181		end;
182	+	}
183		end;
184
185
#	Line 202 | Line 201 | begin
201		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $16C, 2, @frames);
202		{y-pos}
203		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $0C, 4, @link);
204	<	Result[0].src_offset := $0C;
205	<	Result[0].raw_addr   := link;
206	<	Result[0].raw_size   := frames * 4;
204	>	Result[0].SrcOffset := $0C;
205	>	Result[0].RawAddr   := link;
206	>	Result[0].RawSize   := frames * 4;
207		{x-z-pos}
208		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, 4, @link);
209	<	Result[1].src_offset := $10;
210	<	Result[1].raw_addr   := link;
211	<	Result[1].raw_size   := frames * 8;
209	>	Result[1].SrcOffset := $10;
210	>	Result[1].RawAddr   := link;
211	>	Result[1].RawSize   := frames * 8;
212		{attacks}
213		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $182, 1, @tempb);
214		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $14, 4, @link);
215	<	Result[2].src_offset := $14;
216	<	Result[2].raw_addr   := link;
217	<	Result[2].raw_size   := tempb * 32;
215	>	Result[2].SrcOffset := $14;
216	>	Result[2].RawAddr   := link;
217	>	Result[2].RawSize   := tempb * 32;
218		{damage}
219		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $183, 1, @tempb);
220		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $18, 4, @link);
221	<	Result[3].src_offset := $18;
222	<	Result[3].raw_addr   := link;
223	<	Result[3].raw_size   := tempb * 8;
221	>	Result[3].SrcOffset := $18;
222	>	Result[3].RawAddr   := link;
223	>	Result[3].RawSize   := tempb * 8;
224		{motionblur}
225		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $184, 1, @tempb);
226		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, 4, @link);
227	<	Result[4].src_offset := $1C;
228	<	Result[4].raw_addr   := link;
229	<	Result[4].raw_size   := tempb * 8;
227	>	Result[4].SrcOffset := $1C;
228	>	Result[4].RawAddr   := link;
229	>	Result[4].RawSize   := tempb * 8;
230		{shortcut}
231		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $185, 1, @tempb);
232		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20, 4, @link);
233	<	Result[5].src_offset := $20;
234	<	Result[5].raw_addr   := link;
235	<	Result[5].raw_size   := tempb * 8;
233	>	Result[5].SrcOffset := $20;
234	>	Result[5].RawAddr   := link;
235	>	Result[5].RawSize   := tempb * 8;
236		{throw}
237		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $24, 4, @link);
238	<	Result[6].src_offset := $24;
239	<	Result[6].raw_addr   := link;
238	>	Result[6].SrcOffset := $24;
239	>	Result[6].RawAddr   := link;
240		if link > 0 then
241	<	Result[6].raw_size := 24
241	>	Result[6].RawSize := 24
242		else
243	<	Result[6].raw_size := 0;
243	>	Result[6].RawSize := 0;
244		{footstep}
245		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $186, 1, @tempb);
246		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $28, 4, @link);
247	<	Result[7].src_offset := $28;
248	<	Result[7].raw_addr   := link;
249	<	Result[7].raw_size   := tempb * 4;
247	>	Result[7].SrcOffset := $28;
248	>	Result[7].RawAddr   := link;
249	>	Result[7].RawSize   := tempb * 4;
250		{particle}
251		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $187, 1, @tempb);
252		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $2C, 4, @link);
253	<	Result[8].src_offset := $2C;
254	<	Result[8].raw_addr   := link;
255	<	Result[8].raw_size   := tempb * 24;
253	>	Result[8].SrcOffset := $2C;
254	>	Result[8].RawAddr   := link;
255	>	Result[8].RawSize   := tempb * 24;
256		{position}
257		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $30, 4, @link);
258	<	Result[9].src_offset := $30;
259	<	Result[9].raw_addr   := link;
260	<	Result[9].raw_size   := frames * 8;
258	>	Result[9].SrcOffset := $30;
259	>	Result[9].RawAddr   := link;
260	>	Result[9].RawSize   := frames * 8;
261		{particle}
262		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $154, 2, @tempw);
263		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $38, 4, @link);
264	<	Result[11].src_offset := $38;
265	<	Result[11].raw_addr   := link;
266	<	Result[11].raw_size   := tempw * 34;
264	>	Result[11].SrcOffset := $38;
265	>	Result[11].RawAddr   := link;
266	>	Result[11].RawSize   := tempw * 34;
267		{extent}
268		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $138, 4, @templ);
269		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $13C, 4, @link);
270	<	Result[12].src_offset := $13C;
271	<	Result[12].raw_addr   := link;
272	<	Result[12].raw_size   := templ * 12;
270	>	Result[12].SrcOffset := $13C;
271	>	Result[12].RawAddr   := link;
272	>	Result[12].RawSize   := templ * 12;
273
274		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $34, 4, @link);
275		if link > 0 then
#	Line 279 | Line 278 | begin
278		frame_count := 0;
279		i := 0;
280		SetLength(Data, $FFFF);
281	<	TOniDataDat(connection).LoadRawOffset(False, link, $FFFF, Data);
281	>	TAccess_OniArchive(ConManager.Connection[ConnectionID]).LoadRawOffset(
282	>	False, link, $FFFF, Data);
283		offset := Data[$24] + Data[$25] * 256;
284		while (offset + i < Length(Data)) and (frame_count < frames - 1) do
285		begin
#	Line 290 | Line 290 | begin
290		if offset + i < Length(Data) then
291		begin
292		Inc(i, tempw);
293	<	Result[10].raw_size := offset + i;
293	>	Result[10].RawSize := offset + i;
294		end
295		else
296		begin
297	<	Result[10].raw_size := 0;
297	>	Result[10].RawSize := 0;
298		end;
299		end;
300	<	Result[10].src_offset := $34;
301	<	Result[10].raw_addr   := link;
300	>	Result[10].SrcOffset := $34;
301	>	Result[10].RawAddr   := link;
302		end;
303
304
#	Line 311 | Line 311 | var
311		x, y:      Word;
312		storetype: Byte;
313		datasize:  Integer;
314	+	mipmap:    Byte;
315	+	bpp:       Byte;
316	+	minside:   Byte;
317		begin
318	+	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(mipmap), @mipmap);
319		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8C, SizeOf(x), @x);
320		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8E, SizeOf(y), @y);
321		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(storetype), @storetype);
322		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, 4, @link_pc);
323		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, 4, @link_mac);
324	+
325	+
326	+	minside := 1;
327		case storetype of
328		0, 1, 2:
329	<	datasize := x * y * 2;
329	>	bpp := 16;
330		8:
331	<	datasize := x * y * 4;
331	>	bpp := 32;
332		9:
333	<	datasize := x * y div 2;
333	>	begin
334	>	bpp := 4;
335	>	minside := 4;
336	>	end;
337	>	end;
338	>
339	>	datasize := (x * y * bpp) div 8;
340	>	if (mipmap and $01) > 0 then
341	>	begin
342	>	repeat
343	>	x    := x div 2;
344	>	y    := y div 2;
345	>	datasize := datasize + (x * y * bpp) div 8;
346	>	until (x = minside) or (y = minside);
347		end;
348	+
349		SetLength(Result, 1);
350	<	if not connection.OSisMac then
350	>	if ConManager.Connection[ConnectionID].DataOS = DOS_WIN then
351		begin
352	<	Result[0].src_offset := $9C;
353	<	Result[0].raw_addr   := link_pc;
352	>	Result[0].SrcOffset := $9C;
353	>	Result[0].RawAddr   := link_pc;
354		end
355		else
356		begin
357	<	Result[0].src_offset := $A0;
358	<	Result[0].raw_addr   := link_mac;
357	>	Result[0].SrcOffset := $A0;
358	>	Result[0].RawAddr   := link_mac;
359		end;
360	<	Result[0].raw_size := datasize;
361	<	Result[0].loc_sep  := connection.OSisMac;
360	>	Result[0].RawSize := datasize;
361	>	Result[0].LocSep  := not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN);
362		end;
363
364

Diff Legend

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