Changeset 189 for trunk/LocalPlayer

Timestamp:

May 7, 2020, 12:46:55 AM (5 years ago)

Author:

chronos

Message:

• Added: New Global unit with global constants.
• Modified: Multiple occurence of string constants used for subdirectories replaced by functions.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (1 diff)
• Draft.pas (modified) (1 diff)
• Help.pas (modified) (5 diffs)
• IsoEngine.pas (modified) (1 diff)
• NatStat.pas (modified) (1 diff)
• Term.pas (modified) (5 diffs)
• UnitStat.pas (modified) (1 diff)

trunk/LocalPlayer/CityScreen.pas

@@ -216 +216 @@
   Template := TBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'City.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png', gfNoGamma);
   CityMapTemplate := TBitmap.Create;
   CityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
+  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
   SmallCityMapTemplate := TBitmap.Create;
   SmallCityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'SmallCityMap.png',
+  LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap.png',
     gfNoGamma);
   SmallCityMap := TBitmap.Create;

trunk/LocalPlayer/Draft.pas

@@ -92 +92 @@
   Template := TBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png', gfNoGamma);
 end;
 

trunk/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, StringTables, Math,
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-  ExtCtrls, ButtonB, PVSB, Types, fgl;
+  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
+  LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
+  ButtonB, PVSB, Types, fgl;
 
 const
@@ -123 +123 @@
   HelpDlg: THelpDlg;
 
+
 implementation
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer, Global;
 
 {$R *.lfm}
@@ -1229 +1230 @@
     List := TStringList.Create;
     Plus := TStringList.Create;
-    if FindFirst(HomeDir + 'Graphics' + DirectorySeparator + '*.credits.txt', $27, sr) = 0 then
+    if FindFirst(GetGraphicsDir + DirectorySeparator + '*.credits.txt', $27, sr) = 0 then
       repeat
-        Plus.LoadFromFile(HomeDir + 'Graphics' + DirectorySeparator + sr.Name);
+        Plus.LoadFromFile(GetGraphicsDir + DirectorySeparator + sr.Name);
         List.AddStrings(Plus);
       until FindNext(sr) <> 0;
@@ -1262 +1263 @@
   begin
     List := TStringList.Create;
-    List.LoadFromFile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.credits.txt');
+    List.LoadFromFile(GetSoundsDir + DirectorySeparator + 'sound.credits.txt');
     for i := 0 to List.Count - 1 do begin
       s := List[i];
@@ -1948 +1949 @@
         case Link and $FF of
           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');
+          2: OpenURL(CevoHomepage);
+          3: OpenURL(CevoHomepageContact);
         end
       else

trunk/LocalPlayer/IsoEngine.pas

@@ -620 +620 @@
       if Flags and unFortified <> 0 then
       begin
-        { DataDC:=GrExt[HGrTerrain].Data.Canvas.Handle;
-          MaskDC:=GrExt[HGrTerrain].Mask.Canvas.Handle;
+        { DataCanvas:=GrExt[HGrTerrain].Data.Canvas;
+          MaskCanvas:=GrExt[HGrTerrain].Mask.Canvas;
           TSprite(x,y+16,12*9+7); }
         Sprite(HGrStdUnits, x, y, xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);

trunk/LocalPlayer/NatStat.pas

@@ -93 +93 @@
   Template := TBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Nation.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation.png', gfNoGamma);
 end;
 

trunk/LocalPlayer/Term.pas

@@ -273 +273 @@
     procedure RectInvalidate(Left, Top, Rigth, Bottom: integer);
     procedure SmartRectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure LoadSettings;
     procedure SaveSettings;
     procedure OnScroll(var m: TMessage); message WM_VSCROLL;
@@ -467 +468 @@
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
   UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer, Sound,
-  Battle, Rates, TechTree, Registry;
+  Battle, Rates, TechTree, Registry, Global;
 
 {$R *.lfm}
@@ -3407 +3408 @@
 procedure TMainScreen.FormCreate(Sender: TObject);
 var
-  DefaultOptionChecked: integer;
-  Reg: TRegistry;
   i, j: integer;
 begin
@@ -3437 +3436 @@
   SaveOption[20] := mAlFastMoves.Tag;
   SaveOption[21] := mAlNoMoves.Tag;
-  DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
-    1 shl 18 + 1 shl 19;
-
-  Reg := TRegistry.Create;
-  with Reg do
-  try
-    OpenKey(AppRegistryKey, false);
-    if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2
-      else xxt := 48;
-    if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2
-      else yyt := 24;
-    if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
-      else OptionChecked := DefaultOptionChecked;
-    if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
-      else MapOptionChecked := 1 shl moCityNames;
-    if ValueExists('CityReport') then CityRepMask := Cardinal(ReadInteger('CityReport'))
-      else CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
-          not chCaptured);
-    if OptionChecked and (7 shl 16) = 0 then
-      OptionChecked := OptionChecked or (1 shl 16);
-      // old regver with no scrolling
-  finally
-    Free;
-  end;
-
-  if 1 shl 13 and OptionChecked <> 0 then
-    SoundMode := smOff
-  else if 1 shl 15 and OptionChecked <> 0 then
-    SoundMode := smOnAlt
-  else
-    SoundMode := smOn;
+
+  LoadSettings;
 
   Screen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
@@ -7777 +7747 @@
 end;
 
+procedure TMainScreen.LoadSettings;
+var
+  Reg: TRegistry;
+  DefaultOptionChecked: Integer;
+begin
+  DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
+    1 shl 18 + 1 shl 19;
+  Reg := TRegistry.Create;
+  with Reg do try
+    OpenKey(AppRegistryKey, False);
+    if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2
+      else xxt := 48;
+    if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2
+      else yyt := 24;
+    if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
+      else OptionChecked := DefaultOptionChecked;
+    if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
+      else MapOptionChecked := 1 shl moCityNames;
+    if ValueExists('CityReport') then CityRepMask := Cardinal(ReadInteger('CityReport'))
+      else CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
+          not chCaptured);
+    if OptionChecked and (7 shl 16) = 0 then
+      OptionChecked := OptionChecked or (1 shl 16);
+      // old regver with no scrolling
+  finally
+    Free;
+  end;
+
+  if 1 shl 13 and OptionChecked <> 0 then
+    SoundMode := smOff
+  else if 1 shl 15 and OptionChecked <> 0 then
+    SoundMode := smOnAlt
+  else
+    SoundMode := smOn;
+end;
+
 procedure TMainScreen.mRepClicked(Sender: TObject);
 begin

trunk/LocalPlayer/UnitStat.pas

@@ -83 +83 @@
   Template := TBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Unit.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit.png', gfNoGamma);
 end;