Changeset 189 for trunk/Packages/CevoComponents

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/Packages/CevoComponents

Files:

• Directories.pas (modified) (4 diffs)
• DrawDlg.pas (modified) (1 diff)
• ScreenTools.pas (modified) (8 diffs)
• Sound.pas (modified) (2 diffs)

trunk/Packages/CevoComponents/Directories.pas

@@ -10 +10 @@
 
 function LocalizedFilePath(const Path: string): string;
-procedure InitUnit;
+procedure UnitInit;
 function GetSavedDir(Home: Boolean = False): string;
 function GetMapsDir(Home: Boolean = False): string;
+function GetGraphicsDir: string;
+function GetSoundsDir: string;
 
 
@@ -30 +32 @@
 
   if Lang = '' then begin
-      for i := 1 to Paramcount - 1 do
-        if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
-          (ParamStrUTF8(i) = '--lang') then
+    for i := 1 to Paramcount - 1 do
+      if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
+        (ParamStrUTF8(i) = '--lang') then
           Lang := ParamStrUTF8(i + 1);
   end;
@@ -59 +61 @@
 end;
 
-procedure InitUnit;
+procedure UnitInit;
 var
   AppDataDir: string;
@@ -113 +115 @@
 end;
 
+function GetGraphicsDir: string;
+begin
+  Result := HomeDir + 'Graphics';
+end;
+
+function GetSoundsDir: string;
+begin
+  Result := HomeDir + 'Sounds';
+end;
+
 end.

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -176 +176 @@
   // ButtonDownSound, ButtonUpSound: string;
 begin
-  // ButtonDownSound:=Sounds.Lookup('BUTTON_DOWN');
-  // ButtonUpSound:=Sounds.Lookup('BUTTON_UP');
+  // ButtonDownSound := Sounds.Lookup('BUTTON_DOWN');
+  // ButtonUpSound := Sounds.Lookup('BUTTON_UP');
   for cix := 0 to ComponentCount - 1 do
     if Components[cix] is TButtonBase then
     begin
       TButtonBase(Components[cix]).Graphic := GrExt[HGrSystem].Data;
-      // if ButtonDownSound<>'*' then
-      // DownSound:=HomeDir+'Sounds' + DirectorySeparator + ButtonDownSound + '.wav';
-      // if ButtonUpSound<>'*' then
-      // UpSound:=HomeDir+'Sounds' + DirectorySeparator + ButtonUpSound + '.wav';
+      // if ButtonDownSound <> '*' then
+      // DownSound := GetSoundsDir + DirectorySeparator + ButtonDownSound + '.wav';
+      // if ButtonUpSound <> '*' then
+      // UpSound := GetSoundsDir + DirectorySeparator + ButtonUpSound + '.wav';
       if Components[cix] is TButtonA then
         TButtonA(Components[cix]).Font := UniFont[ftButton];

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -188 +188 @@
 
   UniFont: array [TFontType] of TFont;
-  AppRegistryKey: string = '\SOFTWARE\C-evo';
+  Gamma: Integer; // global gamma correction (cent)
 
 procedure UnitInit;
 procedure UnitDone;
+procedure InitGammaLookupTable;
+
 
 implementation
@@ -204 +206 @@
   {$ENDIF}
 
-  Gamma: Integer; // global gamma correction (cent)
-  GammaLookupTable: array [0 .. 255] of Byte;
+  GammaLookupTable: array [0..255] of Byte;
 
 {$IFDEF WINDOWS}
@@ -468 +469 @@
     Source := TBitmap.Create;
     Source.PixelFormat := pf24bit;
-    FileName := HomeDir + 'Graphics' + DirectorySeparator + Name;
+    FileName := GetGraphicsDir + DirectorySeparator + Name;
     if not LoadGraphicFile(Source, FileName) then begin
       Result := -1;
@@ -1352 +1353 @@
     with MainTexture do begin
       MainTextureAge := Age;
-      LoadGraphicFile(Image, HomeDir + 'Graphics' + DirectorySeparator +
+      LoadGraphicFile(Image, GetGraphicsDir + DirectorySeparator +
         'Texture' + IntToStr(Age + 1) + '.jpg');
       clBevelLight := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelLight];
@@ -1391 +1392 @@
 
   if Sounds = nil then Sounds := TStringTable.Create;
-  if not Sounds.LoadFromFile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.txt') then
+  if not Sounds.LoadFromFile(GetSoundsDir + DirectorySeparator + 'sound.txt') then
   begin
     FreeAndNil(Sounds);
@@ -1470 +1471 @@
 
 procedure UnitInit;
-var
-  Reg: TRegistry;
-begin
-  Reg := TRegistry.Create;
-  with Reg do
-    try
-      OpenKey(AppRegistryKey, True);
-      if ValueExists('Gamma') then
-        Gamma := ReadInteger('Gamma')
-      else
-      begin
-        Gamma := 100;
-        WriteInteger('Gamma', Gamma);
-      end;
-      if ValueExists('Locale') then
-        LocaleCode := ReadString('Locale')
-      else
-        LocaleCode := '';
-    finally
-      Free;
-    end;
-
-  if Gamma <> 100 then InitGammaLookupTable;
+begin
+  Gamma := 100;
+  InitGammaLookupTable;
 
   {$IFDEF WINDOWS}
@@ -1512 +1493 @@
   Templates := TBitmap.Create;
   Templates.PixelFormat := pf24bit;
-  LoadGraphicFile(Templates, HomeDir + 'Graphics' + DirectorySeparator +
+  LoadGraphicFile(Templates, GetGraphicsDir + DirectorySeparator +
     'Templates.png', gfNoGamma);
   Colors := TBitmap.Create;
   Colors.PixelFormat := pf24bit;
-  LoadGraphicFile(Colors, HomeDir + 'Graphics' + DirectorySeparator + 'Colors.png');
+  LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   Paper := TBitmap.Create;
   Paper.PixelFormat := pf24bit;
-  LoadGraphicFile(Paper, HomeDir + 'Graphics' + DirectorySeparator + 'Paper.jpg');
+  LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
   BigImp := TBitmap.Create;
   BigImp.PixelFormat := pf24bit;
-  LoadGraphicFile(BigImp, HomeDir + 'Graphics' + DirectorySeparator + 'Icons.png');
+  LoadGraphicFile(BigImp, GetGraphicsDir + DirectorySeparator + 'Icons.png');
   MainTexture.Image := TBitmap.Create;
   MainTextureAge := -2;
@@ -1532 +1513 @@
 procedure UnitDone;
 var
-  Reg: TRegistry;
   I: integer;
 begin
-  Reg := TRegistry.Create;
-  with Reg do
-    try
-      OpenKey(AppRegistryKey, True);
-      WriteString('Locale', LocaleCode);
-      WriteInteger('Gamma', Gamma);
-      if FullScreen then WriteInteger('ScreenMode', 1)
-        else WriteInteger('ScreenMode', 0);
-    finally
-      Free;
-    end;
-
   RestoreResolution;
   for I := 0 to nGrExt - 1 do begin

trunk/Packages/CevoComponents/Sound.pas

@@ -290 +290 @@
   Result := (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*');
   if Result then
-    // SndPlaySound(pchar(HomeDir+'Sounds' +DirectorySeparator+WavFileName+'.wav'),SND_ASYNC)
-    PlaySound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
+    // SndPlaySound(pchar(GetSoundsDir + DirectorySeparator + WavFileName + '.wav'), SND_ASYNC)
+    PlaySound(GetSoundsDir + DirectorySeparator + WavFileName);
 {$ENDIF}
 end;
@@ -307 +307 @@
   Assert(WavFileName[1] <> '[');
   if (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*') then
-    PrepareSound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
+    PrepareSound(GetSoundsDir + DirectorySeparator + WavFileName);
 {$ENDIF}
 end;