Changeset 337
- Timestamp:
- Apr 1, 2021, 9:30:25 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Direct.pas
r336 r337 64 64 Info := Phrases.Lookup('BUSY_MODLH'); 65 65 Show; 66 Application.ProcessMessages; // Repaint after show for Linux 66 {$IFDEF LINUX} 67 Application.ProcessMessages; 68 {$ENDIF} 67 69 Invalidate; 68 70 Update; … … 152 154 State := -1; 153 155 Show; 156 {$IFDEF LINUX} 157 Application.ProcessMessages; 158 {$ENDIF} 154 159 Invalidate; 155 160 Update; 156 Application.ProcessMessages;157 161 end; 158 162 ntBackOn: begin … … 282 286 Invalidate; 283 287 Update; 288 {$IFDEF LINUX} 284 289 Application.ProcessMessages; 290 {$ENDIF} 285 291 end; 286 292 -
trunk/LocalPlayer/IsoEngine.pas
r331 r337 57 57 BordersOK: PInteger; 58 58 CitiesPictures: TCitiesPictures; 59 ShowLoc: Boolean; 60 ShowCityNames: Boolean; 61 ShowObjects: Boolean; 62 ShowBorder: Boolean; 63 ShowMyBorder: Boolean; 64 ShowGrWall: Boolean; 65 ShowDebug: Boolean; 66 FoW: Boolean; 59 67 function Connection4(Loc, Mask, Value: integer): integer; 60 68 function Connection8(Loc, Mask: integer): integer; … … 76 84 HGrTerrain: TGraphicSet; 77 85 HGrCities: TGraphicSet; 78 MapOptions: TMapOptions;79 86 pDebugMap: Integer; // -1 for off 80 87 constructor Create; … … 122 129 function IsJungle(y: integer): boolean; 123 130 procedure Init(InitEnemyModelHandler: TInitEnemyModelEvent); 131 132 var 133 MapOptions: TMapOptions; 124 134 125 135 … … 161 171 OnInitEnemyModel: TInitEnemyModelEvent; 162 172 DebugMap: ^TTileList; 163 FoW: Boolean;164 ShowLoc: Boolean;165 ShowCityNames: Boolean;166 ShowObjects: Boolean;167 ShowBorder: Boolean;168 ShowMyBorder: Boolean;169 ShowGrWall: Boolean;170 ShowDebug: Boolean;171 173 IsoMapCache: array[TTileSize] of TIsoMapCache; 172 174 … … 1550 1552 begin 1551 1553 Aix := 0; 1552 bix := 0 1554 bix := 0; 1553 1555 end 1554 1556 else 1555 1557 begin 1556 1558 Aix := 0; 1557 bix := 1 1559 bix := 1; 1558 1560 end 1559 1561 else if bix = -1 then … … 1561 1563 begin 1562 1564 Aix := 1; 1563 bix := 1 1565 bix := 1; 1564 1566 end 1565 1567 else 1566 1568 begin 1567 1569 Aix := 1; 1568 bix := 0 1570 bix := 0; 1569 1571 end; 1570 1572 BitBltBitmap(OceanPatch, x + dx * xxt, y + dy * yyt, xxt, yyt, … … 1603 1605 begin 1604 1606 Aix := fDesert; 1605 bix := fDesert 1607 bix := fDesert; 1606 1608 end 1607 1609 else if Aix = -2 then -
trunk/LocalPlayer/Term.pas
r335 r337 1259 1259 begin 1260 1260 MiniMap.MapOptions := MapOptionChecked; 1261 Ma inMap.MapOptions := MapOptionChecked;1261 MapOptions := MapOptionChecked; 1262 1262 if ClientMode = cEditMap then 1263 Ma inMap.MapOptions := MainMap.MapOptions + [moEditMode];1263 MapOptions := MapOptions + [moEditMode]; 1264 1264 if mLocCodes.Checked then 1265 Ma inMap.MapOptions := MainMap.MapOptions + [moLocCodes];1265 MapOptions := MapOptions + [moLocCodes]; 1266 1266 end; 1267 1267 … … 3521 3521 Buffer := TBitmap.Create; 3522 3522 Buffer.PixelFormat := pf24bit; 3523 if 2 * lxmax > 3 * xSizeBig then 3524 Buffer.width := 2 * lxmax 3525 else 3526 Buffer.width := 3 * xSizeBig; 3527 if lymax > 3 * ySizeBig then 3528 Buffer.height := lymax 3529 else 3530 Buffer.height := 3 * ySizeBig; 3523 if 2 * lxmax > 3 * xSizeBig then Buffer.width := 2 * lxmax 3524 else Buffer.width := 3 * xSizeBig; 3525 if lymax > 3 * ySizeBig then Buffer.height := lymax 3526 else Buffer.height := 3 * ySizeBig; 3531 3527 Buffer.Canvas.Font.Assign(UniFont[ftSmall]); 3532 3528 for i := 0 to nPl - 1 do … … 5071 5067 // if MoveHintToLoc>=0 then 5072 5068 // ShowMoveHint(MoveHintToLoc, true); 5073 end 5069 end; 5074 5070 end 5075 5071 else if TurnComplete and not supervising then … … 6391 6387 begin 6392 6388 MainMap.pDebugMap := p; 6393 Ma inMap.MapOptions := MainMap.MapOptions - [moLocCodes];6389 MapOptions := MapOptions - [moLocCodes]; 6394 6390 mLocCodes.Checked := false; 6395 6391 MapValid := false;
Note:
See TracChangeset
for help on using the changeset viewer.