--- oup/current/FileClasses/TXMP.pas	2007/06/28 09:24:08	232
+++ oup/current/FileClasses/TXMP.pas	2007/07/13 23:15:47	236
@@ -15,95 +15,52 @@ type
 implementation
 
 uses
-  ConnectionManager, Math, Classes, TypeDefs, _DataTypes, ExtCtrls, StdCtrls, 
+  ConnectionManager, Math, Classes, TypeDefs, _DataTypes, ExtCtrls, StdCtrls,
   Controls, Forms;
 
 { TFile_TXMP }
 
 procedure TFile_TXMP.InitDataFields;
-var
-  tempi: Integer;
-  temps: String;
-  templist: TStringList;
 begin
   inherited;
-  FDataFields := TBlock.Create(Self, nil, 0, 'Base', '', nil);
-  templist := TStringList.Create;
+  FDataFields := TBlock.Create(Self, nil, 'Base', '', []);
   with FDataFields do
   begin
-    AddField(TFileID, $00, 'FileID', '', nil);
-
-    AddField(TLevelID, $04, 'LevelID', '', nil);
-
-    tempi := 128;
-    AddField(TString, $08, 'FileName', '', @tempi);
+    AddField(TFileID, 'FileID', '', []);
+    AddField(TLevelID, 'LevelID', '', []);
 
-    templist.Add('MipMapping enabled');
-    templist.Add('unknown');
-    templist.Add('U wrapping disabled');
-    templist.Add('V wrapping disabled');
-    templist.Add('EnvMapped/EnvMap');
-    templist.Add('unused');
-    templist.Add('Play anim back to back');
-    templist.Add('Random anim order + frame time');
-    AddField(TBitSet, $88, 'Flags1', '', @templist);
-
-    templist.Clear;
-    templist.Add('Random anim time offset');
-    templist.Add('High byte as EnvMap');
-    templist.Add('High byte as alpha');
-    templist.Add('Different alpha formula');
-    templist.Add('Data swapping (always set)');
-    templist.Add('used at runtime');
-    templist.Add('TXAN looping on/off');
-    templist.Add('16 bit blue');
-    AddField(TBitSet, $89, 'Flags2', '', @templist);
-
-    templist.Clear;
-    templist.Add('16 bit alpha');
-    templist.Add('16 bit red');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    AddField(TBitSet, $8A, 'Flags3', '', @templist);
-
-    templist.Clear;
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    templist.Add('unknown');
-    AddField(TBitSet, $8B, 'Flags4', '', @templist);
-
-    tempi := 2;
-    AddField(TInt, $8C, 'Width', '', @tempi);
-
-    tempi := 2;
-    AddField(TInt, $8E, 'Height', '', @tempi);
-
-    tempi := 4;
-    AddField(TInt, $90, 'StoreType', '', @tempi);
-
-    temps := '*';
-    AddField(TLinkByID, $94, 'TXAN', '', @temps);
-
-    temps := 'TXMP';
-    AddField(TLinkByID, $98, 'TXMP', '', @temps);
+    AddField(TString, 'FileName', '', [128]);
 
-    AddField(TRawLink, $9C, 'RawLink', '', nil);
-
-    AddField(TRawLink, $A0, 'SepLink', '', nil);
-
-    tempi := $1C;
-    AddField(TUnused, $A4, 'Unused', '', @tempi);
+    AddField(TBitSet, 'Flags1', '',
+        ['MipMapping enabled', 'unknown', 'U wrapping disabled',
+         'V wrapping disabled', 'EnvMapped/EnvMap', 'unused',
+         'Play anim back to back', 'Random anim order + frame time']);
+
+    AddField(TBitSet, 'Flags2', '',
+        ['Random anim time offset', 'High byte as EnvMap', 'High byte as alpha',
+         'Different alpha formula', 'Data swapping (always set)', 'used at runtime',
+         'TXAN looping on/off', '16 bit blue']);
+
+    AddField(TBitSet, 'Flags3', '',
+        ['16 bit alpha', '16 bit red', 'unknown', 'unknown',
+         'unknown', 'unknown', 'unknown', 'unknown']);
+
+    AddField(TBitSet, 'Flags4', '',
+        ['unknown', 'unknown', 'unknown', 'unknown',
+         'unknown', 'unknown', 'unknown', 'unknown']);
+
+    AddField(TInt, 'Width', '', [2]);
+    AddField(TInt, 'Height', '', [2]);
+    AddField(TInt, 'StoreType', '', [4]);
+    AddField(TLinkByID, 'TXAN', '', ['*']);
+    AddField(TLinkByID, 'TXMP', '', ['TXMP']);
+    AddField(TRawLink, 'RawLink', '', []);
+    AddField(TRawLink, 'SepLink', '', []);
+    AddField(TUnused, 'Unused', '', [$1C]);
   end;
-  templist.Free;
+  FDataFields.Update(0, -1);
+  FFileStream.Free;
+  FFileStream := nil;
 end;
 
 
@@ -136,4 +93,3 @@ begin
 end;
 
 end.
-