Index: oup/current/Code/DataStructures.pas
===================================================================
--- oup/current/Code/DataStructures.pas	(revision 90)
+++ oup/current/Code/DataStructures.pas	(revision 92)
@@ -136,5 +136,5 @@
       connection.LoadDatFilePart(fileid, $20 + i * 4, 4, @link);
       Result[i].raw_addr := link;
-      Result[i].raw_size := 0{????????????????????????????????};
+      Result[i].raw_size := 32;
       Result[i].loc_sep  := False;
     end;
@@ -198,5 +198,5 @@
   Result[0].raw_addr   := link;
   Result[0].raw_size   := datasize;
-  Result[0].loc_sep    := OniDataConnection.OSisMac;
+  Result[0].loc_sep    := connection.OSisMac;
 end;
 
@@ -245,5 +245,5 @@
     TOniDataDat(connection).LoadRawOffset(False,
       baselink, lastlink + 1024, Data);
-    //      OniDataConnection.LoadRawFile(fileid,$1C,baselink,lastlink+1024,False,@data[0]);
+    //      connection.LoadRawFile(fileid,$1C,baselink,lastlink+1024,False,@data[0]);
     k := 0;
     for j := 0 to 1024 do
@@ -595,5 +595,5 @@
 begin
   Raws := '';
-  //  InsertRawListHandler('AGDB',True,AGDB);
+  InsertRawListHandler('AGDB',False,AGDB);
   InsertRawListHandler('AKVA', True, AKVA);
   InsertRawListHandler('BINA', True, BINA);
Index: oup/current/Code/OniDataClass.pas
===================================================================
--- oup/current/Code/OniDataClass.pas	(revision 90)
+++ oup/current/Code/OniDataClass.pas	(revision 92)
@@ -136,12 +136,5 @@
   end;
 
-  TOniDataEmpty = class(TOniData)
-  private
-  protected
-  public
-    constructor Create(OLDBFilename: String; var Result: Boolean); override;
-    procedure Close; override;
-  published
-  end;
+
 
 const
@@ -151,9 +144,8 @@
 
 var
-//  OniDataConnection: TOniData;
   DataConnections: array of TOniData;
-  OniDataConnection: TOniData;
 
 function CreateDataConnection(filename: String; backend: Integer): TOniData;
+function ConnectionExists(filename: String): TOniData;
 procedure CloseDataConnection(connection: TOniData);
 function GetEmptyFileInfo: TFileInfo;
@@ -213,14 +205,17 @@
   Result.raw_addr := 0;
   Result.raw_size := 0;
-  for i := 0 to High(raw_list) do
-  begin
-    if raw_list[i].src_offset = dat_offset then
-    begin
-      Result.src_id     := fileid;
-      Result.src_offset := raw_list[i].src_offset;
-      Result.raw_addr   := raw_list[i].raw_addr;
-      Result.raw_size   := raw_list[i].raw_size;
-      Result.loc_sep    := raw_list[i].loc_sep;
-      Break;
+  if Length(raw_list) > 0 then
+  begin
+    for i := 0 to High(raw_list) do
+    begin
+      if raw_list[i].src_offset = dat_offset then
+      begin
+        Result.src_id     := fileid;
+        Result.src_offset := raw_list[i].src_offset;
+        Result.raw_addr   := raw_list[i].raw_addr;
+        Result.raw_size   := raw_list[i].raw_size;
+        Result.loc_sep    := raw_list[i].loc_sep;
+        Break;
+      end;
     end;
   end;
@@ -1466,4 +1461,17 @@
 
 
+function ConnectionExists(filename: String): TOniData;
+var
+  i: Integer;
+begin
+  Result := nil;
+  if Length(DataConnections) > 0 then
+    for i := 0 to High(DataConnections) do
+      if DataConnections[i].FFileName = filename then
+      begin
+        Result := DataConnections[i];
+        Exit;
+      end;
+end;
 
 
@@ -1513,18 +1521,3 @@
 
 
-
-
-constructor TOniDataEmpty.Create(OLDBFilename: String; var Result: Boolean);
-var
-  i, j:  Byte;
-  temps: String;
-begin
-  ShowMessage('OLD');
-end;
-
-procedure TOniDataEmpty.Close;
-begin
-  ShowMessage('OLD');
-end;
-
 end.
Index: oup/current/Code/OniImgClass.pas
===================================================================
--- oup/current/Code/OniImgClass.pas	(revision 90)
+++ oup/current/Code/OniImgClass.pas	(revision 92)
@@ -439,5 +439,5 @@
       txmpimg.DataType  := [DT_Decoded32];
       txmpimg.Depth     := 32;
-      txmpimg.WriteToBMP('D:\' + IntToStr(i) + '.bmp');
+      txmpimg.WriteToBMP('M:\' + IntToStr(i) + '.bmp');
     end;
   end;