Changeset 358 for trunk

Timestamp:

Apr 9, 2021, 9:51:17 AM (3 years ago)

Author:

chronos

Message:

• Modified: Message kinds and message icons kinds changed to enumeration type.
• Modified: Code cleanup.

Location:

trunk

Files:

• LocalPlayer/Help.pas (modified) (12 diffs)
• LocalPlayer/LocalPlayer.pas (modified) (2 diffs)
• LocalPlayer/MessgEx.pas (modified) (6 diffs)
• Messg.pas (modified) (2 diffs)

trunk/LocalPlayer/Help.pas

@@ -1248 +1248 @@
           MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
             [MainText[Count - 1]]);
-        end
+        end;
       end;
-    end
+    end;
   end;
 
@@ -1422 +1422 @@
                     LineFeed;
                     LineFeed;
-                  end
-                end
+                  end;
+                end;
               end;
             miscSearchResult:
@@ -1642 +1642 @@
                 NextSection('REPLACE');
                 AddItem('REPLACETEXT');
-                j := 1
+                j := 1;
               end;
               AddImprovement(ImpReplacement[i].OldImp);
@@ -1676 +1676 @@
             AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
               hkMisc + hkCrossLink, miscJobList);
-          CheckSeeAlso := true
+          CheckSeeAlso := true;
         end;
 
@@ -1696 +1696 @@
           begin
             TerrType := fDesert;
-            TerrSubType := 0
+            TerrSubType := 0;
           end;
           with Terrain[TerrType] do
@@ -1766 +1766 @@
                   [Phrases.Lookup('TERRAIN', fGrass + 12)]), pkTer, fGrass + 12,
                   hkTer + hkCrossLink, fGrass + 12);
-              end
+              end;
             end;
             NextSection('SPECIAL');
@@ -1778 +1778 @@
                 AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + Special), pkTer,
                   3 * 12 + Special);
-              end
+              end;
             end
             else if (no < 12) and (no <> fGrass) and (no <> fOcean) then
@@ -1814 +1814 @@
               AddImprovement(woGardens);
               CheckSeeAlso := true
-            end
-          end
+            end;
+          end;
         end;
 
@@ -1882 +1882 @@
                 AddLine(Format(HelpText.Lookup('WEIGHT'), ['+2']),
                   pkDomain, dGround);
-            end
+            end;
           end;
           if Feature[no].Preq <> preNone then
@@ -1969 +1969 @@
       Line(Canvas, Sel0, False);
     if Sel <> -1 then
-      Line(Canvas, Sel, True)
-  end
+      Line(Canvas, Sel, True);
+  end;
 end;
 
@@ -1992 +1992 @@
         else
           ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
-      end
+      end;
 end;
 
@@ -2036 +2036 @@
 function THelpDlg.TextIndex(Item: string): Integer;
 begin
-  Result := HelpText.Gethandle(Item)
+  Result := HelpText.Gethandle(Item);
 end;
 

trunk/LocalPlayer/LocalPlayer.pas

@@ -5 +5 @@
 
 procedure Client(Command, Player: integer; var Data); stdcall;
-
 procedure SetAIName(p: integer; Name: string);
 
@@ -12 +11 @@
 uses
   Term, CityScreen, Draft, MessgEx, Select, CityType, Help, UnitStat, Diagram,
-  NatStat, Wonders, Nego, Enhance, BaseWin, Battle, Rates, TechTree,
-
-  Forms;
+  NatStat, Wonders, Nego, Enhance, BaseWin, Battle, Rates, TechTree, Forms;
 
 var

trunk/LocalPlayer/MessgEx.pas

@@ -10 +10 @@
 
 type
+  TMessageIconKind = (mikNone, mikImp, mikModel, mikTribe, mikBook, mikAge,
+    mikPureIcon, mikMyArmy, mikEnemyArmy, mikFullControl, mikShip, mikBigIcon,
+    mikEnemyShipComplete);
+
   TMessgExDlg = class(TBaseMessgDlg)
     Button1: TButtonA;
@@ -26 +30 @@
     procedure RemoveBtnClick(Sender: TObject);
   public
-    Kind, IconKind, IconIndex, HelpKind, HelpNo, CenterTo: integer;
+    Kind: TMessageKind;
+    IconIndex: Integer;
+    HelpKind: Integer;
+    HelpNo: Integer;
+    CenterTo: Integer;
+    IconKind: TMessageIconKind;
     OpenSound: string;
     function ShowModal: integer; override;
@@ -38 +47 @@
   end;
 
-const
-  // extra message kinds
-  mkYesNoCancel = 4;
-  mkOkCancelRemove = 5;
-  mkOkHelp = 6;
-  mkModel = 7;
-
-  // message icon kinds
-  mikNone = -1;
-  mikImp = 0;
-  mikModel = 1;
-  mikTribe = 2;
-  mikBook = 3;
-  mikAge = 4;
-  mikPureIcon = 5;
-  mikMyArmy = 6;
-  mikEnemyArmy = 7;
-  mikFullControl = 8;
-  mikShip = 9;
-  mikBigIcon = 10;
-  mikEnemyShipComplete = 11;
-
 var
   MessgExDlg: TMessgExDlg;
@@ -65 +52 @@
 procedure SoundMessageEx(SimpleText, SoundItem: string);
 procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
-function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string)
+function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
   : integer;
 procedure ContextMessage(SimpleText, SoundItem: string;
@@ -199 +186 @@
 function TMessgExDlg.ShowModal: integer;
 var
-  Ticks0, Ticks: TDateTime;
+  Ticks0: TDateTime;
+  Ticks: TDateTime;
 begin
   if GameMode = cMovie then
@@ -516 +504 @@
 end;
 
-function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string)
+function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
   : integer;
 begin

trunk/Messg.pas

@@ -12 +12 @@
 
 type
+  TMessageKind = (mkOK, mkOKCancel, mkYesNo, mkYesNoCancel, mkOkCancelRemove,
+    mkOkHelp, mkModel);
+
   TMessgDlg = class(TBaseMessgDlg)
     Button1: TButtonA;
@@ -22 +25 @@
     procedure FormKeyPress(Sender: TObject; var Key: char);
   public
-    Kind: integer;
+    Kind: TMessageKind;
     OpenSound: string;
   private
     procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   end;
-
-const
-  // message kinds
-  mkOK = 1;
-  mkOKCancel = 2;
-  mkYesNo = 3;
 
 var