Changeset 318
- Timestamp:
- Mar 19, 2021, 12:32:32 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Graphics/Templates.grs
r316 r318 30 30 <Height>36</Height> 31 31 </Item> 32 <Item> 33 <Name>LinkArrows</Name> 34 <Left>1</Left> 35 <Top>400</Top> 36 <Width>91</Width> 37 <Height>25</Height> 38 </Item> 39 <Item> 40 <Name>ScienceNationDot</Name> 41 <Left>114</Left> 42 <Top>211</Top> 43 <Width>17</Width> 44 <Height>17</Height> 45 </Item> 46 <Item> 47 <Name>Research</Name> 48 <Left>145</Left> 49 <Top>75</Top> 50 <Width>36</Width> 51 <Height>36</Height> 52 </Item> 53 <Item> 54 <Name>Change</Name> 55 <Left>124</Left> 56 <Top>1</Top> 57 <Width>14</Width> 58 <Height>14</Height> 59 </Item> 60 <Item> 61 <Name>Treasury</Name> 62 <Left>145</Left> 63 <Top>1</Top> 64 <Width>36</Width> 65 <Height>36</Height> 66 </Item> 67 <Item> 68 <Name>StarshipDeparted</Name> 69 <Left>1</Left> 70 <Top>279</Top> 71 <Width>140</Width> 72 <Height>120</Height> 73 </Item> 74 <Item> 75 <Name>WeightOff</Name> 76 <Left>105</Left> 77 <Top>400</Top> 78 <Width>18</Width> 79 <Height>20</Height> 80 </Item> 81 <Item> 82 <Name>WeightOn</Name> 83 <Left>123</Left> 84 <Top>400</Top> 85 <Width>18</Width> 86 <Height>20</Height> 87 </Item> 32 88 </Items> 33 89 </GraphicSet> -
trunk/LocalPlayer/CityScreen.pas
r313 r318 1052 1052 (integer(MyRO.EnemyModel[emix].mix) <> c.Project and cpIndex)) do 1053 1053 dec(emix); 1054 if Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr = HGrSystemthen1054 if not Assigned(Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr) then 1055 1055 InitEnemyModel(emix); 1056 1056 end; -
trunk/LocalPlayer/Draft.pas
r315 r318 300 300 for i := 0 to MaxWeight - 1 do 301 301 if i < Weight then 302 ImageOp_BCC(offscreen, Templates.Data, xWeight + 20 * i, yWeight, 123, 400,303 18, 20, 0, $949494)302 ImageOp_BCC(offscreen, Templates.Data, Point(xWeight + 20 * i, yWeight), 303 WeightOn.BoundsRect, 0, $949494) 304 304 else 305 ImageOp_BCC(offscreen, Templates.Data, xWeight + 20 * i, yWeight, 105, 400,306 18, 20, 0, $949494);305 ImageOp_BCC(offscreen, Templates.Data, Point(xWeight + 20 * i, yWeight), 306 WeightOff.BoundsRect, 0, $949494); 307 307 end; 308 308 -
trunk/LocalPlayer/Help.pas
r315 r318 637 637 ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24, 638 638 8 + 36 + x0[i], 2 + 20 + i * 24, $000000, $000000); 639 Dump(OffScreen, HGrSystem, 639 Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20, 640 640 75 + HelpLineInfo.Picpix * 37, 295); 641 641 x0[i] := x0[i] + (8 + 8 + 36); -
trunk/LocalPlayer/IsoEngine.pas
r315 r318 587 587 else 588 588 mixShow := mix; 589 if ( Tribe[Owner].ModelPicture[mixShow].HGr = HGrSystem) and589 if (not Assigned(Tribe[Owner].ModelPicture[mixShow].HGr)) and 590 590 (@OnInitEnemyModel <> nil) then 591 591 if not OnInitEnemyModel(emix) then -
trunk/LocalPlayer/MessgEx.pas
r316 r318 436 436 BitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas, 437 437 (ClientWidth - 140) div 2, 24); 438 ImageOp_BCC(Buffer, Templates.Data, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);438 ImageOp_BCC(Buffer, Templates.Data, Point(0, 0), StarshipDeparted.BoundsRect, 0, $FFFFFF); 439 439 BitBltCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120, 440 440 Buffer.Canvas, 0, 0); -
trunk/LocalPlayer/Select.pas
r315 r318 53 53 Column: array [0 .. nPl - 1] of integer; 54 54 Closable, MultiPage: boolean; 55 ScienceNationDot : TBitmap;55 ScienceNationDotBuffer: TBitmap; 56 56 procedure ScrollBarUpdate(Sender: TObject); 57 57 procedure InitLines; … … 110 110 Layer1Btn.Hint := Phrases.Lookup('BTN_WONDERS'); 111 111 Layer2Btn.Hint := Phrases.Lookup('BTN_CLASSES'); 112 ScienceNationDot := TBitmap.Create;113 ScienceNationDot .PixelFormat := pf24bit;114 ScienceNationDot .SetSize(17, 17);115 ScienceNationDot .Canvas.FillRect(0, 0, ScienceNationDot.Width, ScienceNationDot.Height);112 ScienceNationDotBuffer := TBitmap.Create; 113 ScienceNationDotBuffer.PixelFormat := pf24bit; 114 ScienceNationDotBuffer.SetSize(17, 17); 115 ScienceNationDotBuffer.Canvas.FillRect(0, 0, ScienceNationDotBuffer.Width, ScienceNationDotBuffer.Height); 116 116 end; 117 117 … … 119 119 begin 120 120 FreeAndNil(sb); 121 FreeAndNil(ScienceNationDot );121 FreeAndNil(ScienceNationDotBuffer); 122 122 end; 123 123 … … 817 817 LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10, 818 818 ClientHeight - 29, s); 819 BitBltCanvas(ScienceNationDot .Canvas, 0, 0, 17, 17, Canvas,820 xScreen - 10, ClientHeight - 27);821 ImageOp_BCC(ScienceNationDot , Templates.Data, 0, 0, 114, 211, 17, 17,822 MainTexture.clBevelShade, Tribe[ScienceNation].Color);823 BitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, 17, 17,824 ScienceNationDot. Canvas, 0, 0);825 end; 826 end 819 BitBltCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width, 820 ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27); 821 ImageOp_BCC(ScienceNationDotBuffer, Templates.Data, Point(0, 0), 822 ScienceNationDot.BoundsRect, MainTexture.clBevelShade, Tribe[ScienceNation].Color); 823 BitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width, 824 ScienceNationDot.Height, ScienceNationDotBuffer.Canvas, 0, 0); 825 end; 826 end; 827 827 end; 828 828 end; … … 855 855 begin 856 856 CityDlg.FormShow(nil); 857 CityDlg.Invalidate 857 CityDlg.Invalidate; 858 858 end; 859 result := true 859 result := true; 860 860 end 861 861 else 862 result := false 862 result := false; 863 863 end; 864 864 … … 881 881 begin 882 882 UnitStatDlg.FormShow(nil); 883 UnitStatDlg.Invalidate 883 UnitStatDlg.Invalidate; 884 884 end; 885 result := true 885 result := true; 886 886 end 887 887 else 888 result := false 888 result := false; 889 889 end; 890 890 … … 905 905 result := lix; 906 906 Closable := true; 907 Close 908 end 907 Close; 908 end; 909 909 end 910 910 else if (ssLeft in Shift) and (ssShift in Shift) then … … 949 949 kShipPart, kEShipPart: 950 950 ; 951 end 951 end; 952 952 end 953 953 else if ssRight in Shift then … … 961 961 if RenameModel(lix) then 962 962 SmartUpdateContent; 963 end 964 end 963 end; 964 end; 965 965 end; 966 966 … … 991 991 swap := code[0, i]; 992 992 code[0, i] := code[0, j]; 993 code[0, j] := swap 993 code[0, j] := swap; 994 994 end; 995 995 end; … … 1006 1006 swap := code[0, i]; 1007 1007 code[0, i] := code[0, j]; 1008 code[0, j] := swap 1008 code[0, j] := swap; 1009 1009 end; 1010 1010 end; … … 1047 1047 if (AdvPreq[i, 1] >= 0) then 1048 1048 MarkPreqs(AdvPreq[i, 1]); 1049 end 1049 end; 1050 1050 end; 1051 1051 … … 1060 1060 begin 1061 1061 Lines[i] := 0; 1062 FirstShrinkedLine[i] := MaxInt 1062 FirstShrinkedLine[i] := MaxInt; 1063 1063 end; 1064 1064 case Kind of … … 1103 1103 (MyMap[Loc1] and fCanal > 0)) then 1104 1104 ok := true; 1105 end 1105 end; 1106 1106 end 1107 1107 else … … 1112 1112 begin 1113 1113 code[2, Lines[2]] := i; 1114 inc(Lines[2]) 1114 inc(Lines[2]); 1115 1115 end; 1116 1116 if MyModel[i].Status and msAllowConscripts <> 0 then 1117 1117 begin 1118 1118 code[2, Lines[2]] := i + cpConscripts; 1119 inc(Lines[2]) 1119 inc(Lines[2]); 1120 1120 end; 1121 1121 end; … … 1153 1153 begin 1154 1154 code[0, Lines[0]] := adMilitary; 1155 inc(Lines[0]) 1155 inc(Lines[0]); 1156 1156 end; 1157 1157 end; … … 1270 1270 begin 1271 1271 code[0, Lines[0]] := i; 1272 inc(Lines[0]) 1272 inc(Lines[0]); 1273 1273 end; 1274 1274 SortCities; … … 1282 1282 begin 1283 1283 code[0, Lines[0]] := i; 1284 inc(Lines[0]) 1284 inc(Lines[0]); 1285 1285 end; 1286 1286 SortCities; 1287 FirstShrinkedLine[0] := 0 1287 FirstShrinkedLine[0] := 0; 1288 1288 end; 1289 1289 { kChooseECity: … … 1305 1305 Lines[0] := MyRO.nModel; 1306 1306 SortModels; 1307 FirstShrinkedLine[0] := 0 1307 FirstShrinkedLine[0] := 0; 1308 1308 end; 1309 1309 kChooseModel: … … 1329 1329 begin 1330 1330 code[0, Lines[0]] := mixAll; 1331 inc(Lines[0]); 1332 end; 1333 FirstShrinkedLine[0] := 0 1331 inc(Lines[0]);; 1332 end; 1333 FirstShrinkedLine[0] := 0; 1334 1334 end; 1335 1335 kChooseEModel: … … 1349 1349 if ModelOk[emix] then 1350 1350 begin 1351 if Tribe[DipMem[me].pContact].ModelPicture1352 [MyRO.EnemyModel[emix].mix].HGr = HGrSystemthen1351 if not Assigned(Tribe[DipMem[me].pContact].ModelPicture 1352 [MyRO.EnemyModel[emix].mix].HGr) then 1353 1353 InitEnemyModel(emix); 1354 1354 code[0, Lines[0]] := emix; … … 1362 1362 inc(Lines[0]); 1363 1363 end; 1364 FirstShrinkedLine[0] := 0 1364 FirstShrinkedLine[0] := 0; 1365 1365 end; 1366 1366 kEModels: … … 1373 1373 (MyRO.EnemyModel[code[1, Lines[0]]].mix = i)) do 1374 1374 dec(code[1, Lines[0]]); 1375 if Tribe[pView].ModelPicture[i].HGr = HGrSystemthen1375 if not Assigned(Tribe[pView].ModelPicture[i].HGr) then 1376 1376 InitEnemyModel(code[1, Lines[0]]); 1377 1377 code[0, Lines[0]] := i; … … 1381 1381 end; 1382 1382 SortModels; 1383 FirstShrinkedLine[0] := 0 1383 FirstShrinkedLine[0] := 0; 1384 1384 end; 1385 1385 kAllEModels: … … 1394 1394 PPicture := @Tribe[MyRO.EnemyModel[emix].Owner].ModelPicture 1395 1395 [MyRO.EnemyModel[emix].mix]; 1396 if PPicture.HGr = HGrSystemthen1396 if not Assigned(PPicture.HGr) then 1397 1397 InitEnemyModel(emix); 1398 1398 ok := true; … … 1409 1409 code[1, j] := 1; 1410 1410 ok := false; 1411 Break 1411 Break; 1412 1412 end; 1413 1413 end; … … 1418 1418 code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix], true); 1419 1419 inc(Lines[0]); 1420 end 1420 end; 1421 1421 end; 1422 1422 SortModels; … … 1427 1427 begin 1428 1428 code[0, Lines[0]] := i; 1429 inc(Lines[0]) 1429 inc(Lines[0]); 1430 1430 end; 1431 1431 (* kDeliver: … … 1472 1472 begin 1473 1473 code[0, Lines[0]] := i; 1474 inc(Lines[0]) 1474 inc(Lines[0]); 1475 1475 end; 1476 1476 kMission: … … 1478 1478 begin 1479 1479 code[0, Lines[0]] := i; 1480 inc(Lines[0]) 1480 inc(Lines[0]); 1481 1481 end; 1482 1482 end; … … 1586 1586 TechNameSpace := TechNameSpace + 640 - InnerWidth - 2 * SideFrame; 1587 1587 InnerWidth := 640 - 2 * SideFrame 1588 end 1588 end; 1589 1589 end; 1590 1590 kAdvance, kFarAdvance: … … 1695 1695 begin 1696 1696 ToggleBtn.ButtonIndex := 13; 1697 ToggleBtn.Hint := Phrases.Lookup('FARTECH') 1697 ToggleBtn.Hint := Phrases.Lookup('FARTECH'); 1698 1698 end 1699 1699 else if Kind = kCities then 1700 1700 begin 1701 1701 ToggleBtn.ButtonIndex := 15; 1702 ToggleBtn.Hint := Phrases.Lookup('BTN_PAGE') 1702 ToggleBtn.Hint := Phrases.Lookup('BTN_PAGE'); 1703 1703 end 1704 1704 else 1705 1705 begin 1706 1706 ToggleBtn.ButtonIndex := 28; 1707 ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT') 1707 ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT'); 1708 1708 end; 1709 1709 … … 1740 1740 ShowNewContent(NewMode, kModels) 1741 1741 else 1742 ShowNewContent(NewMode, kEModels) 1742 ShowNewContent(NewMode, kEModels); 1743 1743 end; 1744 1744 … … 1756 1756 sb.Init(Lines[Layer] - 1, DispLines); 1757 1757 OffscreenPaint; 1758 Invalidate 1758 Invalidate; 1759 1759 end; 1760 1760 … … 1768 1768 Sel := -2; 1769 1769 sb.Init(Lines[Layer] - 1, DispLines); 1770 SmartUpdateContent 1770 SmartUpdateContent; 1771 1771 end; 1772 1772 … … 1781 1781 result := adFar; 1782 1782 Closable := true; 1783 Close 1783 Close; 1784 1784 end; 1785 1785 kCities, kCityEvents: … … 1821 1821 Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + 1822 1822 ToggleBtn.Height); 1823 end 1824 end 1823 end; 1824 end; 1825 1825 end; 1826 1826 … … 1835 1835 // prevent closing 1836 1836 else 1837 inherited 1837 inherited; 1838 1838 end; 1839 1839 … … 1841 1841 begin 1842 1842 if Visible and (Kind = kCities) then 1843 SmartUpdateContent 1843 SmartUpdateContent; 1844 1844 end; 1845 1845 -
trunk/LocalPlayer/Term.pas
r316 r318 752 752 for emix := 0 to MyRO.nEnemyModel - 1 do 753 753 with MyRO.EnemyModel[emix] do 754 if Tribe[Owner].ModelPicture[mix].HGr = HGrSystemthen754 if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then 755 755 InitEnemyModel(emix); 756 756 end; … … 835 835 while MyData.ToldModels < MyRO.nModel do 836 836 begin { new Unit class available } 837 if (ModelPicture[MyData.ToldModels].HGr <> HGrSystem) and837 if Assigned(ModelPicture[MyData.ToldModels].HGr) and 838 838 (MyModel[MyData.ToldModels].Kind <> mkSelfDeveloped) then 839 839 begin // save picture of DevModel 840 840 ModelPicture[MyData.ToldModels + 1] := ModelPicture[MyData.ToldModels]; 841 841 ModelName[MyData.ToldModels + 1] := ModelName[MyData.ToldModels]; 842 ModelPicture[MyData.ToldModels].HGr := HGrSystem842 ModelPicture[MyData.ToldModels].HGr := nil; 843 843 end; 844 if ModelPicture[MyData.ToldModels].HGr = HGrSystemthen844 if not Assigned(ModelPicture[MyData.ToldModels].HGr) then 845 845 InitMyModel(MyData.ToldModels, true); 846 846 { only run if no researched model } … … 873 873 Server(cSetModelName + (Length(ModelNameInfo.NewName) + 1 + 4 + 3) 874 874 div 4, me, 0, ModelNameInfo); 875 end 875 end; 876 876 end; 877 877 if MyModel[MyData.ToldModels].Kind = mkSettler then … … 1043 1043 DraftDlg.ShowNewContent(wmModal); 1044 1044 if DraftDlg.ModalResult <> mrOK then 1045 Tribe[me].ModelPicture[MyRO.nModel].HGr := HGrSystem1045 Tribe[me].ModelPicture[MyRO.nModel].HGr := nil 1046 1046 end; 1047 1047 until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK); … … 2785 2785 ItsMeAgain(p1); 2786 2786 for mix := 0 to MyRO.nModel - 1 do 2787 if Tribe[me].ModelPicture[mix].HGr = HGrSystemthen2787 if not Assigned(Tribe[me].ModelPicture[mix].HGr) then 2788 2788 InitMyModel(mix, true); 2789 2789 end; … … 3075 3075 begin 3076 3076 CurrentMoveInfo.DoShow := false; 3077 if not idle and ( Tribe[Owner].ModelPicture[mix].HGr = HGrSystem) then3077 if not idle and (not Assigned(Tribe[Owner].ModelPicture[mix].HGr)) then 3078 3078 InitEnemyModel(emix); 3079 3079 … … 3270 3270 begin 3271 3271 ToLoc := dLoc(FromLoc, dx, dy); 3272 if Tribe[Owner].ModelPicture[mix].HGr = HGrSystemthen3272 if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then 3273 3273 InitEnemyModel(emix); 3274 3274 … … 3403 3403 if TribeOriginal[NewPlayer] then 3404 3404 Tribe[NewPlayer].ModelName[mix] := NewName; 3405 end 3406 end 3405 end; 3406 end; 3407 3407 end; 3408 3408 … … 4859 4859 4860 4860 // treasury section 4861 ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 8, 1, 145, 1, 36, 36,4861 ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 8, 1), TreasuryIcon.BoundsRect, 4862 4862 $40A040, $4030C0); 4863 4863 s := IntToStr(TrueMoney); … … 4866 4866 if MyRO.Government <> gAnarchy then 4867 4867 begin 4868 ImageOp_BCC(TopBar, Templates.Data, xTreasurySection + 48, 22, 124, 1, 14, 14,4868 ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 48, 22), ChangeIcon.BoundsRect, 4869 4869 $0000C0, $0080C0); 4870 4870 if TaxSum >= 0 then … … 4877 4877 4878 4878 // research section 4879 ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 8, 1, 145, 75, 36, 36,4879 ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 8, 1), ResearchIcon.BoundsRect, 4880 4880 $FF0000, $00FFE0); 4881 4881 if MyData.FarTech <> adNexus then … … 4928 4928 if (MyData.FarTech <> adNexus) and (ScienceSum > 0) then 4929 4929 begin 4930 ImageOp_BCC(TopBar, Templates.Data, xResearchSection + 48 + CostFactor + 11,4931 22 , 124, 1, 14, 14, $0000C0, $0080C0);4930 ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 48 + CostFactor + 11, 4931 22), ChangeIcon.BoundsRect, $0000C0, $0080C0); 4932 4932 s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]); 4933 4933 LoweredTextOut(TopBar.Canvas, -1, MainTexture, xResearchSection + 48 + … … 5353 5353 MyRO.EnemyModel[emix].mix, MouseLoc) >= rExecuted) then 5354 5354 begin 5355 if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr = HGrSystemthen5355 if not Assigned(Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr) then 5356 5356 InitEnemyModel(emix); 5357 5357 m2 := TMenuItem.Create(m); … … 6447 6447 SumCities(TaxSum, ScienceSum); 6448 6448 for i := 0 to MyRO.nModel - 1 do 6449 if Tribe[me].ModelPicture[i].HGr = HGrSystemthen6449 if not Assigned(Tribe[me].ModelPicture[i].HGr) then 6450 6450 InitMyModel(i, True); 6451 6451 -
trunk/LocalPlayer/UnitStat.pas
r313 r318 136 136 begin 137 137 mox := @MyRO.EnemyModel[emix]; 138 if Tribe[owner].ModelPicture[mix].HGr = HGrSystemthen138 if not Assigned(Tribe[owner].ModelPicture[mix].HGr) then 139 139 InitEnemyModel(emix); 140 140 end -
trunk/Packages/CevoComponents/ScreenTools.pas
r317 r318 102 102 Kind, x, y, size, pos, Growth, max: integer; IndicateComplete: boolean; 103 103 const T: TTexture); 104 procedure PaintLogo( ca: TCanvas; x, y, clLight, clShade: integer);104 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: integer); 105 105 function SetMainTextureByAge(Age: integer): boolean; 106 106 procedure LoadPhrases; … … 164 164 HGrSystem: TGraphicSet; 165 165 HGrSystem2: TGraphicSet; 166 CityMark1: TGraphicSetItem;167 CityMark2: TGraphicSetItem;168 Ornament: TGraphicSetItem;169 Logo: TGraphicSetItem;170 BigBook: TGraphicSetItem;171 SmallBook: TGraphicSetItem;172 MenuLogo: TGraphicSetItem;173 166 ClickFrameColor: Integer; 174 167 MainTextureAge: Integer; … … 183 176 InitOrnamentDone: Boolean; 184 177 Phrases2FallenBackToEnglish: Boolean; 178 179 // Graphic set items 180 CityMark1: TGraphicSetItem; 181 CityMark2: TGraphicSetItem; 182 Ornament: TGraphicSetItem; 183 Logo: TGraphicSetItem; 184 BigBook: TGraphicSetItem; 185 SmallBook: TGraphicSetItem; 186 MenuLogo: TGraphicSetItem; 187 LinkArrows: TGraphicSetItem; 188 ScienceNationDot: TGraphicSetItem; 189 ResearchIcon: TGraphicSetItem; 190 ChangeIcon: TGraphicSetItem; 191 TreasuryIcon: TGraphicSetItem; 192 StarshipDeparted: TGraphicSetItem; 193 WeightOn: TGraphicSetItem; 194 WeightOff: TGraphicSetItem; 185 195 186 196 UniFont: array [TFontType] of TFont; … … 1502 1512 end; 1503 1513 1504 procedure PaintLogo( ca: TCanvas; x, y, clLight, clShade: Integer);1514 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer); 1505 1515 begin 1506 1516 // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it 1507 1517 LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height); 1508 BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, ca, x, y);1518 BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, Canvas, X, Y); 1509 1519 ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect, 1510 clLight, clShade);1511 BitBltCanvas( ca, x, y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);1520 LightColor, ShadeColor); 1521 BitBltCanvas(Canvas, X, Y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0); 1512 1522 end; 1513 1523 … … 1690 1700 LoadFonts; 1691 1701 Templates := LoadGraphicSet2('Templates.png'); 1692 Logo := Templates.GetItem('Logo'); 1693 BigBook := Templates.GetItem('BigBook'); 1694 SmallBook := Templates.GetItem('SmallBook'); 1695 MenuLogo := Templates.GetItem('MenuLogo'); 1702 with Templates do begin 1703 Logo := GetItem('Logo'); 1704 BigBook := GetItem('BigBook'); 1705 SmallBook := GetItem('SmallBook'); 1706 MenuLogo := GetItem('MenuLogo'); 1707 LinkArrows := GetItem('LinkArrows'); 1708 ScienceNationDot := GetItem('ScienceNationDot'); 1709 ResearchIcon := GetItem('Research'); 1710 ChangeIcon := GetItem('Change'); 1711 TreasuryIcon := GetItem('Treasury'); 1712 StarshipDeparted := GetItem('StarshipDeparted'); 1713 WeightOn := GetItem('WeightOn'); 1714 WeightOff := GetItem('WeightOff'); 1715 end; 1716 1696 1717 LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png'); 1697 1718 LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg'); -
trunk/Start.pas
r317 r318 881 881 // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it 882 882 LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height); 883 BitBltCanvas(LogoBuffer.Canvas, 0, 0, 91, 25, Canvas,883 BitBltCanvas(LogoBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas, 884 884 xActionIcon, y + 2); 885 ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, 1, 400, 91, 25, 0,885 ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), LinkArrows.BoundsRect, 0, 886 886 Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText]); 887 BitBltCanvas(Canvas, xActionIcon, y + 2, 91, 25,887 BitBltCanvas(Canvas, xActionIcon, y + 2, LinkArrows.Width, LinkArrows.Height, 888 888 LogoBuffer.Canvas, 0, 0); 889 889 end;
Note:
See TracChangeset
for help on using the changeset viewer.