Changeset 190

Timestamp:

May 7, 2020, 10:33:59 AM (4 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• Direct.pas (modified) (4 diffs)
• Global.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (8 diffs)
• LocalPlayer/TechTree.pas (modified) (7 diffs)
• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/CevoComponents/Directories.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (2 diffs)
• Start.pas (modified) (2 diffs)

trunk/Direct.pas

@@ -129 +129 @@
           ShowModal;
           if ModalResult = mrOK then
-            OpenURL('http://c-evo.org/_sg/contact/cevobug.html');
+            OpenURL(CevoContactBug);
         end
     *)
@@ -218 +218 @@
     Application.MessageBox(PChar(Phrases.Lookup('NOAI')), 'C-evo', 0);
     Close;
-    exit
+    exit;
   end;
   Quick := false;
@@ -244 +244 @@
       begin
         SimpleMessage(Phrases.Lookup('LOADERR'));
-        Close
-      end
-    end
-  end;
-  if not Quick then
-  begin
+        Close;
+      end;
+    end;
+  end;
+  if not Quick then begin
     background.Show;
-    StartDlg.Show
-  end
+    StartDlg.Show;
+  end;
 end;
 
@@ -310 +309 @@
     PaintProgressBar(Canvas, 6, ClientWidth div 2 - 64, 40, State, 128 - State,
       128, MainTexture);
-  end
+  end;
 end;
 

trunk/Global.pas

@@ -7 +7 @@
   CevoMapExt = '.cevo map';
   CevoHomepage = 'http://c-evo.org';
-  CevoHomepageContact = 'http://c-evo.org/_sg/contact';
+  CevoContact = 'http://c-evo.org/_sg/contact';
+  CevoContactBug = 'http://c-evo.org/_sg/contact/cevobug.html';
   AppRegistryKey = '\SOFTWARE\C-evo';
+  AITemplateFileName = 'AI Template' + DirectorySeparator + 'AI development manual.html';
 
 implementation

trunk/LocalPlayer/Help.pas

@@ -1948 +1948 @@
       if Link shr 8 and $3F = hkInternet then
         case Link and $FF of
-          1: OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));
+          1: OpenDocument(HomeDir + AITemplateFileName);
           2: OpenURL(CevoHomepage);
-          3: OpenURL(CevoHomepageContact);
+          3: OpenURL(CevoContact);
         end
       else

trunk/LocalPlayer/MessgEx.pas

@@ -345 +345 @@
         if UnitsInLine > LostUnitsPerLine then
           UnitsInLine := LostUnitsPerLine;
-      end
+      end;
     end;
 end;
@@ -450 +450 @@
   if OpenSound <> '' then
     PostMessage(Handle, WM_PLAYSOUND, 0, 0);
-end; { FormPaint }
+end;
 
 procedure TMessgExDlg.Button1Click(Sender: TObject);
@@ -469 +469 @@
 procedure TMessgExDlg.Button3Click(Sender: TObject);
 begin
-  ModalResult := mrCancel
+  ModalResult := mrCancel;
 end;
 
 procedure TMessgExDlg.RemoveBtnClick(Sender: TObject);
 begin
-  ModalResult := mrNo
+  ModalResult := mrNo;
 end;
 
@@ -485 +485 @@
       ModalResult := mrCancel
     else if Button2.Visible then
-      ModalResult := mrIgnore
+      ModalResult := mrIgnore;
 end;
 
@@ -497 +497 @@
     Kind := mkOk;
     ShowModal;
-  end
+  end;
 end;
 
@@ -522 +522 @@
     Kind := QueryKind;
     ShowModal;
-    result := ModalResult
-  end
+    result := ModalResult;
+  end;
 end;
 
@@ -537 +537 @@
     HelpNo := ContextNo;
     ShowModal;
-  end
+  end;
 end;
 
@@ -552 +552 @@
 end;
 
+
 initialization
 

trunk/LocalPlayer/TechTree.pas

@@ -78 +78 @@
   X, w: Integer;
 begin
-  with Canvas do
-  begin
+  with Canvas do begin
     // black border
     brush.color := $000000;
@@ -120 +119 @@
 procedure TTechTreeDlg.FormShow(Sender: TObject);
 var
-  X, Y, ad, TexWidth, TexHeight: Integer;
+  X, Y, ad: Integer;
   s: string;
-  SrcPixel, DstPixel: TPixelPointer;
-begin
-  if Image = nil then
-  begin
+const
+  TransparentColor = $7F007F;
+begin
+  if Image = nil then begin
     Image := TBitmap.Create;
     Image.PixelFormat := pf24bit;
     LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png', gfNoGamma);
 
-    with Image.Canvas do
-    begin
+    with Image.Canvas do begin
       // write advance names
       Font.Assign(UniFont[ftSmall]);
@@ -147 +145 @@
             TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
-              := $7F007F;
+              := TransparentColor;
           end
         end;
@@ -162 +160 @@
     end;
 
-    // texturize background
-    Image.BeginUpdate;
-    TexWidth := Paper.Width;
-    TexHeight := Paper.Height;
-    DstPixel.Init(Image);
-    SrcPixel.Init(Paper);
-    for Y := 0 to Image.Height - 1 do begin
-      for X := 0 to Image.Width - 1 do begin
-        if (DstPixel.Pixel^.ARGB and $FFFFFF) = $7F007F then begin // transparent
-          SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
-          DstPixel.Pixel^.B := SrcPixel.Pixel^.B;
-          DstPixel.Pixel^.G := SrcPixel.Pixel^.G;
-          DstPixel.Pixel^.R := SrcPixel.Pixel^.R;
-        end;
-        DstPixel.NextPixel;
-      end;
-      DstPixel.NextLine;
-    end;
-    Image.EndUpdate;
+    Texturize(Image, Paper, TransparentColor);
   end;
 
@@ -205 +185 @@
     xDown := X;
     yDown := Y;
-  end
+  end;
 end;
 
@@ -235 +215 @@
 
     SmartInvalidate;
-  end
+  end;
 end;
 
@@ -247 +227 @@
 procedure TTechTreeDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close();
+  Close;
 end;
 

trunk/LocalPlayer/Term.pas

@@ -6857 +6857 @@
   end
   else if Sender = mWebsite then
-    OpenURL('http://c-evo.org')
+    OpenURL(CevoHomepage)
   else if Sender = mRandomMap then
   begin

trunk/Packages/CevoComponents/Directories.pas

@@ -38 +38 @@
   end;
   if Lang = '' then begin
+    T := '';
     LazGetLanguageIDs(Lang, T);
     Lang := Copy(Lang, 1, 2);

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -81 +81 @@
 function SetMainTextureByAge(Age: integer): boolean;
 procedure LoadPhrases;
+procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Integer);
 
 const
@@ -1398 +1399 @@
 end;
 
+procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Integer);
+var
+  SrcPixel, DstPixel: TPixelPointer;
+  X, Y: Integer;
+  TexWidth, TexHeight: Integer;
+begin
+  // texturize background
+  Dest.BeginUpdate;
+  TexWidth := Texture.Width;
+  TexHeight := Texture.Height;
+  DstPixel.Init(Dest);
+  SrcPixel.Init(Texture);
+  for Y := 0 to Dest.Height - 1 do begin
+    for X := 0 to Dest.Width - 1 do begin
+      if (DstPixel.Pixel^.ARGB and $FFFFFF) = TransparentColor then begin
+        SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
+        DstPixel.Pixel^.B := SrcPixel.Pixel^.B;
+        DstPixel.Pixel^.G := SrcPixel.Pixel^.G;
+        DstPixel.Pixel^.R := SrcPixel.Pixel^.R;
+      end;
+      DstPixel.NextPixel;
+    end;
+    DstPixel.NextLine;
+  end;
+  Dest.EndUpdate;
+end;
+
 procedure LoadFonts;
 var

trunk/Start.pas

@@ -446 +446 @@
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
-  if FileExists(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html') then
+  if FileExists(HomeDir + AITemplateFileName) then
     Include(ActionsOffered, maAIDev);
 
@@ -1671 +1671 @@
         DirectHelp(cStartCredits);
       maAIDev:
-        OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));
+        OpenDocument(HomeDir + AITemplateFileName);
       maWeb:
         OpenURL(CevoHomepage);