Changeset 183 for trunk

Timestamp:

May 4, 2020, 10:23:41 PM (5 years ago)

Author:

chronos

Message:

• Modified: Use enumeration for MainAction items.

Location:

trunk

Files:

• Log.pas (modified) (1 diff)
• Start.pas (modified) (11 diffs)
• readme.txt (modified) (1 diff)

trunk/Log.pas

@@ -41 +41 @@
 var
   LogDlg: TLogDlg;
+
 
 implementation

trunk/Start.pas

@@ -8 +8 @@
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
   Menus, Registry, DrawDlg, fgl, Protocol;
-
-const
-  // main actions
-  nMainActions = 5;
-  maConfig = 0;
-  maManual = 1;
-  maCredits = 2;
-  maAIDev = 3;
-  maWeb = 4;
 
 type
@@ -40 +31 @@
   );
 
-  TStartTab = (
-    tbMain,
-    tbMap,
-    tbNew,
-    tbPrevious
-  );
+  TStartTab = (tbMain, tbMap, tbNew, tbPrevious);
+  TMiniMode = (mmNone, mmPicture, mmMultiPlayer);
+  TMainAction = (maConfig, maManual, maCredits, maAIDev, maWeb, maNone);
+  TMainActionSet = set of TMainAction;
 
   TMapArray = array[0 .. lxmax * lymax - 1] of Byte;
@@ -111 +100 @@
     MiniWidth: Integer;
     MiniHeight: Integer;
-    SelectedAction: Integer;
     Page: TStartPage;
     ShowTab: TStartTab;
@@ -131 +119 @@
     // BookDate: string;
     PlayerSlots: TPlayerSlots;
-    MiniMode: (mmNone, mmPicture, mmMultiPlayer);
-    ActionsOffered: set of 0 .. nMainActions - 1;
-    TurnValid, Tracking: boolean;
+    MiniMode: TMiniMode;
+    ActionsOffered: TMainActionSet;
+    SelectedAction: TMainAction;
+    TurnValid: Boolean;
+    Tracking: Boolean;
     DefaultAI: string;
     procedure DrawAction(y, IconIndex: integer; HeaderItem, TextItem: string);
@@ -237 +227 @@
   LoadConfig;
 
-  ActionsOffered := [maManual, maCredits, maWeb];
-  Include(ActionsOffered, maConfig);
+  ActionsOffered := [maConfig, maManual, maCredits, maWeb];
   if FileExists(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html') then
     Include(ActionsOffered, maAIDev);
@@ -511 +500 @@
   s: string;
   Tab2: TStartTab;
+  MainAction: TMainAction;
 begin
   PaintBackground(self, 3, 3, TabOffset + 4 * TabSize - 4, TabHeight - 3);
@@ -600 +590 @@
   if Page = pgMain then
   begin
-    if SelectedAction >= 0 then // mark selected action
+    if SelectedAction >= maNone then // mark selected action
       for i := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
       begin
@@ -607 +597 @@
           w := wBuffer;
         h := ActionPitch;
-        if yAction + SelectedAction * ActionPitch - 8 + h > ClientHeight - ActionBottomBorder
+        if yAction + Integer(SelectedAction) * ActionPitch - 8 + h > ClientHeight - ActionBottomBorder
         then
           h := ClientHeight - ActionBottomBorder -
-            (yAction + SelectedAction * ActionPitch - 8);
+            (yAction + Integer(SelectedAction) * ActionPitch - 8);
         BitBltCanvas(LogoBuffer.Canvas, 0, 0, w, h, Canvas,
-          ActionSideBorder + i * wBuffer, yAction + SelectedAction * ActionPitch
+          ActionSideBorder + i * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
           - 8, SRCCOPY);
         MakeBlue(LogoBuffer, 0, 0, w, h);
         BitBlt(Canvas.Handle, ActionSideBorder + i * wBuffer,
-          yAction + SelectedAction * ActionPitch - 8, w, h,
+          yAction + Integer(SelectedAction) * ActionPitch - 8, w, h,
           LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
       end;
     y := yAction;
-    for i := 0 to nMainActions - 1 do
+    for MainAction := Low(TMainActionSet) to High(TMainActionSet) do
     begin
-      if i in ActionsOffered then
-        case i of
+      if MainAction in ActionsOffered then
+        case MainAction of
           maConfig:
             DrawAction(y, 25, 'ACTIONHEADER_CONFIG', 'ACTION_CONFIG');
@@ -892 +882 @@
   Difficulty[0] := Diff0;
 
-  SelectedAction := -1;
+  SelectedAction := maNone;
   if ShowTab = tbPrevious then
     PreviewMap(StartLandMass); // avoid delay on first TabX change
@@ -1964 +1954 @@
   x, y: integer);
 var
-  OldLoadTurn, NewSelectedAction: Integer;
+  OldLoadTurn: Integer;
+  NewSelectedAction: TMainAction;
 begin
   if Tracking then
@@ -1995 +1986 @@
       (y >= yAction - 8) and (y < ClientHeight - ActionBottomBorder) then
     begin
-      NewSelectedAction := (y - (yAction - 8)) div ActionPitch;
-      if not(NewSelectedAction in ActionsOffered) then
-        NewSelectedAction := -1;
+      NewSelectedAction := TMainAction((y - (yAction - 8)) div ActionPitch);
+      if not (NewSelectedAction in ActionsOffered) then
+        NewSelectedAction := maNone;
     end
     else
-      NewSelectedAction := -1;
+      NewSelectedAction := maNone;
     if NewSelectedAction <> SelectedAction then
     begin
-      if SelectedAction >= 0 then
-        SmartInvalidate(ActionSideBorder, yAction + SelectedAction * ActionPitch
-          - 8, ClientWidth - ActionSideBorder, yAction + (SelectedAction + 1) *
+      if SelectedAction <> maNone then
+        SmartInvalidate(ActionSideBorder, yAction + Integer(SelectedAction) * ActionPitch
+          - 8, ClientWidth - ActionSideBorder, yAction + (Integer(SelectedAction) + 1) *
           ActionPitch - 8);
       SelectedAction := NewSelectedAction;
-      if SelectedAction >= 0 then
-        SmartInvalidate(ActionSideBorder, yAction + SelectedAction * ActionPitch
-          - 8, ClientWidth - ActionSideBorder, yAction + (SelectedAction + 1) *
+      if SelectedAction <> maNone then
+        SmartInvalidate(ActionSideBorder, yAction + Integer(SelectedAction) * ActionPitch
+          - 8, ClientWidth - ActionSideBorder, yAction + (Integer(SelectedAction) + 1) *
           ActionPitch - 8);
     end;

trunk/readme.txt

@@ -1 +1 @@
 C-evo 1.2.0 sources ported to Lazarus/FPC
 
-* Used development environment: Lazarus 1.8.2 (https://www.lazarus-ide.org/)
+* Used development environment: Lazarus 2.0.8 (https://www.lazarus-ide.org/)
 * Supported platforms: Windows and Linux
 * Supported architectures: 32-bit and 64-bit x86