Changeset 303 for branches/highdpi/LocalPlayer/CityScreen.pas

Timestamp:

Mar 9, 2021, 9:19:49 AM (3 years ago)

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

• branches/highdpi/LocalPlayer/CityScreen.pas (modified) (6 diffs)

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -216 +216 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png',
+    [gfNoGamma]);
   CityMapTemplate := TDpiBitmap.Create;
   CityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
+  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png',
+    [gfNoGamma]);
   SmallCityMapTemplate := TDpiBitmap.Create;
   SmallCityMapTemplate.PixelFormat := pf24bit;
   LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap.png',
-    gfNoGamma);
+    [gfNoGamma]);
   SmallCityMap := TDpiBitmap.Create;
   SmallCityMap.PixelFormat := pf24bit;
@@ -1397 +1399 @@
 
 procedure TCityDlg.ChooseProject;
-const
-  ptSelect = 0;
-  ptTrGoods = 1;
-  ptUn = 2;
-  ptCaravan = 3;
-  ptImp = 4;
-  ptWonder = 6;
-  ptShip = 7;
-  ptInvalid = 8;
-
-  function ProjectType(Project: integer): integer;
+type
+  TProjectType = (
+    ptSelect = 0,
+    ptTrGoods = 1,
+    ptUn = 2,
+    ptCaravan = 3,
+    ptImp = 4,
+    ptWonder = 6,
+    ptShip = 7,
+    ptInvalid = 8
+  );
+
+  function ProjectType(Project: integer): TProjectType;
   begin
     if Project and cpCompleted <> 0 then
-      result := ptSelect
+      Result := ptSelect
     else if Project and (cpImp + cpIndex) = cpImp + imTrGoods then
-      result := ptTrGoods
-    else if Project and cpImp = 0 then
+      Result := ptTrGoods
+    else if Project and cpImp = 0 then begin
       if MyModel[Project and cpIndex].Kind = mkCaravan then
-        result := ptCaravan
-      else
-        result := ptUn
+        Result := ptCaravan
+      else Result := ptUn;
+    end
     else if Project and cpIndex >= nImp then
-      result := ptInvalid
+      Result := ptInvalid
     else if Imp[Project and cpIndex].Kind = ikWonder then
-      result := ptWonder
+      Result := ptWonder
     else if Imp[Project and cpIndex].Kind = ikShipPart then
-      result := ptShip
-    else
-      result := ptImp
+      Result := ptShip
+    else
+      Result := ptImp;
   end;
 
 var
-  NewProject, OldMoney, pt0, pt1, cix1: integer;
+  NewProject, OldMoney, cix1: integer;
+  pt0, pt1: TProjectType;
   QueryOk: boolean;
 begin
-  assert(not supervising);
+  Assert(not supervising);
   ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
   if ModalSelectDlg.result <> -1 then
@@ -1444 +1449 @@
     else
     begin
-      NewProject := ModalSelectDlg.result;
-      QueryOk := true;
+      NewProject := ModalSelectDlg.Result;
+      QueryOk := True;
       if (NewProject and cpImp <> 0) and (NewProject and cpIndex >= 28) and
         (MyRO.NatBuilt[NewProject and cpIndex] > 0) then
@@ -1453 +1458 @@
           while (cix1 >= 0) and
             (MyCity[cix1].Built[NewProject and cpIndex] = 0) do
-            dec(cix1);
+            Dec(cix1);
           MessgText := Format(Phrases.Lookup('DOUBLESTATEIMP'),
             [Phrases.Lookup('IMPROVEMENTS', NewProject and cpIndex),
@@ -1465 +1470 @@
         end;
       if not QueryOk then
-        exit;
+        Exit;
 
       if (MyCity[cix].Prod > 0) then
@@ -1476 +1481 @@
             (cpImp or cpIndex) then
           begin // loss of material -- do query
+            DpiApplication.ProcessMessages; // TODO: Needed for Gtk2, Lazarus gtk2 bug?
             if (pt1 = ptTrGoods) or (pt1 = ptShip) or (pt1 <> pt0) and
-              (pt0 <> ptCaravan) then
+              (pt0 <> ptCaravan) then begin
               QueryOk := SimpleQuery(mkOkCancel,
                 Format(Phrases.Lookup('LOSEMAT'), [MyCity[cix].Prod0,
                 MyCity[cix].Prod0]), 'MSG_DEFAULT') = mrOK
-            else if MyCity[cix].Project and (cpImp or cpIndex) = MyCity[cix]
-              .Project0 and (cpImp or cpIndex) then
-              QueryOk := SimpleQuery(mkOkCancel, Phrases.Lookup('LOSEMAT3'),
-                'MSG_DEFAULT') = mrOK
+            end else
+            if MyCity[cix].Project and (cpImp or cpIndex) = MyCity[cix]
+              .Project0 and (cpImp or cpIndex) then begin
+                QueryOk := SimpleQuery(mkOkCancel, Phrases.Lookup('LOSEMAT3'),
+                  'MSG_DEFAULT') = mrOK;
+            end;
           end;
         end;
       end;
       if not QueryOk then
-        exit;
+        Exit;
 
       OldMoney := MyRO.Money;