Changeset 4 for trunk

Timestamp:

Jan 30, 2016, 12:15:16 AM (9 years ago)

Author:

chronos

Message:

• Added: Not finished class for loading WSA files.

Location:

trunk

Files:

• Dune2.lpi (modified) (2 diffs)
• Dune2.lpr (modified) (1 diff)
• UDecode.pas (added)
• UFormat80.pas (deleted)
• UGame.pas (modified) (4 diffs)
• UShpFile.pas (modified) (2 diffs)
• UWsaFile.pas (added)

trunk/Dune2.lpi

@@ -82 +82 @@
       </Item4>
     </RequiredPackages>
-    <Units Count="10">
+    <Units Count="11">
       <Unit0>
         <Filename Value="Dune2.lpr"/>
@@ -128 +128 @@
       </Unit8>
       <Unit9>
-        <Filename Value="UFormat80.pas"/>
+        <Filename Value="UDecode.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit9>
+      <Unit10>
+        <Filename Value="UWsaFile.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit10>
     </Units>
   </ProjectOptions>

trunk/Dune2.lpr

@@ -9 +9 @@
   Interfaces, // this includes the LCL widgetset
   Forms, UFormMain, UCore, UPakFile, CoolStreaming, Common, TemplateGenerics,
-  UGame, UFile1, UEngFile, UFormLog, UShpFile, UFormat80
+  UGame, UFile1, UEngFile, UFormLog, UShpFile, UDecode
   { you can add units after this };
 

trunk/UGame.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, UFile1, UEngFile, UShpFile, UFormat80, Types;
+  Classes, SysUtils, Graphics, UFile1, UEngFile, UShpFile, UDecode, Types,
+  UWsaFile;
 
 type
@@ -26 +27 @@
     procedure LoadUnits;
     procedure LoadUnitsFile(FileName: string);
+    procedure LoadWsa;
   public
     Bitmap: TBitmap;
@@ -258 +260 @@
   LoadUnitsFile('extracted/DUNE.PAK/PIECES.SHP');
   LoadUnitsFile('extracted/DUNE.PAK/SHAPES.SHP');
-
-end;
-
+end;
+
+procedure TGame.LoadWsa;
+var
+  F: TWsaFile;
+begin
+  F := TWsaFile.Create;
+  F.Open('extracted/DUNE.PAK/WIN1.WSA');
+  F.Free;
+end;
 
 procedure TGame.LoadData;
@@ -269 +278 @@
   //LoadTexts;
   LoadUnits;
+  LoadWSA;
 end;
 

trunk/UShpFile.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs, Graphics, UFormat80, Types;
+  Classes, SysUtils, Contnrs, Graphics, UDecode, Types;
 
 type
@@ -39 +39 @@
 implementation
 
-function Format20(Source: TByteDynArray): TByteDynArray;
-var
-  D: Byte;
-  Count: Integer;
-  SourceIndex: Integer;
-  DestIndex: Integer;
-begin
-  SourceIndex := 0;
-  DestIndex := 0;
-  SetLength(Result, Length(Source));
-  while SourceIndex < Length(Source) do begin
-    D := Source[SourceIndex];
-    Inc(SourceIndex);
-    if D = 0 then begin
-      if SourceIndex >= Length(Source) then
-        Break;
-      Count := Source[SourceIndex];
-      if Count = 0 then Break;
-      Inc(SourceIndex);
-      if (DestIndex + Count) >= Length(Result) then
-        SetLength(Result, DestIndex + Count + 1);
-      FillChar(Result[DestIndex], Count, 0);
-      Inc(DestIndex, Count);
-    end else begin
-      if DestIndex >= Length(Result) then
-        SetLength(Result, DestIndex + 1);
-      Result[DestIndex] := D;
-      Inc(DestIndex);
-    end;
-  end;
-end;
 
 { TShpFileItem }