Changeset 124 for oup/current

Timestamp:

Mar 23, 2007, 4:07:58 AM (18 years ago)

Author:

alloc

Message:

 

Location:

oup/current

Files:

• FileClasses (added)
• FileClasses/_DataTypes.pas (added)
• FileClasses/_FileTypes.pas (added)
• Global/OniImgClass.pas (modified) (2 diffs)
• Global/RawList.pas (modified) (3 diffs)
• Global/TypeDefs.pas (modified) (1 diff)
• _exe/OniUnPacker.exe (modified) ( previous)

oup/current/Global/OniImgClass.pas

@@ -590 +590 @@
   x, y: Word;
   bpp:  Byte;
-begin
+  minside: Byte;
+begin
+  minside := 1;
   case Self.FStoreType of
     9:
-      bpp := 8;
+    begin
+      bpp := 4;
+      minside := 4;
+    end;
     0, 1, 2:
       bpp := 16;
@@ -612 +617 @@
       y    := y div 2;
       size := size + (x * y * bpp) div 8;
-    until (x = 1) or (y = 1);
+    until (x = minside) or (y = minside);
   end;
   Result := size;

oup/current/Global/RawList.pas

@@ -314 +314 @@
   mipmap:    Byte;
   bpp:       Byte;
+  minside:   Byte;
 begin
   ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(mipmap), @mipmap);
@@ -323 +324 @@
 
 
+  minside := 1;
   case storetype of
     0, 1, 2:
       bpp := 16;
-//      datasize := x * y * 2;
     8:
       bpp := 32;
-//      datasize := x * y * 4;
     9:
+    begin
       bpp := 4;
-//      datasize := x * y div 2;
+      minside := 4;
+    end;
   end;
 
@@ -342 +344 @@
       y    := y div 2;
       datasize := datasize + (x * y * bpp) div 8;
-    until (x = 1) or (y = 1);
+    until (x = minside) or (y = minside);
   end;
 

oup/current/Global/TypeDefs.pas

@@ -115 +115 @@
   end;
 
+
   TLinkByName = record
       SrcOffset: Integer;