Changeset 3

Timestamp:

Jan 27, 2016, 10:32:48 PM (9 years ago)

Author:

chronos

Message:

• Added: Classes for decoding MAP, CPS, SHP and ENG file formats.

Location:

trunk

Files:

• Dune2.lpi (modified) (6 diffs)
• Dune2.lpr (modified) (2 diffs)
• Forms/UFormLog.lfm (added)
• Forms/UFormLog.pas (added)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (3 diffs)
• Packages/Common (modified) (1 prop)
• Packages/Common/UCommon.pas (modified) (1 diff)
• Packages/CoolStreaming (modified) (1 prop)
• Packages/CoolStreaming/UStreamHelper.pas (modified) (6 diffs)
• Packages/TemplateGenerics (modified) (1 prop)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (4 diffs)
• UEngFile.pas (added)
• UFile1.pas (added)
• UFormat80.pas (added)
• UGame.pas (added)
• UShpFile.pas (added)

trunk/Dune2.lpi

@@ -27 +27 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="Packages/TemplateGenerics"/>
+            <OtherUnitFiles Value="Forms"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
@@ -82 +82 @@
       </Item4>
     </RequiredPackages>
-    <Units Count="4">
+    <Units Count="10">
       <Unit0>
         <Filename Value="Dune2.lpr"/>
@@ -91 +91 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMain"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit1>
@@ -97 +98 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Core"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="DataModule"/>
       </Unit2>
@@ -103 +105 @@
         <IsPartOfProject Value="True"/>
       </Unit3>
+      <Unit4>
+        <Filename Value="UGame.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit4>
+      <Unit5>
+        <Filename Value="UFile1.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit5>
+      <Unit6>
+        <Filename Value="UEngFile.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit6>
+      <Unit7>
+        <Filename Value="Forms/UFormLog.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormLog"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit7>
+      <Unit8>
+        <Filename Value="UShpFile.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit8>
+      <Unit9>
+        <Filename Value="UFormat80.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit9>
     </Units>
   </ProjectOptions>
@@ -117 +145 @@
     <Parsing>
       <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
         <CStyleOperator Value="False"/>
         <IncludeAssertionCode Value="True"/>

trunk/Dune2.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UCore, UPakFile, CoolStreaming, Common, TemplateGenerics
+  Forms, UFormMain, UCore, UPakFile, CoolStreaming, Common, TemplateGenerics,
+  UGame, UFile1, UEngFile, UFormLog, UShpFile, UFormat80
   { you can add units after this };
 
@@ -18 +19 @@
   Application.CreateForm(TCore, Core);
   Application.CreateForm(TFormMain, FormMain);
+  Application.CreateForm(TFormLog, FormLog);
   Application.Run;
 end.

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 578
-  Height = 646
-  Top = 309
-  Width = 985
+  Left = 333
+  Height = 1074
+  Top = 151
+  Width = 1420
   Caption = 'Dune 2'
-  ClientHeight = 646
-  ClientWidth = 985
+  ClientHeight = 1074
+  ClientWidth = 1420
   OnActivate = FormActivate
+  OnKeyPress = FormKeyPress
   LCLVersion = '1.7'
+  WindowState = wsMaximized
   object PaintBox1: TPaintBox
     Left = 0
-    Height = 646
+    Height = 1074
     Top = 0
-    Width = 985
+    Width = 1420
     Align = alClient
     OnClick = PaintBox1Click
+    OnPaint = PaintBox1Paint
   end
 end

trunk/Forms/UFormMain.pas

@@ -16 +16 @@
     PaintBox1: TPaintBox;
     procedure FormActivate(Sender: TObject);
+    procedure FormKeyPress(Sender: TObject; var Key: char);
     procedure PaintBox1Click(Sender: TObject);
+    procedure PaintBox1Paint(Sender: TObject);
   private
     Initialized: Boolean;
@@ -40 +42 @@
 end;
 
+procedure TFormMain.PaintBox1Paint(Sender: TObject);
+begin
+  Core.Game.Paint(PaintBox1.Canvas);
+end;
+
 procedure TFormMain.FormActivate(Sender: TObject);
 begin
@@ -45 +52 @@
     Initialized := True;
     Core.Init;
+  end;
+end;
+
+procedure TFormMain.FormKeyPress(Sender: TObject; var Key: char);
+begin
+  Caption := IntToStr(Ord(Key));
+  if Key = #63 then begin
+    Inc(Core.Game.IW);
+    core.Game.LoadData;
+    PaintBox1.Repaint;
+  end;
+  if Key = #41 then begin
+    Dec(Core.Game.IW);
+    core.Game.LoadData;
+    PaintBox1.Repaint;
   end;
 end;

trunk/Packages/Common/UCommon.pas

@@ -12 +12 @@
 type
   TArrayOfByte = array of Byte;
+  TArrayOfInteger = array of Integer;
+  TArrayOfWord = array of Word;
   TArrayOfString = array of string;
   TExceptionEvent = procedure(Sender: TObject; E: Exception) of object;

trunk/Packages/CoolStreaming/UStreamHelper.pas

@@ -114 +114 @@
   Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Cardinal));
-  if SwapData then Result := Swap(Result);
+  if SwapData then Result := SwapEndian(Result);
 end;
 
@@ -121 +121 @@
   Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Int64));
-  if SwapData then Result := Swap(Result);
+  if SwapData then Result := SwapEndian(Result);
 end;
 
@@ -298 +298 @@
   Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Word));
-  if SwapData then Result := Swap(Result);
+  if SwapData then Result := SwapEndian(Result);
 end;
 
@@ -358 +358 @@
 procedure TStreamHelper.WriteCardinal(Data: Cardinal);
 begin
-  if SwapData then Data := Swap(Data);
+  if SwapData then Data := SwapEndian(Data);
   Write(Data, SizeOf(Cardinal));
 end;
@@ -364 +364 @@
 procedure TStreamHelper.WriteInt64(Data: Int64);
 begin
-  if SwapData then Data := Swap(Data);
+  if SwapData then Data := SwapEndian(Data);
   Write(Data, SizeOf(Int64));
 end;
@@ -415 +415 @@
 procedure TStreamHelper.WriteWord(Data: Word);
 begin
-  if SwapData then Data := Swap(Data);
+  if SwapData then Data := SwapEndian(Data);
   Write(Data, SizeOf(Word));
 end;

trunk/UCore.lfm

@@ -1 +1 @@
 object Core: TCore
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   OldCreateOrder = False
   Height = 349
-  HorizontalOffset = 629
-  VerticalOffset = 266
+  HorizontalOffset = 1692
+  VerticalOffset = 323
   Width = 364
 end

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, UPakFile, UFindFile;
+  Classes, SysUtils, FileUtil, UPakFile, UFindFile, UGame;
 
 type
@@ -14 +14 @@
   TCore = class(TDataModule)
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     procedure ExtractPakFiles;
   public
+    Game: TGame;
     procedure Init;
   end;
@@ -34 +36 @@
 procedure TCore.DataModuleCreate(Sender: TObject);
 begin
+  Game := TGame.Create;
+end;
 
+procedure TCore.DataModuleDestroy(Sender: TObject);
+begin
+  FreeAndNil(Game);
 end;
 
@@ -60 +67 @@
 begin
   // ExtractPakFiles
+  Game.IW := $20;
+  Game.LoadData;
 end;