Changeset 318 for trunk/LocalPlayer/Select.pas

Timestamp:

Mar 19, 2021, 12:32:32 PM (4 years ago)

Author:

chronos

Message:

• Modified: Defined and used more Templates graphic set items.
• Fixed: Incorrect evaluation of nil graphic set references.

File:

• trunk/LocalPlayer/Select.pas (modified) (39 diffs)

trunk/LocalPlayer/Select.pas

@@ -53 +53 @@
     Column: array [0 .. nPl - 1] of integer;
     Closable, MultiPage: boolean;
-    ScienceNationDot: TBitmap;
+    ScienceNationDotBuffer: TBitmap;
     procedure ScrollBarUpdate(Sender: TObject);
     procedure InitLines;
@@ -110 +110 @@
   Layer1Btn.Hint := Phrases.Lookup('BTN_WONDERS');
   Layer2Btn.Hint := Phrases.Lookup('BTN_CLASSES');
-  ScienceNationDot := TBitmap.Create;
-  ScienceNationDot.PixelFormat := pf24bit;
-  ScienceNationDot.SetSize(17, 17);
-  ScienceNationDot.Canvas.FillRect(0, 0, ScienceNationDot.Width, ScienceNationDot.Height);
+  ScienceNationDotBuffer := TBitmap.Create;
+  ScienceNationDotBuffer.PixelFormat := pf24bit;
+  ScienceNationDotBuffer.SetSize(17, 17);
+  ScienceNationDotBuffer.Canvas.FillRect(0, 0, ScienceNationDotBuffer.Width, ScienceNationDotBuffer.Height);
 end;
 
@@ -119 +119 @@
 begin
   FreeAndNil(sb);
-  FreeAndNil(ScienceNationDot);
+  FreeAndNil(ScienceNationDotBuffer);
 end;
 
@@ -817 +817 @@
         LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
           ClientHeight - 29, s);
-        BitBltCanvas(ScienceNationDot.Canvas, 0, 0, 17, 17, Canvas,
-          xScreen - 10, ClientHeight - 27);
-        ImageOp_BCC(ScienceNationDot, Templates.Data, 0, 0, 114, 211, 17, 17,
-          MainTexture.clBevelShade, Tribe[ScienceNation].Color);
-        BitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, 17, 17,
-          ScienceNationDot.Canvas, 0, 0);
-      end;
-    end
+        BitBltCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width,
+          ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27);
+        ImageOp_BCC(ScienceNationDotBuffer, Templates.Data, Point(0, 0),
+          ScienceNationDot.BoundsRect, MainTexture.clBevelShade, Tribe[ScienceNation].Color);
+        BitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
+          ScienceNationDot.Height, ScienceNationDotBuffer.Canvas, 0, 0);
+      end;
+    end;
   end;
 end;
@@ -855 +855 @@
     begin
       CityDlg.FormShow(nil);
-      CityDlg.Invalidate
+      CityDlg.Invalidate;
     end;
-    result := true
+    result := true;
   end
   else
-    result := false
+    result := false;
 end;
 
@@ -881 +881 @@
     begin
       UnitStatDlg.FormShow(nil);
-      UnitStatDlg.Invalidate
+      UnitStatDlg.Invalidate;
     end;
-    result := true
+    result := true;
   end
   else
-    result := false
+    result := false;
 end;
 
@@ -905 +905 @@
       result := lix;
       Closable := true;
-      Close
-    end
+      Close;
+    end;
   end
   else if (ssLeft in Shift) and (ssShift in Shift) then
@@ -949 +949 @@
         kShipPart, kEShipPart:
           ;
-      end
+      end;
   end
   else if ssRight in Shift then
@@ -961 +961 @@
           if RenameModel(lix) then
             SmartUpdateContent;
-      end
-  end
+      end;
+  end;
 end;
 
@@ -991 +991 @@
             swap := code[0, i];
             code[0, i] := code[0, j];
-            code[0, j] := swap
+            code[0, j] := swap;
           end;
   end;
@@ -1006 +1006 @@
           swap := code[0, i];
           code[0, i] := code[0, j];
-          code[0, j] := swap
+          code[0, j] := swap;
         end;
   end;
@@ -1047 +1047 @@
       if (AdvPreq[i, 1] >= 0) then
         MarkPreqs(AdvPreq[i, 1]);
-    end
+    end;
   end;
 
@@ -1060 +1060 @@
   begin
     Lines[i] := 0;
-    FirstShrinkedLine[i] := MaxInt
+    FirstShrinkedLine[i] := MaxInt;
   end;
   case Kind of
@@ -1103 +1103 @@
                     (MyMap[Loc1] and fCanal > 0)) then
                     ok := true;
-                end
+                end;
           end
           else
@@ -1112 +1112 @@
             begin
               code[2, Lines[2]] := i;
-              inc(Lines[2])
+              inc(Lines[2]);
             end;
             if MyModel[i].Status and msAllowConscripts <> 0 then
             begin
               code[2, Lines[2]] := i + cpConscripts;
-              inc(Lines[2])
+              inc(Lines[2]);
             end;
           end;
@@ -1153 +1153 @@
         begin
           code[0, Lines[0]] := adMilitary;
-          inc(Lines[0])
+          inc(Lines[0]);
         end;
       end;
@@ -1270 +1270 @@
             begin
               code[0, Lines[0]] := i;
-              inc(Lines[0])
+              inc(Lines[0]);
             end;
         SortCities;
@@ -1282 +1282 @@
           begin
             code[0, Lines[0]] := i;
-            inc(Lines[0])
+            inc(Lines[0]);
           end;
         SortCities;
-        FirstShrinkedLine[0] := 0
+        FirstShrinkedLine[0] := 0;
       end;
     { kChooseECity:
@@ -1305 +1305 @@
         Lines[0] := MyRO.nModel;
         SortModels;
-        FirstShrinkedLine[0] := 0
+        FirstShrinkedLine[0] := 0;
       end;
     kChooseModel:
@@ -1329 +1329 @@
         begin
           code[0, Lines[0]] := mixAll;
-          inc(Lines[0]);
-        end;
-        FirstShrinkedLine[0] := 0
+          inc(Lines[0]);;
+        end;
+        FirstShrinkedLine[0] := 0;
       end;
     kChooseEModel:
@@ -1349 +1349 @@
           if ModelOk[emix] then
           begin
-            if Tribe[DipMem[me].pContact].ModelPicture
-              [MyRO.EnemyModel[emix].mix].HGr = HGrSystem then
+            if not Assigned(Tribe[DipMem[me].pContact].ModelPicture
+              [MyRO.EnemyModel[emix].mix].HGr) then
               InitEnemyModel(emix);
             code[0, Lines[0]] := emix;
@@ -1362 +1362 @@
           inc(Lines[0]);
         end;
-        FirstShrinkedLine[0] := 0
+        FirstShrinkedLine[0] := 0;
       end;
     kEModels:
@@ -1373 +1373 @@
             (MyRO.EnemyModel[code[1, Lines[0]]].mix = i)) do
             dec(code[1, Lines[0]]);
-          if Tribe[pView].ModelPicture[i].HGr = HGrSystem then
+          if not Assigned(Tribe[pView].ModelPicture[i].HGr) then
             InitEnemyModel(code[1, Lines[0]]);
           code[0, Lines[0]] := i;
@@ -1381 +1381 @@
         end;
         SortModels;
-        FirstShrinkedLine[0] := 0
+        FirstShrinkedLine[0] := 0;
       end;
     kAllEModels:
@@ -1394 +1394 @@
             PPicture := @Tribe[MyRO.EnemyModel[emix].Owner].ModelPicture
               [MyRO.EnemyModel[emix].mix];
-            if PPicture.HGr = HGrSystem then
+            if not Assigned(PPicture.HGr) then
               InitEnemyModel(emix);
             ok := true;
@@ -1409 +1409 @@
                   code[1, j] := 1;
                   ok := false;
-                  Break
+                  Break;
                 end;
               end;
@@ -1418 +1418 @@
               code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix], true);
               inc(Lines[0]);
-            end
+            end;
           end;
         SortModels;
@@ -1427 +1427 @@
       begin
         code[0, Lines[0]] := i;
-        inc(Lines[0])
+        inc(Lines[0]);
       end;
     (* kDeliver:
@@ -1472 +1472 @@
         begin
           code[0, Lines[0]] := i;
-          inc(Lines[0])
+          inc(Lines[0]);
         end;
     kMission:
@@ -1478 +1478 @@
       begin
         code[0, Lines[0]] := i;
-        inc(Lines[0])
+        inc(Lines[0]);
       end;
   end;
@@ -1586 +1586 @@
           TechNameSpace := TechNameSpace + 640 - InnerWidth - 2 * SideFrame;
           InnerWidth := 640 - 2 * SideFrame
-        end
+        end;
       end;
     kAdvance, kFarAdvance:
@@ -1695 +1695 @@
   begin
     ToggleBtn.ButtonIndex := 13;
-    ToggleBtn.Hint := Phrases.Lookup('FARTECH')
+    ToggleBtn.Hint := Phrases.Lookup('FARTECH');
   end
   else if Kind = kCities then
   begin
     ToggleBtn.ButtonIndex := 15;
-    ToggleBtn.Hint := Phrases.Lookup('BTN_PAGE')
+    ToggleBtn.Hint := Phrases.Lookup('BTN_PAGE');
   end
   else
   begin
     ToggleBtn.ButtonIndex := 28;
-    ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT')
+    ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');
   end;
 
@@ -1740 +1740 @@
     ShowNewContent(NewMode, kModels)
   else
-    ShowNewContent(NewMode, kEModels)
+    ShowNewContent(NewMode, kEModels);
 end;
 
@@ -1756 +1756 @@
   sb.Init(Lines[Layer] - 1, DispLines);
   OffscreenPaint;
-  Invalidate
+  Invalidate;
 end;
 
@@ -1768 +1768 @@
   Sel := -2;
   sb.Init(Lines[Layer] - 1, DispLines);
-  SmartUpdateContent
+  SmartUpdateContent;
 end;
 
@@ -1781 +1781 @@
         result := adFar;
         Closable := true;
-        Close
+        Close;
       end;
     kCities, kCityEvents:
@@ -1821 +1821 @@
         Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top +
           ToggleBtn.Height);
-      end
-  end
+      end;
+  end;
 end;
 
@@ -1835 +1835 @@
   // prevent closing
   else
-    inherited
+    inherited;
 end;
 
@@ -1841 +1841 @@
 begin
   if Visible and (Kind = kCities) then
-    SmartUpdateContent
+    SmartUpdateContent;
 end;