Changeset 53

Timestamp:

Jan 11, 2017, 11:45:22 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Correctly show normal help page with text content.
• Fixed: Correctly show watermark image in help.

Location:

trunk

Files:

• Direct.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (24 diffs)
• LocalPlayer/Term.pas (modified) (1 diff)
• Start.pas (modified) (2 diffs)

trunk/Direct.pas

@@ -128 +128 @@
           ShowModal;
           if ModalResult = mrOK then
-            OpenURL('http://c-evo.org/_sg/contact/cevobug.html');{ *Převedeno z ShellExecute* }
+            OpenURL('http://c-evo.org/_sg/contact/cevobug.html');
         end
     *)

trunk/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, StringTables,
-
+  Protocol, ScreenTools, BaseWin, StringTables, Math,
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-  ExtCtrls, ButtonB, PVSB, ButtonBase, Types;
+  ExtCtrls, ButtonB, PVSB, Types;
 
 const
@@ -44 +43 @@
     procedure AddLine(s: String = ''; Format: integer = 0; Picpix: integer = 0;
       LinkCategory: integer = 0; LinkIndex: integer = 0);
-    procedure AddText(Const S : String); override;
     procedure LF;
     destructor Destroy; override;
@@ -128 +126 @@
 end;
 
-procedure THyperText.AddText(const S: String);
-begin
-  AddLine(S);
-end;
-
 procedure THyperText.LF;
 begin
@@ -381 +374 @@
   ySrc := (iix div 7 + 1) * ySizeBig;
   for y := 0 to ySizeBig * 2 - 1 do
-    if (y0 + y >= 0) and (y0 + y < InnerHeight) then
-    begin
+    if ((y0 + y) >= 0) and ((y0 + y) < InnerHeight) then begin
       PaintPtr.Init(OffScreen, 0, y0 + y);
       CoalPtr.Init(Templates, 0, yCoal + y);
       for dy := -1 to 1 do
-        if ((y + dy) shr 1 >= 0) and ((y + dy) shr 1 < ySizeBig) then
-          ImpPtr[dy].Init(BigImp, 0, ySrc + (y + dy) shr 1);
-      for x := 0 to xSizeBig * 2 - 1 do
-      begin
+        if ((Max(y + dy, 0) shr 1) >= 0) and ((Max(y + dy, 0) shr 1) < ySizeBig) then
+          ImpPtr[dy].Init(BigImp, 0, ySrc + (Max(y + dy, 0) shr 1));
+      for x := 0 to xSizeBig * 2 - 1 do begin
         sum := 0;
-        for dx := -1 to 1 do
-        begin
-          xx := xSrc + (x + dx) shr 1;
-          ImpPtr[dy].SetX(xx);
-          for dy := -1 to 1 do
+        for dx := -1 to 1 do begin
+          xx := xSrc + Max((x + dx), 0) shr 1;
+          for dy := -1 to 1 do begin
+            ImpPtr[dy].SetX(xx);
             if ((y + dy) shr 1 < 0) or ((y + dy) shr 1 >= ySizeBig) or
               ((x + dx) shr 1 < 0) or ((x + dx) shr 1 >= xSizeBig) or
@@ -405 +395 @@
               sum := sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
                 ImpPtr[dy].Pixel^.R;
+          end;
         end;
-        if sum < maxsum then
-        begin // no saturation
+        if sum < maxsum then begin // no saturation
           CoalPtr.SetX(xCoal + x);
           sum := 1 shl 22 - (maxsum - sum) * (256 - CoalPtr.Pixel^.B * 2);
@@ -447 +437 @@
   HelpLineInfo: THelpLineInfo;
 begin
+  MainText.SaveToFile('MainText.txt');
   inherited;
   CaptionColor := Colors.Canvas.Pixels[clkMisc, cliPaperCaption];
@@ -465 +456 @@
           BitBlt(Handle, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas.Handle,
             0, 0, SRCCOPY);
-        end
+        end;
       end;
     for i := -2 to InnerHeight div 24 do
@@ -916 +907 @@
   end;
 
-  procedure AddText(s: string);
+  procedure AddTextual(s: string);
   var
     i, p, l, ofs, CurrentFormat, FollowFormat, Picpix, LinkCategory, LinkIndex,
@@ -1077 +1068 @@
   procedure AddItem(Item: string);
   begin
-    AddText(HelpText.Lookup(Item));
+    AddTextual(HelpText.Lookup(Item));
   end;
 
@@ -1107 +1098 @@
       s := HelpText.LookupByHandle(hSPECIALMODEL, i);
       if (s <> '') and (s <> '*') then
-        AddText(s);
+        AddTextual(s);
       if SpecialModelPreq[i] >= 0 then
         AddPreqAdv(SpecialModelPreq[i])
@@ -1139 +1130 @@
         AddLine('', pkTerImp, i);
         AddLine;
-        AddText(HelpText.LookupByHandle(hJOBHELP, i));
+        AddTextual(HelpText.LookupByHandle(hJOBHELP, i));
         JobCost := -1;
         case JobHelp[i] of
@@ -1150 +1141 @@
         end;
         if JobCost >= 0 then
-          AddText(Format(HelpText.Lookup('JOBCOST'),
+          AddTextual(Format(HelpText.Lookup('JOBCOST'),
             [MovementToString(JobCost)]))
         else
-          AddText(HelpText.Lookup('JOBCOSTVAR'));
+          AddTextual(HelpText.Lookup('JOBCOSTVAR'));
         if JobPreq[JobHelp[i]] <> preNone then
         begin
@@ -1241 +1232 @@
     case Kind of
       hkText:
-        AddText(HelpText.LookupByHandle(no));
+        AddTextual(HelpText.LookupByHandle(no));
       hkMisc:
         begin
@@ -1300 +1291 @@
                 NextSection('CRED_CAPAI');
                 Server(sGetAICredits, 0, 0, ps);
-                AddText(ps);
+                AddTextual(ps);
                 NextSection('CRED_CAPLANG');
                 AddItem('AUTHOR');
@@ -1325 +1316 @@
                     AddLine('', pkBigIcon, i + 6);
                   LF;
-                  AddText(HelpText.LookupByHandle(hGOVHELP, i mod nGov));
+                  AddTextual(HelpText.LookupByHandle(hGOVHELP, i mod nGov));
                   if i mod nGov >= 2 then
                   begin
@@ -1342 +1333 @@
               begin
                 Caption := HelpText.Lookup('HELPTITLE_SEARCHRESULTS');
-                AddText(Format(HelpText.Lookup('MATCHES'), [SearchContent]));
+                AddTextual(Format(HelpText.Lookup('MATCHES'), [SearchContent]));
                 MainText.AddStrings(SearchResult);
               end
@@ -1458 +1449 @@
           s := HelpText.LookupByHandle(hADVHELP, no);
           if s <> '*' then
-            AddText(s);
+            AddTextual(s);
           NextSection('SEEALSO');
           CheckSeeAlso := true
@@ -1521 +1512 @@
           begin
             NextSection('EFFECT');
-            AddText(HelpText.LookupByHandle(hIMPHELP, no));
+            AddTextual(HelpText.LookupByHandle(hIMPHELP, no));
           end;
           if no = woSun then
@@ -1533 +1524 @@
             LF;
             if Imp[no].Expiration >= 0 then
-              AddText(Phrases2.Lookup('HELP_WONDERMORALE1'))
+              AddTextual(Phrases2.Lookup('HELP_WONDERMORALE1'))
             else
-              AddText(Phrases2.Lookup('HELP_WONDERMORALE2'));
+              AddTextual(Phrases2.Lookup('HELP_WONDERMORALE2'));
           end;
           if Imp[no].Preq <> preNone then
@@ -1582 +1573 @@
             if no = woPyramids then
               s := s + ' ' + HelpText.Lookup('EXPSLAVE');
-            AddText(s);
+            AddTextual(s);
           end;
           NextSection('SEEALSO');
@@ -1648 +1639 @@
             begin
               LF;
-              AddText(HelpText.Lookup('DEADLANDS'));
+              AddTextual(HelpText.Lookup('DEADLANDS'));
             end;
             if (TerrType = fDesert) and (no <> fDesert + 12) then
             begin
               LF;
-              AddText(Format(HelpText.Lookup('HOSTILE'), [DesertThurst]));
+              AddTextual(Format(HelpText.Lookup('HOSTILE'), [DesertThurst]));
             end;
             if TerrType = fArctic then
             begin
               LF;
-              AddText(Format(HelpText.Lookup('HOSTILE'), [ArcticThurst]));
+              AddTextual(Format(HelpText.Lookup('HOSTILE'), [ArcticThurst]));
             end;
             if (no < 3 * 12) and (TransTerrain >= 0) then
@@ -1724 +1715 @@
             begin
               LF;
-              AddText(HelpText.Lookup('RARE'));
+              AddTextual(HelpText.Lookup('RARE'));
             end;
             if (no < 3 * 12) and (TerrType in [fDesert, fArctic]) then
@@ -1786 +1777 @@
             AddLine(HelpText.Lookup('HELPSPEC_FEATURE'));
           NextSection('EFFECT');
-          AddText(HelpText.LookupByHandle(hFEATUREHELP, no));
+          AddTextual(HelpText.LookupByHandle(hFEATUREHELP, no));
           if (Feature[no].Weight <> 0) or (Feature[no].Cost <> 0) then
           begin
@@ -1920 +1911 @@
       if Link shr 8 and $3F = hkInternet then
         case Link and $FF of
-          1:
-             OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));{ *Převedeno z ShellExecute* }
-          2:
-            OpenURL('http://c-evo.org');{ *Převedeno z ShellExecute* }
-          3:
-            OpenURL('http://c-evo.org/_sg/contact');{ *Převedeno z ShellExecute* }
+          1: OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));
+          2: OpenURL('http://c-evo.org');
+          3: OpenURL('http://c-evo.org/_sg/contact');
         end
       else

trunk/LocalPlayer/Term.pas

@@ -6860 +6860 @@
   end
   else if Sender = mWebsite then
-    OpenURL('http://c-evo.org') { *Převedeno z ShellExecute* }
+    OpenURL('http://c-evo.org')
   else if Sender = mRandomMap then
   begin

trunk/Start.pas

@@ -1565 +1565 @@
       maConfig:
         begin
-           OpenDocument(pchar(HomeDir + 'Configurator.exe'));{ *Převedeno z ShellExecute* }
+           OpenDocument(pchar(HomeDir + 'Configurator.exe'));
           Close
         end;
@@ -1573 +1573 @@
         DirectHelp(cStartCredits);
       maAIDev:
-         OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));{ *Převedeno z ShellExecute* }
+         OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));
       maWeb:
-        OpenURL('http://c-evo.org'){ *Převedeno z ShellExecute* }
+        OpenURL('http://c-evo.org')
     end;
   end