Changeset 295

Timestamp:

Mar 8, 2021, 4:24:21 PM (4 years ago)

Author:

chronos

Message:

• Modified: LoadGraphicFile options changed to set type.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (31 diffs)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (9 diffs)
• Start.pas (modified) (2 diffs)

trunk/LocalPlayer/CityScreen.pas

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

trunk/LocalPlayer/Draft.pas

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

trunk/LocalPlayer/NatStat.pas

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

trunk/LocalPlayer/TechTree.pas

@@ -137 +137 @@
     Image := TBitmap.Create;
     Image.PixelFormat := pf24bit;
-    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png', gfNoGamma);
+    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png',
+      [gfNoGamma]);
 
     with Image.Canvas do begin

trunk/LocalPlayer/Term.pas

@@ -1123 +1123 @@
       if UnitStatDlg.Visible then
         UnitStatDlg.Close;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1151 +1151 @@
       if UnitStatDlg.Visible then
         UnitStatDlg.Close;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1175 +1175 @@
         UnFocus := -1;
         PaintLoc(Loc0);
-      end
+      end;
     end;
     UnFocus := uix;
@@ -1220 +1220 @@
     MovieSpeed3Btn.Visible := false;
     MovieSpeed4Btn.Visible := false;
-  end
+  end;
 end;
 
@@ -1249 +1249 @@
     begin
       FreeAndNil(AILogo[p]);
-    end
+    end;
   end
   else
@@ -1255 +1255 @@
     if AILogo[p] = nil then
       AILogo[p] := TBitmap.Create;
-    if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', gfNoError) then
+    if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', [gfNoError]) then
     begin
       FreeAndNil(AILogo[p]);
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1294 +1294 @@
       MapValid := false;
       PaintAllMaps;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1463 +1463 @@
       if DelphiRandom(CountBest) = 0 then
         result := j
-    end
+    end;
   end;
 end;
@@ -1521 +1521 @@
           IconKind := mikShip;
           IconIndex := Ship2Owner;
-        end
+        end;
     end;
 
@@ -1534 +1534 @@
           MostCost := TestCost;
           IconIndex := imShipComp + i
-        end
+        end;
       end;
     end;
@@ -1617 +1617 @@
   sb := TPVScrollbar.Create(Self);
   sb.OnUpdate := ScrollBarUpdate;
-end; { InitModule }
+end;
 
 procedure TMainScreen.InitTurn(NewPlayer: integer);
@@ -2235 +2235 @@
                     Flags and CityRepMask);
                   UpdatePanel := true;
-                end
+                end;
               end
               else { if mRepList.Checked then }
@@ -2241 +2241 @@
                 if Flags and CityRepMask <> 0 then
                   ShowCityList := true
-              end
-            end
+              end;
+            end;
           end; { city loop }
   end; // ClientMode=cTurn
@@ -2261 +2261 @@
           Play('REVOLUTION');
           Server(sRevolution, me, 0, nil^);
-        end
+        end;
       end;
   end; // ClientMode=cTurn
@@ -2380 +2380 @@
                 else
                   Status := Status and not usWaiting;
-            end
+            end;
           end;
   end; // ClientMode=cTurn
@@ -2478 +2478 @@
               opAllModel:
                 s := s + 'All models';
-            end
+            end;
           end;
           LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
@@ -2486 +2486 @@
           s := s + '--- ACCEPTED! ---';
           LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
-        end
+        end;
       end;
 
@@ -2842 +2842 @@
           // this break will ensure speed of fast forward does not depend on cpu speed
           Application.ProcessMessages;
-        end
+        end;
       end;
 
@@ -2921 +2921 @@
               DipCall(scReject);
               EndNego
-            end
-          end
+            end;
+          end;
         end;
       end;
@@ -7170 +7170 @@
             SetTroopLoc(Loc);
             PanelPaint
-          end
+          end;
         end
       else if Sender = mSelectTransport then
@@ -7189 +7189 @@
     begin
       HaveCities := true;
-      Break
+      Break;
     end;
   if Popup = GamePopup then
@@ -7289 +7289 @@
             m.Checked := true;
           mDebugMap.Add(m);
-        end
+        end;
     end;
     mSmallTiles.Checked := xxt = 33;
@@ -7473 +7473 @@
   begin
     SetTroopLoc(-1);
-    PanelPaint
+    PanelPaint;
   end
   else
@@ -7492 +7492 @@
       SetTroopLoc(-1);
       PanelPaint
-    end
-  end
+    end;
+  end;
 end;
 
@@ -7541 +7541 @@
         2 + G.ly);
       Update;
-    end
+    end;
   end
   else
@@ -7557 +7557 @@
     MiniPaint;
     PanelPaint;
-  end
+  end;
 end;
 
@@ -7609 +7609 @@
 begin
   result := (y >= TopBarHeight + MapHeight) or (y >= ClientHeight - PanelHeight)
-    and ((x < xMidPanel) or (x >= xRightPanel))
+    and ((x < xMidPanel) or (x >= xRightPanel));
 end;
 
@@ -7626 +7626 @@
           GamePopup.Popup(Left + 4, Top + GetSystemMetrics(SM_CYCAPTION) + 4 +
             TopBarHeight - 1);
-      end
+      end;
     end
     else if IsPanelPixel(x, y) then
@@ -7789 +7789 @@
       CityRepMask := CityRepMask or (1 shl (Tag shr 8))
     else
-      CityRepMask := CityRepMask and not(1 shl (Tag shr 8))
-  end
+      CityRepMask := CityRepMask and not(1 shl (Tag shr 8));
+  end;
 end;
 
@@ -7837 +7837 @@
       else if Flag = tfAllTechs then
         TellNewModels
-    end
-  end
+    end;
+  end;
 end;
 
@@ -7908 +7908 @@
       GamePopup.Popup(Left + 4, Top + GetSystemMetrics(SM_CYCAPTION) + 4 +
         TopBarHeight - 1);
-    exit
-  end // windows menu button calls game menu
+    exit;
+  end; // windows menu button calls game menu
 end;
 

trunk/LocalPlayer/UnitStat.pas

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

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -16 +16 @@
     clPage, clCover: TColor;
   end;
+  TLoadGraphicFileOption = (gfNoError, gfNoGamma);
+  TLoadGraphicFileOptions = set of TLoadGraphicFileOption;
+
 
 {$IFDEF WINDOWS}
@@ -28 +31 @@
 procedure EditFrame(ca: TCanvas; p: TRect; const T: TTexture);
 function HexStringToColor(S: string): integer;
-function LoadGraphicFile(bmp: TBitmap; Path: string; Options: integer = 0): boolean;
+function LoadGraphicFile(bmp: TBitmap; Path: string; Options: TLoadGraphicFileOptions = []): boolean;
 function LoadGraphicSet(const Name: string): integer;
 procedure Dump(dst: TBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
@@ -160 +163 @@
   cliWater = 4;
 
-  // LoadGraphicFile options
-  gfNoError = $01;
-  gfNoGamma = $02;
-
 type
   TGrExtDescr = record { don't use dynamic strings here! }
@@ -417 +416 @@
 end;
 
-function LoadGraphicFile(bmp: TBitmap; Path: string; Options: Integer): Boolean;
+function LoadGraphicFile(bmp: TBitmap; Path: string; Options: TLoadGraphicFileOptions = []): Boolean;
 var
   jtex: TJpegImage;
@@ -434 +433 @@
     if Result then
     begin
-      if Options and gfNoGamma = 0 then
+      if not (gfNoGamma in Options) then
         bmp.PixelFormat := pf24bit;
       Bmp.SetSize(jtex.Width, jtex.Height);
@@ -452 +451 @@
     if Result then
     begin
-      if Options and gfNoGamma = 0 then
+      if not (gfNoGamma in Options) then
         bmp.PixelFormat := pf24bit;
       bmp.SetSize(Png.Width, Png.Height);
@@ -474 +473 @@
     end;
     if Result then begin
-      if Options and gfNoGamma = 0 then
+      if not (gfNoGamma in Options) then
         bmp.PixelFormat := pf24bit;
     end;
@@ -482 +481 @@
 
   if not Result then begin
-    if Options and gfNoError = 0 then
+    if not (gfNoError in Options) then
       raise Exception.Create(Format(Phrases.Lookup('FILENOTFOUND'), [Path]));
   end;
 
-  if (Options and gfNoGamma = 0) and (Gamma <> 100) then
+  if (not (gfNoGamma in Options)) and (Gamma <> 100) then
     ApplyGammaToBitmap(Bmp);
 end;
@@ -1675 +1674 @@
   LoadFonts;
   LoadGraphicFile(Templates, GetGraphicsDir + DirectorySeparator +
-    'Templates.png', gfNoGamma);
+    'Templates.png', [gfNoGamma]);
   LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');

trunk/Start.pas

@@ -298 +298 @@
   ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + '.png';
   Mode := mmPicture;
-  if LoadGraphicFile(Bitmap, ImageFileName, gfNoError) then
+  if LoadGraphicFile(Bitmap, ImageFileName, [gfNoError]) then
   begin
     if Bitmap.width div 2 > MaxWidthMapLogo then
@@ -677 +677 @@
   with AIBrains[I] do begin
     if not LoadGraphicFile(AIBrains[i].Picture, GetAiDir + DirectorySeparator +
-      FileName + DirectorySeparator + FileName + '.png', gfNoError) then begin
+      FileName + DirectorySeparator + FileName + '.png', [gfNoError]) then begin
       with AIBrains[i].Picture.Canvas do begin
         Brush.Color := $904830;