Changeset 182
- Timestamp:
- Dec 26, 2019, 12:09:50 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LocalPlayer/IsoEngine.pas
r170 r182 89 89 90 90 // sprites indexes 91 sp DeadLands= 2 * TerrainIconCols + 6;91 spRow2 = 2 * TerrainIconCols + 6; 92 92 spBlink1 = 1 * TerrainIconCols + 8; 93 93 spBlink2 = 2 * TerrainIconCols + 8; … … 107 107 spPollution = 12 * TerrainIconCols + 6; 108 108 spFortBack = 12 * TerrainIconCols + 7; 109 spMinerals = 12 * TerrainIconCols + 8; 109 110 spRiver = 13 * TerrainIconCols; 111 spRiverMouths = 15 * TerrainIconCols; 112 spGrid = 15 * TerrainIconCols + 6; 110 113 spJungle = 18 * TerrainIconCols; 114 spCanalMouths = 20 * TerrainIconCols; 111 115 112 116 var … … 137 141 i, x, y, xSrc, ySrc, HGrTerrainNew, HGrCitiesNew, age, size: integer; 138 142 LandMore, OceanMore, DitherMask, Mask24: TBitmap; 139 MaskLine: array [0 .. 32* 3 - 1] of TPixelPointer; // 32 = assumed maximum for yyt143 MaskLine: array [0 .. 50 * 3 - 1] of TPixelPointer; // 32 = assumed maximum for yyt 140 144 Border: boolean; 141 145 begin … … 422 426 Borders := TBitmap.Create; 423 427 Borders.PixelFormat := pf24bit; 424 Borders.SetSize(xxt * 2, (yyt * 2) * nPl);428 Borders.SetSize(xxt * 2, (yyt * 2) * nPl); 425 429 Borders.Canvas.FillRect(0, 0, Borders.Width, Borders.Height); 426 430 BordersOK := 0; … … 876 880 end 877 881 else if Tile and fDeadLands <> 0 then 878 TSprite(x, y, sp DeadLands);882 TSprite(x, y, spRow2); 879 883 880 884 if ShowObjects then … … 898 902 for Dir := 0 to 3 do 899 903 if Conn and (1 shl Dir) <> 0 then { river mouths } 900 TSprite(x, y, 15 * TerrainIconCols + Dir);904 TSprite(x, y, spRiverMouths + Dir); 901 905 if ShowObjects then 902 906 begin … … 904 908 for Dir := 0 to 7 do 905 909 if Conn and (1 shl Dir) <> 0 then { canal mouths } 906 TSprite(x, y, 20 * TerrainIconCols + 1 + Dir);910 TSprite(x, y, spCanalMouths + 1 + Dir); 907 911 end 908 912 end; … … 1112 1116 end; 1113 1117 end; 1114 if Tile and fDeadLands<> 0 then1115 TSprite(x, y, (12 + Tile shr 25 and 3) * TerrainIconCols + 8);1118 if (Tile and fDeadLands) <> 0 then 1119 TSprite(x, y, spMinerals + (Tile shr 25 and 3) * TerrainIconCols); 1116 1120 1117 1121 if Options and (1 shl moEditMode) <> 0 then … … 1131 1135 1 + yyt + 15 * (yyt * 3 + 1)) 1132 1136 else 1133 TSprite(x, y, 6 + TerrainIconCols * 15, xxt <> 33);1137 TSprite(x, y, spGrid, xxt <> 33); 1134 1138 1135 1139 if FoW and (Tile and fObserved = 0) then -
trunk/LocalPlayer/Term.lfm
r90 r182 1 1 object MainScreen: TMainScreen 2 2 Left = 231 3 Height = 4803 Height = 600 4 4 Top = 190 5 Width = 8005 Width = 1000 6 6 HorzScrollBar.Visible = False 7 7 VertScrollBar.Visible = False 8 8 Caption = 'C-evo' 9 ClientHeight = 48010 ClientWidth = 8009 ClientHeight = 600 10 ClientWidth = 1000 11 11 Color = clBtnFace 12 Constraints.MinHeight = 480 13 Constraints.MinWidth = 800 12 Constraints.MinHeight = 600 13 Constraints.MinWidth = 1000 14 DesignTimePPI = 120 14 15 Font.Color = clWindowText 15 Font.Height = -1 316 Font.Height = -16 16 17 Font.Name = 'MS Sans Serif' 17 18 KeyPreview = True … … 30 31 OnShow = FormShow 31 32 Position = poDefault 32 LCLVersion = ' 1.6.0.4'33 LCLVersion = '2.0.6.0' 33 34 WindowState = wsMaximized 34 35 object UnitBtn: TButtonB 35 36 Tag = 14 36 Left = 2 0837 Height = 2538 Top = 38439 Width = 2537 Left = 260 38 Height = 31 39 Top = 480 40 Width = 31 40 41 Visible = False 41 42 Down = False … … 46 47 object MapBtn0: TButtonC 47 48 Tag = 51 48 Left = 1649 Height = 1 250 Top = 3 0451 Width = 1 249 Left = 20 50 Height = 15 51 Top = 380 52 Width = 15 52 53 Visible = False 53 54 Down = False … … 58 59 object MapBtn1: TButtonC 59 60 Tag = 291 60 Left = 1661 Height = 1 262 Top = 32063 Width = 1 261 Left = 20 62 Height = 15 63 Top = 400 64 Width = 15 64 65 Visible = False 65 66 Down = False … … 70 71 object MapBtn4: TButtonC 71 72 Tag = 1028 72 Left = 1673 Height = 1 274 Top = 36875 Width = 1 273 Left = 20 74 Height = 15 75 Top = 460 76 Width = 15 76 77 Visible = False 77 78 Down = False … … 82 83 object MapBtn5: TButtonC 83 84 Tag = 1328 84 Left = 1685 Height = 1 286 Top = 38487 Width = 1 285 Left = 20 86 Height = 15 87 Top = 480 88 Width = 15 88 89 Visible = False 89 90 Down = False … … 94 95 object MapBtn6: TButtonC 95 96 Tag = 1541 96 Left = 1697 Height = 1 298 Top = 40099 Width = 1 297 Left = 20 98 Height = 15 99 Top = 500 100 Width = 15 100 101 Visible = False 101 102 Down = False … … 106 107 object TerrainBtn: TButtonB 107 108 Tag = 28 108 Left = 240109 Height = 25110 Top = 384111 Width = 25109 Left = 300 110 Height = 31 111 Top = 480 112 Width = 31 112 113 Visible = False 113 114 Down = False … … 118 119 object UnitInfoBtn: TButtonB 119 120 Tag = 15 120 Left = 176121 Height = 25122 Top = 384123 Width = 25121 Left = 220 122 Height = 31 123 Top = 480 124 Width = 31 124 125 Visible = False 125 126 Down = False … … 129 130 end 130 131 object EOT: TEOTButton 131 Left = 712132 Height = 48133 Top = 368134 Width = 48132 Left = 890 133 Height = 60 134 Top = 460 135 Width = 60 135 136 Visible = False 136 137 Down = False … … 141 142 object MenuArea: TArea 142 143 Left = 2 143 Height = 36144 Height = 45 144 145 Top = 1 145 Width = 36146 Width = 45 146 147 end 147 148 object TreasuryArea: TArea 148 Left = 2 08149 Height = 36149 Left = 260 150 Height = 45 150 151 Top = 1 151 Width = 164152 Width = 205 152 153 end 153 154 object ResearchArea: TArea 154 Left = 384155 Height = 36155 Left = 480 156 Height = 45 156 157 Top = 1 157 Width = 240158 Width = 300 158 159 end 159 160 object ManagementArea: TArea 160 Left = 704161 Height = 40162 Top = 3 12163 Width = 56161 Left = 880 162 Height = 50 163 Top = 390 164 Width = 70 164 165 end 165 166 object MovieSpeed1Btn: TButtonB 166 167 Tag = 256 167 Left = 384168 Height = 25169 Top = 384170 Width = 25168 Left = 480 169 Height = 31 170 Top = 480 171 Width = 31 171 172 Visible = False 172 173 Down = False … … 177 178 object MovieSpeed2Btn: TButtonB 178 179 Tag = 512 179 Left = 416180 Height = 25181 Top = 384182 Width = 25180 Left = 520 181 Height = 31 182 Top = 480 183 Width = 31 183 184 Visible = False 184 185 Down = False … … 189 190 object MovieSpeed3Btn: TButtonB 190 191 Tag = 768 191 Left = 448192 Height = 25193 Top = 384194 Width = 25192 Left = 560 193 Height = 31 194 Top = 480 195 Width = 31 195 196 Visible = False 196 197 Down = False … … 201 202 object MovieSpeed4Btn: TButtonB 202 203 Tag = 1024 203 Left = 480204 Height = 25205 Top = 384206 Width = 25204 Left = 600 205 Height = 31 206 Top = 480 207 Width = 31 207 208 Visible = False 208 209 Down = False … … 215 216 Interval = 50 216 217 OnTimer = Timer1Timer 217 left = 8218 top = 48218 left = 10 219 top = 60 219 220 end 220 221 object GamePopup: TPopupMenu 221 222 AutoPopup = False 222 left = 40223 top = 48223 left = 50 224 top = 60 224 225 object mHelp: TMenuItem 225 226 Tag = 7 … … 452 453 RadioItem = True 453 454 OnClick = mNormalTilesClick 455 end 456 object mBigTiles: TMenuItem 457 Caption = '90px' 458 RadioItem = True 459 OnClick = mBigTilesClick 454 460 end 455 461 end … … 580 586 object UnitPopup: TPopupMenu 581 587 AutoPopup = False 582 left = 1 04583 top = 48588 left = 130 589 top = 60 584 590 object mdisband: TMenuItem 585 591 Tag = 72 … … 663 669 object StatPopup: TPopupMenu 664 670 AutoPopup = False 665 left = 72666 top = 48671 left = 90 672 top = 60 667 673 object mUnitStat: TMenuItem 668 674 Tag = 9 … … 719 725 end 720 726 object EditPopup: TPopupMenu 721 left = 168722 top = 48727 left = 210 728 top = 60 723 729 object mCreateUnit: TMenuItem 724 730 Tag = 47 … … 726 732 end 727 733 object TerrainPopup: TPopupMenu 728 left = 1 36729 top = 48734 left = 170 735 top = 60 730 736 object mtrans: TMenuItem 731 737 Tag = 273 -
trunk/LocalPlayer/Term.pas
r173 r182 26 26 27 27 TMainScreen = class(TDrawDlg) 28 mBigTiles: TMenuItem; 28 29 Timer1: TTimer; 29 30 GamePopup: TPopupMenu; … … 218 219 procedure mSmallTilesClick(Sender: TObject); 219 220 procedure mNormalTilesClick(Sender: TObject); 221 procedure mBigTilesClick(Sender: TObject); 220 222 procedure GrWallBtnDownChanged(Sender: TObject); 221 223 procedure BareBtnDownChanged(Sender: TObject); … … 1489 1491 MiniColors[x, y] := GrExt[HGrSystem].Data.Canvas.Pixels[66 + x, 67 + y]; 1490 1492 IsoEngine.Init(InitEnemyModel); 1491 if not IsoEngine.ApplyTileSize(xxt, yyt) and ((xxt <> 48) or (yyt <> 24) )1493 if not IsoEngine.ApplyTileSize(xxt, yyt) and ((xxt <> 48) or (yyt <> 24) or (xxt <> 72)) 1492 1494 then 1493 1495 ApplyTileSize(48, 24); … … 7324 7326 mSmallTiles.Checked := xxt = 33; 7325 7327 mNormalTiles.Checked := xxt = 48; 7328 mBigTiles.Checked := xxt = 72; 7326 7329 end 7327 7330 else if Popup = StatPopup then … … 7993 7996 end; 7994 7997 7998 procedure TMainScreen.mBigTilesClick(Sender: TObject); 7999 begin 8000 SetTileSize(72, 36); 8001 end; 8002 7995 8003 procedure TMainScreen.SetTileSize(x, y: integer); 7996 8004 var -
trunk/Packages/CevoComponents/ScreenTools.pas
r173 r182 466 466 467 467 xmax := Source.Width - 1; // allows 4-byte access even for last pixel 468 if xmax > 970 then 469 xmax := 970; 468 // Why there was that limit? 469 //if xmax > 970 then 470 // xmax := 970; 470 471 471 472 GrExt[nGrExt].Data := Source;
Note:
See TracChangeset
for help on using the changeset viewer.