Changeset 6 for trunk/LocalPlayer

Timestamp:

Jan 7, 2017, 11:32:14 AM (7 years ago)

Author:

chronos

Message:

• Modified: Formated all project source files using Delphi formatter as original indentation and other formatting was really bad.

Location:

trunk/LocalPlayer

Files:

• BaseWin.pas (modified) (8 diffs)
• Battle.dfm (modified) ( previous)
• Battle.pas (modified) (8 diffs)
• CityScreen.pas (modified) (15 diffs)
• CityType.dfm (modified) ( previous)
• CityType.pas (modified) (6 diffs)
• ClientTools.pas (modified) (4 diffs)
• Diagram.dfm (modified) ( previous)
• Diagram.pas (modified) (6 diffs)
• Diplomacy.pas (modified) (3 diffs)
• Draft.dfm (modified) ( previous)
• Draft.pas (modified) (11 diffs)
• Enhance.dfm (modified) ( previous)
• Enhance.pas (modified) (5 diffs)
• Help.dfm (modified) ( previous)
• Help.pas (modified) (13 diffs)
• IsoEngine.pas (modified) (3 diffs)
• LocalPlayer.pas (modified) (1 diff)
• MessgEx.dfm (modified) ( previous)
• MessgEx.pas (modified) (7 diffs)
• NatStat.dfm (modified) ( previous)
• NatStat.pas (modified) (10 diffs)
• Nego.dfm (modified) ( previous)
• Nego.pas (modified) (9 diffs)
• PVSB.pas (modified) (4 diffs)
• Rates.dfm (modified) ( previous)
• Rates.pas (modified) (2 diffs)
• Select.dfm (modified) ( previous)
• Select.pas (modified) (15 diffs)
• TechTree.pas (modified) (8 diffs)
• Term.dfm (modified) ( previous)
• Term.pas (modified) (12 diffs)
• Tribes.pas (modified) (3 diffs)
• UnitStat.dfm (modified) ( previous)
• UnitStat.pas (modified) (7 diffs)
• Wonders.dfm (modified) ( previous)
• Wonders.pas (modified) (7 diffs)

trunk/LocalPlayer/BaseWin.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit BaseWin;
 
@@ -6 +5 @@
 
 uses
-  ScreenTools,Messg,
-
-  Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms;
+  ScreenTools, Messg,
+
+  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms;
 
 type
@@ -16 +15 @@
     constructor Create(AOwner: TComponent); override;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure FormPaint(Sender:TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormPaint(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormDeactivate(Sender: TObject);
     procedure SmartUpdateContent(ImmUpdate: boolean = false);
     procedure StayOnTop_Workaround;
   protected
-    FWindowMode,ModalFrameIndent: integer;
+    FWindowMode, ModalFrameIndent: integer;
     HelpContext: string;
     procedure ShowNewContent(NewMode: integer; forceclose: boolean = false);
-    procedure MarkUsedOffscreen(xMax,yMax: integer);
+    procedure MarkUsedOffscreen(xMax, yMax: integer);
     procedure OffscreenPaint; virtual;
     procedure VPaint; virtual;
@@ -33 +31 @@
   end;
 
-
   TFramedDlg = class(TBufferedDrawDlg)
   public
     constructor Create(AOwner: TComponent); override;
-    procedure FormCreate(Sender:TObject);
+    procedure FormCreate(Sender: TObject);
     procedure SmartInvalidate; override;
   protected
@@ -44 +41 @@
     procedure InitWindowRegion;
     procedure VPaint; override;
-    procedure FillOffscreen(Left,Top,Width,Height: integer);
-    end;
-
+    procedure FillOffscreen(Left, Top, Width, Height: integer);
+  end;
 
 const
-// window modes
-wmNone=0; wmModal=$1; wmPersistent=$2; wmSubmodal=$3;
-
-
-yUnused=161;
-NarrowFrame=11; WideFrame=36; SideFrame=9;
+  // window modes
+  wmNone = 0;
+  wmModal = $1;
+  wmPersistent = $2;
+  wmSubmodal = $3;
+
+  yUnused = 161;
+  NarrowFrame = 11;
+  WideFrame = 36;
+  SideFrame = 9;
 
 var
-UsedOffscreenWidth, UsedOffscreenHeight: integer;
-Offscreen: TBitmap;
-OffscreenUser: TForm;
+  UsedOffscreenWidth, UsedOffscreenHeight: integer;
+  Offscreen: TBitmap;
+  OffscreenUser: TForm;
 
 procedure CreateOffscreen;
 
-
 implementation
 
 uses
-Term, Help, ButtonBase, Area;
-
+  Term, Help, ButtonBase, Area;
 
 constructor TBufferedDrawDlg.Create;
 begin
-OnClose:=FormClose;
-OnPaint:=FormPaint;
-OnKeyDown:=FormKeyDown;
-OnDeactivate:=FormDeactivate;
-inherited;
-FWindowMode:=wmNone;
-HelpContext:='CONCEPTS';
-TitleHeight:=WideFrame;
-ModalFrameIndent:=45;
-UserLeft:=(Screen.Width-Width) div 2;
-UserTop:=(Screen.Height-Height) div 2;
+  OnClose := FormClose;
+  OnPaint := FormPaint;
+  OnKeyDown := FormKeyDown;
+  OnDeactivate := FormDeactivate;
+  inherited;
+  FWindowMode := wmNone;
+  HelpContext := 'CONCEPTS';
+  TitleHeight := WideFrame;
+  ModalFrameIndent := 45;
+  UserLeft := (Screen.Width - Width) div 2;
+  UserTop := (Screen.Height - Height) div 2;
 end;
 
 procedure TBufferedDrawDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-if FWindowMode=wmPersistent then
-  begin UserLeft:=Left; UserTop:=Top end;
-if OffscreenUser=self then OffscreenUser:=nil;
-end;
-
-procedure TBufferedDrawDlg.FormPaint(Sender:TObject);
-begin
-if OffscreenUser<>self then OffscreenPaint;
-VPaint
+  if FWindowMode = wmPersistent then
+  begin
+    UserLeft := Left;
+    UserTop := Top
+  end;
+  if OffscreenUser = self then
+    OffscreenUser := nil;
+end;
+
+procedure TBufferedDrawDlg.FormPaint(Sender: TObject);
+begin
+  if OffscreenUser <> self then
+    OffscreenPaint;
+  VPaint
 end;
 
@@ -101 +104 @@
   Shift: TShiftState);
 begin
-if Key=VK_ESCAPE then
-  begin
-  if fsModal in FormState then ModalResult:=mrCancel
-  end
-else if Key=VK_RETURN then
-  begin
-  if fsModal in FormState then ModalResult:=mrOK
-  end
-else if Key=VK_F1 then
-  HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText, HelpDlg.TextIndex(HelpContext))
-else if FWindowMode=wmPersistent then
-  MainScreen.FormKeyDown(Sender, Key, Shift);
+  if Key = VK_ESCAPE then
+  begin
+    if fsModal in FormState then
+      ModalResult := mrCancel
+  end
+  else if Key = VK_RETURN then
+  begin
+    if fsModal in FormState then
+      ModalResult := mrOK
+  end
+  else if Key = VK_F1 then
+    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+      HelpDlg.TextIndex(HelpContext))
+  else if FWindowMode = wmPersistent then
+    MainScreen.FormKeyDown(Sender, Key, Shift);
 end;
 
 procedure TBufferedDrawDlg.FormDeactivate(Sender: TObject);
 begin
-if FWindowMode=wmSubmodal then Close
+  if FWindowMode = wmSubmodal then
+    Close
 end;
 
 procedure TBufferedDrawDlg.OffscreenPaint;
 begin
-if (OffscreenUser<>nil) and (OffscreenUser<>self) then
-  OffscreenUser.Update; // complete working with old owner to prevent rebound
-OffscreenUser:=self;
+  if (OffscreenUser <> nil) and (OffscreenUser <> self) then
+    OffscreenUser.Update; // complete working with old owner to prevent rebound
+  OffscreenUser := self;
 end;
 
 procedure TBufferedDrawDlg.VPaint;
 begin
-BitBlt(Canvas.Handle, 0, 0, ClientWidth,
-  ClientHeight, offscreen.Canvas. Handle, 0, 0, SRCCOPY);
-end;
-
-procedure TBufferedDrawDlg.ShowNewContent(NewMode: integer; forceclose: boolean);
-begin
-if Visible then
-  begin
-  assert((NewMode=wmModal) or (FWindowMode<>wmModal)); // don't make modal window non-modal
-  if (NewMode=wmModal) and (forceclose or (FWindowMode<>wmModal)) then
+  BitBlt(Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
+    Offscreen.Canvas.Handle, 0, 0, SRCCOPY);
+end;
+
+procedure TBufferedDrawDlg.ShowNewContent(NewMode: integer;
+  forceclose: boolean);
+begin
+  if Visible then
+  begin
+    assert((NewMode = wmModal) or (FWindowMode <> wmModal));
+    // don't make modal window non-modal
+    if (NewMode = wmModal) and (forceclose or (FWindowMode <> wmModal)) then
     begin // make modal
-    UserLeft:=Left;
-    UserTop:=Top;
-    Visible:=false;
-    FWindowMode:=NewMode;
-    ShowModal;
+      UserLeft := Left;
+      UserTop := Top;
+      Visible := false;
+      FWindowMode := NewMode;
+      ShowModal;
     end
-  else if forceclose then
+    else if forceclose then
     begin // make modal
-    Visible:=false;
-    FWindowMode:=NewMode;
-    Left:=UserLeft;
-    Top:=UserTop;
-    Show;
+      Visible := false;
+      FWindowMode := NewMode;
+      Left := UserLeft;
+      Top := UserTop;
+      Show;
     end
-  else
-    begin
-    FWindowMode:=NewMode;
-    if @OnShow<>nil then
-      OnShow(nil);
-    Invalidate;
-    BringToFront
+    else
+    begin
+      FWindowMode := NewMode;
+      if @OnShow <> nil then
+        OnShow(nil);
+      Invalidate;
+      BringToFront
     end
   end
-else
-  begin
-  FWindowMode:=NewMode;
-  Left:=UserLeft;
-  Top:=UserTop;
-  if FWindowMode=wmModal then ShowModal
-  else Show
+  else
+  begin
+    FWindowMode := NewMode;
+    Left := UserLeft;
+    Top := UserTop;
+    if FWindowMode = wmModal then
+      ShowModal
+    else
+      Show
   end
 end;
@@ -175 +186 @@
 procedure TBufferedDrawDlg.SmartUpdateContent(ImmUpdate: boolean);
 begin
-if Visible then
-  begin
-  OffscreenPaint;
-  SmartInvalidate;
-  if ImmUpdate then Update
-  end
-end;
-
-procedure TBufferedDrawDlg.MarkUsedOffscreen(xMax,yMax: integer);
-begin
-if xMax>UsedOffscreenWidth then UsedOffscreenWidth:=xMax;
-if yMax>UsedOffscreenHeight then UsedOffscreenHeight:=yMax;
+  if Visible then
+  begin
+    OffscreenPaint;
+    SmartInvalidate;
+    if ImmUpdate then
+      Update
+  end
+end;
+
+procedure TBufferedDrawDlg.MarkUsedOffscreen(xMax, yMax: integer);
+begin
+  if xMax > UsedOffscreenWidth then
+    UsedOffscreenWidth := xMax;
+  if yMax > UsedOffscreenHeight then
+    UsedOffscreenHeight := yMax;
 end;
 
@@ -193 +207 @@
 // after application lost focus, so show all stayontop-windows in first turn
 var
-SaveOnShow, SaveOnPaint: TNotifyEvent;
-begin
-Top:=Screen.Height;
-SaveOnShow:=OnShow;
-OnShow:=nil;
-SaveOnPaint:=OnPaint;
-OnPaint:=nil;
-FWindowMode:=wmNone;
-Show;
-Hide;
-OnShow:=SaveOnShow;
-OnPaint:=SaveOnPaint;
-end;
-
+  SaveOnShow, SaveOnPaint: TNotifyEvent;
+begin
+  Top := Screen.Height;
+  SaveOnShow := OnShow;
+  OnShow := nil;
+  SaveOnPaint := OnPaint;
+  OnPaint := nil;
+  FWindowMode := wmNone;
+  Show;
+  Hide;
+  OnShow := SaveOnShow;
+  OnPaint := SaveOnPaint;
+end;
 
 constructor TFramedDlg.Create;
 begin
-OnCreate:=FormCreate;
-inherited;
-end;
-
-procedure TFramedDlg.FormCreate(Sender:TObject);
-begin
-CaptionLeft:=0; CaptionRight:=$FFFF;
-WideBottom:=false;
-FullCaption:=true;
-TexOverride:=false;
-ModalIndication:=true;
-Canvas.Brush.Style:=bsClear;
-InnerWidth:=ClientWidth-2*SideFrame;
-InnerHeight:=ClientHeight-TitleHeight-NarrowFrame;
+  OnCreate := FormCreate;
+  inherited;
+end;
+
+procedure TFramedDlg.FormCreate(Sender: TObject);
+begin
+  CaptionLeft := 0;
+  CaptionRight := $FFFF;
+  WideBottom := false;
+  FullCaption := true;
+  TexOverride := false;
+  ModalIndication := true;
+  Canvas.Brush.Style := bsClear;
+  InnerWidth := ClientWidth - 2 * SideFrame;
+  InnerHeight := ClientHeight - TitleHeight - NarrowFrame;
 end;
 
 procedure TFramedDlg.SmartInvalidate;
 var
-i,BottomFrame: integer;
-r0,r1: HRgn;
-begin
-if WideBottom then BottomFrame:=WideFrame else BottomFrame:=NarrowFrame;
-r0:=CreateRectRgn(SideFrame,TitleHeight,ClientWidth-SideFrame,
-  ClientHeight-BottomFrame);
-for i:=0 to ControlCount-1 do
-  if not (Controls[i] is TArea) and Controls[i].Visible then
-    begin
-    with Controls[i].BoundsRect do
-      r1:=CreateRectRgn(Left,Top,Right,Bottom);
-    CombineRgn(r0,r0,r1,RGN_DIFF);
-    DeleteObject(r1);
+  i, BottomFrame: integer;
+  r0, r1: HRgn;
+begin
+  if WideBottom then
+    BottomFrame := WideFrame
+  else
+    BottomFrame := NarrowFrame;
+  r0 := CreateRectRgn(SideFrame, TitleHeight, ClientWidth - SideFrame,
+    ClientHeight - BottomFrame);
+  for i := 0 to ControlCount - 1 do
+    if not(Controls[i] is TArea) and Controls[i].Visible then
+    begin
+      with Controls[i].BoundsRect do
+        r1 := CreateRectRgn(Left, Top, Right, Bottom);
+      CombineRgn(r0, r0, r1, RGN_DIFF);
+      DeleteObject(r1);
     end;
-InvalidateRgn(Handle,r0,false);
-DeleteObject(r0);
+  InvalidateRgn(Handle, r0, false);
+  DeleteObject(r0);
 end;
 
 procedure TFramedDlg.VPaint;
 
-  procedure CornerFrame(x0,y0,x1,y1: integer);
-  begin
-  Frame(Canvas,x0+1,y0+1,x1-2,y1-2,MainTexture.clBevelLight,MainTexture.clBevelShade);
-  Frame(Canvas,x0+2,y0+2,x1-3,y1-3,MainTexture.clBevelLight,MainTexture.clBevelShade);
-  Corner(Canvas,x0+1,y0+1,0,MainTexture);
-  Corner(Canvas,x1-9,y0+1,1,MainTexture);
-  Corner(Canvas,x0+1,y1-9,2,MainTexture);
-  Corner(Canvas,x1-9,y1-9,3,MainTexture);
+  procedure CornerFrame(x0, y0, x1, y1: integer);
+  begin
+    Frame(Canvas, x0 + 1, y0 + 1, x1 - 2, y1 - 2, MainTexture.clBevelLight,
+      MainTexture.clBevelShade);
+    Frame(Canvas, x0 + 2, y0 + 2, x1 - 3, y1 - 3, MainTexture.clBevelLight,
+      MainTexture.clBevelShade);
+    Corner(Canvas, x0 + 1, y0 + 1, 0, MainTexture);
+    Corner(Canvas, x1 - 9, y0 + 1, 1, MainTexture);
+    Corner(Canvas, x0 + 1, y1 - 9, 2, MainTexture);
+    Corner(Canvas, x1 - 9, y1 - 9, 3, MainTexture);
   end;
 
 var
-i,l,FrameTop,FrameBottom,InnerBottom,Cut,xTexOffset,yTexOffset: integer;
-R: TRect;
-begin
-if not TexOverride then
-  begin
-  if (FWindowMode=wmModal) and ModalIndication then MainTexture:=MainTexture
-  else MainTexture:=MainTexture;
-  MainTexture:=MainTexture
-  end;
-Canvas.Font.Assign(UniFont[ftCaption]);
-l:=BiColorTextWidth(Canvas,Caption);
-Cut:=(ClientWidth-l) div 2;
-xTexOffset:=(wMaintexture-ClientWidth) div 2;
-yTexOffset:=(hMaintexture-ClientHeight) div 2;
-if WideBottom then InnerBottom:=ClientHeight-WideFrame
-else InnerBottom:=ClientHeight-NarrowFrame;
-if FullCaption then begin FrameTop:=0; FrameBottom:=ClientHeight end
-else
-  begin
-  FrameTop:=TitleHeight-NarrowFrame;
-  if WideBottom then FrameBottom:=ClientHeight-(WideFrame-NarrowFrame)
-  else FrameBottom:=ClientHeight
-  end;
-Fill(Canvas,3,InnerBottom+1,ClientWidth-6,ClientHeight-InnerBottom-4,
-  xTexOffset,yTexOffset);
-Fill(Canvas,3,TitleHeight-2,SideFrame-3,InnerBottom-TitleHeight+4,
-  xTexOffset,yTexOffset);
-Fill(Canvas,ClientWidth-SideFrame,TitleHeight-2,SideFrame-3,
-  InnerBottom-TitleHeight+4,xTexOffset,yTexOffset);
-Frame(Canvas,0,FrameTop,ClientWidth-1,FrameBottom-1,0,0);
-Frame(Canvas,SideFrame-1,TitleHeight-1,ClientWidth-SideFrame,
-  InnerBottom,MainTexture.clBevelShade,MainTexture.clBevelLight);
-//RFrame(Canvas,SideFrame-2,TitleHeight-2,ClientWidth-SideFrame+1,
-//  InnerBottom+1,MainTexture.clBevelShade,MainTexture.clBevelLight);
-if FullCaption then
-  begin
-  if (FWindowMode<>wmModal) or not ModalIndication then
-    begin
-    Fill(Canvas,3,3+FrameTop,ClientWidth-6,TitleHeight-FrameTop-4,
-      xTexOffset,yTexOffset);
-    CornerFrame(0,FrameTop,ClientWidth,FrameBottom);
+  i, l, FrameTop, FrameBottom, InnerBottom, Cut, xTexOffset,
+    yTexOffset: integer;
+  R: TRect;
+begin
+  if not TexOverride then
+  begin
+    if (FWindowMode = wmModal) and ModalIndication then
+      MainTexture := MainTexture
+    else
+      MainTexture := MainTexture;
+    MainTexture := MainTexture
+  end;
+  Canvas.Font.Assign(UniFont[ftCaption]);
+  l := BiColorTextWidth(Canvas, Caption);
+  Cut := (ClientWidth - l) div 2;
+  xTexOffset := (wMaintexture - ClientWidth) div 2;
+  yTexOffset := (hMaintexture - ClientHeight) div 2;
+  if WideBottom then
+    InnerBottom := ClientHeight - WideFrame
+  else
+    InnerBottom := ClientHeight - NarrowFrame;
+  if FullCaption then
+  begin
+    FrameTop := 0;
+    FrameBottom := ClientHeight
+  end
+  else
+  begin
+    FrameTop := TitleHeight - NarrowFrame;
+    if WideBottom then
+      FrameBottom := ClientHeight - (WideFrame - NarrowFrame)
+    else
+      FrameBottom := ClientHeight
+  end;
+  Fill(Canvas, 3, InnerBottom + 1, ClientWidth - 6, ClientHeight - InnerBottom -
+    4, xTexOffset, yTexOffset);
+  Fill(Canvas, 3, TitleHeight - 2, SideFrame - 3, InnerBottom - TitleHeight + 4,
+    xTexOffset, yTexOffset);
+  Fill(Canvas, ClientWidth - SideFrame, TitleHeight - 2, SideFrame - 3,
+    InnerBottom - TitleHeight + 4, xTexOffset, yTexOffset);
+  Frame(Canvas, 0, FrameTop, ClientWidth - 1, FrameBottom - 1, 0, 0);
+  Frame(Canvas, SideFrame - 1, TitleHeight - 1, ClientWidth - SideFrame,
+    InnerBottom, MainTexture.clBevelShade, MainTexture.clBevelLight);
+  // RFrame(Canvas,SideFrame-2,TitleHeight-2,ClientWidth-SideFrame+1,
+  // InnerBottom+1,MainTexture.clBevelShade,MainTexture.clBevelLight);
+  if FullCaption then
+  begin
+    if (FWindowMode <> wmModal) or not ModalIndication then
+    begin
+      Fill(Canvas, 3, 3 + FrameTop, ClientWidth - 6, TitleHeight - FrameTop - 4,
+        xTexOffset, yTexOffset);
+      CornerFrame(0, FrameTop, ClientWidth, FrameBottom);
     end
-  else with Canvas do
-    begin
-    Fill(Canvas,3+ModalFrameIndent,3+FrameTop,ClientWidth-6-2*ModalFrameIndent,
-      TitleHeight-FrameTop-4,xTexOffset,yTexOffset);
-    Fill(Canvas,ClientWidth-3-ModalFrameIndent,3+FrameTop,ModalFrameIndent,
-      TitleHeight-FrameTop-4,xTexOffset,yTexOffset);
-    Fill(Canvas,3,3+FrameTop,ModalFrameIndent,TitleHeight-FrameTop-4,
-      xTexOffset,yTexOffset);
-    CornerFrame(0,FrameTop,ClientWidth,FrameBottom);
-    Pen.Color:=MainTexture.clBevelShade;
-    MoveTo(3+ModalFrameIndent,2); LineTo(3+ModalFrameIndent,TitleHeight);
-    Pen.Color:=MainTexture.clBevelShade;
-    MoveTo(4+ModalFrameIndent,TitleHeight-1);
-    LineTo(ClientWidth-4-ModalFrameIndent,TitleHeight-1);
-    LineTo(ClientWidth-4-ModalFrameIndent,1);
-    Pen.Color:=MainTexture.clBevelLight;
-    MoveTo(ClientWidth-5-ModalFrameIndent,2);
-    LineTo(4+ModalFrameIndent,2);
-    LineTo(4+ModalFrameIndent,TitleHeight);
-    MoveTo(ClientWidth-4-ModalFrameIndent,1);
-    LineTo(3+ModalFrameIndent,1);
-    Pen.Color:=MainTexture.clBevelLight;
-    MoveTo(ClientWidth-3-ModalFrameIndent,3); LineTo(ClientWidth-3-ModalFrameIndent,TitleHeight);
-    end
-  end
-else
-  begin
-  Fill(Canvas,3,3+FrameTop,ClientWidth-6,TitleHeight-FrameTop-4,
-    xTexOffset,yTexOffset);
-  CornerFrame(0,FrameTop,ClientWidth,FrameBottom);
-
-  Frame(Canvas,CaptionLeft,0,ClientWidth-CaptionLeft-1,FrameTop,0,0);
-  Fill(Canvas,CaptionLeft+3,3,ClientWidth-2*(CaptionLeft)-6,TitleHeight-4,
-    xTexOffset,yTexOffset);
-
-  Frame(Canvas,CaptionLeft+1,0+1,
-    ClientWidth-CaptionLeft-2,TitleHeight-1,MainTexture.clBevelLight,MainTexture.clBevelShade);
-  Frame(Canvas,CaptionLeft+2,0+2,
-    ClientWidth-CaptionLeft-3,TitleHeight-1,MainTexture.clBevelLight,MainTexture.clBevelShade);
-  Corner(Canvas,CaptionLeft+1,0+1,0,MainTexture);
-  Corner(Canvas,ClientWidth-CaptionLeft-9,0+1,1,MainTexture);
-
-  with Canvas do
-    begin
-    Pen.Color:=MainTexture.clBevelShade;
-    MoveTo(CaptionLeft+1,FrameTop+2);
-    LineTo(CaptionLeft+1,TitleHeight);
-    Pen.Color:=MainTexture.clBevelLight;
-    MoveTo(ClientWidth-CaptionLeft-2,FrameTop+2);
-    LineTo(ClientWidth-CaptionLeft-2,TitleHeight);
+    else
+      with Canvas do
+      begin
+        Fill(Canvas, 3 + ModalFrameIndent, 3 + FrameTop,
+          ClientWidth - 6 - 2 * ModalFrameIndent, TitleHeight - FrameTop - 4,
+          xTexOffset, yTexOffset);
+        Fill(Canvas, ClientWidth - 3 - ModalFrameIndent, 3 + FrameTop,
+          ModalFrameIndent, TitleHeight - FrameTop - 4, xTexOffset, yTexOffset);
+        Fill(Canvas, 3, 3 + FrameTop, ModalFrameIndent, TitleHeight - FrameTop -
+          4, xTexOffset, yTexOffset);
+        CornerFrame(0, FrameTop, ClientWidth, FrameBottom);
+        Pen.Color := MainTexture.clBevelShade;
+        MoveTo(3 + ModalFrameIndent, 2);
+        LineTo(3 + ModalFrameIndent, TitleHeight);
+        Pen.Color := MainTexture.clBevelShade;
+        MoveTo(4 + ModalFrameIndent, TitleHeight - 1);
+        LineTo(ClientWidth - 4 - ModalFrameIndent, TitleHeight - 1);
+        LineTo(ClientWidth - 4 - ModalFrameIndent, 1);
+        Pen.Color := MainTexture.clBevelLight;
+        MoveTo(ClientWidth - 5 - ModalFrameIndent, 2);
+        LineTo(4 + ModalFrameIndent, 2);
+        LineTo(4 + ModalFrameIndent, TitleHeight);
+        MoveTo(ClientWidth - 4 - ModalFrameIndent, 1);
+        LineTo(3 + ModalFrameIndent, 1);
+        Pen.Color := MainTexture.clBevelLight;
+        MoveTo(ClientWidth - 3 - ModalFrameIndent, 3);
+        LineTo(ClientWidth - 3 - ModalFrameIndent, TitleHeight);
+      end
+  end
+  else
+  begin
+    Fill(Canvas, 3, 3 + FrameTop, ClientWidth - 6, TitleHeight - FrameTop - 4,
+      xTexOffset, yTexOffset);
+    CornerFrame(0, FrameTop, ClientWidth, FrameBottom);
+
+    Frame(Canvas, CaptionLeft, 0, ClientWidth - CaptionLeft - 1,
+      FrameTop, 0, 0);
+    Fill(Canvas, CaptionLeft + 3, 3, ClientWidth - 2 * (CaptionLeft) - 6,
+      TitleHeight - 4, xTexOffset, yTexOffset);
+
+    Frame(Canvas, CaptionLeft + 1, 0 + 1, ClientWidth - CaptionLeft - 2,
+      TitleHeight - 1, MainTexture.clBevelLight, MainTexture.clBevelShade);
+    Frame(Canvas, CaptionLeft + 2, 0 + 2, ClientWidth - CaptionLeft - 3,
+      TitleHeight - 1, MainTexture.clBevelLight, MainTexture.clBevelShade);
+    Corner(Canvas, CaptionLeft + 1, 0 + 1, 0, MainTexture);
+    Corner(Canvas, ClientWidth - CaptionLeft - 9, 0 + 1, 1, MainTexture);
+
+    with Canvas do
+    begin
+      Pen.Color := MainTexture.clBevelShade;
+      MoveTo(CaptionLeft + 1, FrameTop + 2);
+      LineTo(CaptionLeft + 1, TitleHeight);
+      Pen.Color := MainTexture.clBevelLight;
+      MoveTo(ClientWidth - CaptionLeft - 2, FrameTop + 2);
+      LineTo(ClientWidth - CaptionLeft - 2, TitleHeight);
     end;
-  if WideBottom then
-    begin
-    Frame(Canvas,CaptionLeft,FrameBottom,ClientWidth-CaptionLeft-1,ClientHeight-1,0,0);
-    Fill(Canvas,CaptionLeft+3,ClientHeight-3-(WideFrame-5),
-      ClientWidth-2*(CaptionLeft)-6,WideFrame-5,xTexOffset,yTexOffset);
-    Frame(Canvas,CaptionLeft+1,ClientHeight-WideFrame-1+1,
-      ClientWidth-CaptionLeft-2,ClientHeight-2,MainTexture.clBevelLight,MainTexture.clBevelShade);
-    Frame(Canvas,CaptionLeft+2,ClientHeight-WideFrame-1+1,
-      ClientWidth-CaptionLeft-3,ClientHeight-3,MainTexture.clBevelLight,MainTexture.clBevelShade);
-    Corner(Canvas,CaptionLeft+1,ClientHeight-9,2,MainTexture);
-    Corner(Canvas,ClientWidth-CaptionLeft-9,ClientHeight-9,3,MainTexture);
-
-    with Canvas do
+    if WideBottom then
+    begin
+      Frame(Canvas, CaptionLeft, FrameBottom, ClientWidth - CaptionLeft - 1,
+        ClientHeight - 1, 0, 0);
+      Fill(Canvas, CaptionLeft + 3, ClientHeight - 3 - (WideFrame - 5),
+        ClientWidth - 2 * (CaptionLeft) - 6, WideFrame - 5, xTexOffset,
+        yTexOffset);
+      Frame(Canvas, CaptionLeft + 1, ClientHeight - WideFrame - 1 + 1,
+        ClientWidth - CaptionLeft - 2, ClientHeight - 2,
+        MainTexture.clBevelLight, MainTexture.clBevelShade);
+      Frame(Canvas, CaptionLeft + 2, ClientHeight - WideFrame - 1 + 1,
+        ClientWidth - CaptionLeft - 3, ClientHeight - 3,
+        MainTexture.clBevelLight, MainTexture.clBevelShade);
+      Corner(Canvas, CaptionLeft + 1, ClientHeight - 9, 2, MainTexture);
+      Corner(Canvas, ClientWidth - CaptionLeft - 9, ClientHeight - 9, 3,
+        MainTexture);
+
+      with Canvas do
       begin
-      Pen.Color:=MainTexture.clBevelShade;
-      MoveTo(CaptionLeft+1,ClientHeight-WideFrame);
-      LineTo(CaptionLeft+1,FrameBottom-2);
-      Pen.Color:=MainTexture.clBevelLight;
-      MoveTo(ClientWidth-CaptionLeft-2,ClientHeight-WideFrame);
-      LineTo(ClientWidth-CaptionLeft-2,FrameBottom-2);
+        Pen.Color := MainTexture.clBevelShade;
+        MoveTo(CaptionLeft + 1, ClientHeight - WideFrame);
+        LineTo(CaptionLeft + 1, FrameBottom - 2);
+        Pen.Color := MainTexture.clBevelLight;
+        MoveTo(ClientWidth - CaptionLeft - 2, ClientHeight - WideFrame);
+        LineTo(ClientWidth - CaptionLeft - 2, FrameBottom - 2);
       end;
     end
   end;
-RisedTextOut(Canvas,Cut-1,7,Caption);
-
-for i:=0 to ControlCount-1 do
-  if Controls[i].Visible and (Controls[i] is TButtonBase) then
-    begin
-    R:=Controls[i].BoundsRect;
-    if (R.Bottom<=TitleHeight) or (R.Top>=InnerBottom) then
-      BtnFrame(Canvas,R,MainTexture);
+  RisedTextOut(Canvas, Cut - 1, 7, Caption);
+
+  for i := 0 to ControlCount - 1 do
+    if Controls[i].Visible and (Controls[i] is TButtonBase) then
+    begin
+      R := Controls[i].BoundsRect;
+      if (R.Bottom <= TitleHeight) or (R.Top >= InnerBottom) then
+        BtnFrame(Canvas, R, MainTexture);
     end;
 
-BitBlt(Canvas.Handle,SideFrame,TitleHeight,ClientWidth-2*SideFrame,
-  InnerBottom-TitleHeight,offscreen.Canvas.Handle,0,0,SRCCOPY);
+  BitBlt(Canvas.Handle, SideFrame, TitleHeight, ClientWidth - 2 * SideFrame,
+    InnerBottom - TitleHeight, Offscreen.Canvas.Handle, 0, 0, SRCCOPY);
 end;
 
 procedure TFramedDlg.InitWindowRegion;
 var
-r0,r1: HRgn;
-begin
-if FullCaption then exit;
-r0:=CreateRectRgn(0,0,ClientWidth,ClientHeight);
-r1:=CreateRectRgn(0,0,CaptionLeft,TitleHeight-NarrowFrame);
-CombineRgn(r0,r0,r1,RGN_DIFF);
-//DeleteObject(r1);
-r1:=CreateRectRgn(ClientWidth-CaptionLeft,0,ClientWidth,TitleHeight-NarrowFrame);
-CombineRgn(r0,r0,r1,RGN_DIFF);
-//DeleteObject(r1);
-if WideBottom then
-  begin
-  r1:=CreateRectRgn(0,ClientHeight-(WideFrame-NarrowFrame),CaptionLeft,
-    ClientHeight);
-  CombineRgn(r0,r0,r1,RGN_DIFF);
-  //DeleteObject(r1);
-  r1:=CreateRectRgn(ClientWidth-CaptionLeft,
-    ClientHeight-(WideFrame-NarrowFrame),ClientWidth,ClientHeight);
-  CombineRgn(r0,r0,r1,RGN_DIFF);
-  //DeleteObject(r1);
-  end;
-SetWindowRgn(Handle,r0,false);
-//DeleteObject(r0); // causes crash with Windows 95
-end;
-
-procedure TFramedDlg.FillOffscreen(Left,Top,Width,Height: integer);
-begin
-Fill(Offscreen.Canvas,Left,Top,Width,Height,SideFrame+(wMaintexture-ClientWidth) div 2,
-  TitleHeight+(hMaintexture-ClientHeight) div 2);
-end;
-
+  r0, r1: HRgn;
+begin
+  if FullCaption then
+    exit;
+  r0 := CreateRectRgn(0, 0, ClientWidth, ClientHeight);
+  r1 := CreateRectRgn(0, 0, CaptionLeft, TitleHeight - NarrowFrame);
+  CombineRgn(r0, r0, r1, RGN_DIFF);
+  // DeleteObject(r1);
+  r1 := CreateRectRgn(ClientWidth - CaptionLeft, 0, ClientWidth,
+    TitleHeight - NarrowFrame);
+  CombineRgn(r0, r0, r1, RGN_DIFF);
+  // DeleteObject(r1);
+  if WideBottom then
+  begin
+    r1 := CreateRectRgn(0, ClientHeight - (WideFrame - NarrowFrame),
+      CaptionLeft, ClientHeight);
+    CombineRgn(r0, r0, r1, RGN_DIFF);
+    // DeleteObject(r1);
+    r1 := CreateRectRgn(ClientWidth - CaptionLeft,
+      ClientHeight - (WideFrame - NarrowFrame), ClientWidth, ClientHeight);
+    CombineRgn(r0, r0, r1, RGN_DIFF);
+    // DeleteObject(r1);
+  end;
+  SetWindowRgn(Handle, r0, false);
+  // DeleteObject(r0); // causes crash with Windows 95
+end;
+
+procedure TFramedDlg.FillOffscreen(Left, Top, Width, Height: integer);
+begin
+  Fill(Offscreen.Canvas, Left, Top, Width, Height,
+    SideFrame + (wMaintexture - ClientWidth) div 2,
+    TitleHeight + (hMaintexture - ClientHeight) div 2);
+end;
 
 procedure CreateOffscreen;
 begin
-if OffScreen<>nil then exit;
-offscreen:=TBitmap.Create;
-Offscreen.PixelFormat:=pf24bit;
-offscreen.Width:=Screen.Width;
-if Screen.Height-yUnused<480 then offscreen.Height:=480
-else offscreen.Height:=Screen.Height-yUnused;
-offscreen.Canvas.Brush.Style:=bsClear;
-end;
-
+  if Offscreen <> nil then
+    exit;
+  Offscreen := TBitmap.Create;
+  Offscreen.PixelFormat := pf24bit;
+  Offscreen.Width := Screen.Width;
+  if Screen.Height - yUnused < 480 then
+    Offscreen.Height := 480
+  else
+    Offscreen.Height := Screen.Height - yUnused;
+  Offscreen.Canvas.Brush.Style := bsClear;
+end;
 
 initialization
-offscreen:=nil;
-OffscreenUser:=nil;
+
+Offscreen := nil;
+OffscreenUser := nil;
 
 finalization
-offscreen.Free;
+
+Offscreen.Free;
 
 end.
-

trunk/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools,Protocol,Messg,ButtonBase, ButtonA,
+  ScreenTools, Protocol, Messg, ButtonBase, ButtonA,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms;
@@ -17 +17 @@
       Shift: TShiftState; X, Y: Integer);
     procedure FormDeactivate(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -24 +23 @@
     procedure CancelBtnClick(Sender: TObject);
   public
-    uix,ToLoc: integer;
+    uix, ToLoc: Integer;
     Forecast: TBattleForecastEx;
     IsSuicideQuery: boolean;
@@ -32 +31 @@
   BattleDlg: TBattleDlg;
 
-procedure PaintBattleOutcome(ca: TCanvas; xm,ym,uix,ToLoc: integer;
+procedure PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
   Forecast: TBattleForecastEx);
 
-
 implementation
 
 uses
-Term,ClientTools,IsoEngine;
+  Term, ClientTools, IsoEngine;
 
 {$R *.DFM}
 
 const
-Border=3;
-MessageLineSpacing=20;
-
-DamageColor=$0000E0;
-FanaticColor=$800080;
-FirstStrikeColor=$A0A0A0;
-
-
-procedure PaintBattleOutcome(ca: TCanvas; xm,ym,uix,ToLoc: integer;
+  Border = 3;
+  MessageLineSpacing = 20;
+
+  DamageColor = $0000E0;
+  FanaticColor = $800080;
+  FirstStrikeColor = $A0A0A0;
+
+procedure PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
   Forecast: TBattleForecastEx);
 var
-euix,ADamage,DDamage,StrMax,DamageMax,MaxBar,LAStr,LDStr,
-  LADamage,LDDamage,LABaseDamage,LAAvoidedDamage,LDBaseDamage: integer;
-//TerrType: Cardinal;
-UnitInfo: TUnitInfo;
-TextSize: TSize;
-LabelText: string;
-FirstStrike: boolean;
-begin
-MaxBar:=65;
-
-//TerrType:=MyMap[ToLoc] and fTerrain;
-GetUnitInfo(ToLoc,euix,UnitInfo);
-
-FirstStrike:=(MyModel[MyUn[uix].mix].Cap[mcFirst]>0)
-  and (Forecast.DBaseDamage>=UnitInfo.Health);
-ADamage:=MyUn[uix].Health-Forecast.EndHealthAtt;
-if FirstStrike then
-  ADamage:=ADamage+Forecast.ABaseDamage div 2;
-DDamage:=UnitInfo.Health-Forecast.EndHealthDef;
-if Forecast.AStr>Forecast.DStr then
-  StrMax:=Forecast.AStr
-else StrMax:=Forecast.DStr;
-if ADamage>DDamage then
-  DamageMax:=ADamage
-else DamageMax:=DDamage;
-if Forecast.ABaseDamage>Forecast.DBaseDamage then
-  StrMax:=StrMax*DamageMax div Forecast.ABaseDamage
-else StrMax:=StrMax*DamageMax div Forecast.DBaseDamage;
-
-LAStr:=Forecast.AStr*MaxBar div StrMax;
-LDStr:=Forecast.DStr*MaxBar div StrMax;
-LADamage:=ADamage*MaxBar div DamageMax;
-LABaseDamage:=Forecast.ABaseDamage*MaxBar div DamageMax;
-if FirstStrike then
-  LAAvoidedDamage:=LABaseDamage div 2
-else LAAvoidedDamage:=0;
-LDDamage:=DDamage*MaxBar div DamageMax;
-LDBaseDamage:=Forecast.DBaseDamage*MaxBar div DamageMax;
-
-DarkGradient(ca,xm-8-LAStr,ym-8,LAStr,2);
-VDarkGradient(ca,xm-8,ym-8-LDStr,LDStr,2);
-LightGradient(ca,xm+8,ym-8,LDBaseDamage,DamageColor);
-if LDDamage>LDBaseDamage then
-  LightGradient(ca,xm+8+LDBaseDamage,ym-8,LDDamage-LDBaseDamage,FanaticColor);
-if LAAvoidedDamage>0 then
-  VLightGradient(ca,xm-8,ym+8,LAAvoidedDamage,FirstStrikeColor);
-VLightGradient(ca,xm-8,ym+8+LAAvoidedDamage,LABaseDamage-LAAvoidedDamage,
-  DamageColor);
-if LADamage>LABaseDamage then
-  VLightGradient(ca,xm-8,ym+8+LABaseDamage,LADamage-LABaseDamage,FanaticColor);
-BitBlt(ca.Handle,xm-12,ym-12,24,24,
-  GrExt[HGrSystem].Mask.Canvas.Handle,26,146,SRCAND);
-BitBlt(ca.Handle,xm-12,ym-12,24,24,
-  GrExt[HGrSystem].Data.Canvas.Handle,26,146,SRCPAINT);
-
-LabelText:=Format('%d', [Forecast.AStr]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cx div 2+2>LAStr div 2 then
-  RisedTextOut(ca,xm-10-TextSize.cx,ym-(TextSize.cy+1) div 2, LabelText)
-else RisedTextOut(ca,xm-8-(LAStr+TextSize.cx) div 2,ym-(TextSize.cy+1) div 2, LabelText);
-
-LabelText:=Format('%d', [Forecast.DStr]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cy div 2>LDStr div 2 then
-  RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym-8-TextSize.cy,LabelText)
-else RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym-8-(LDStr+TextSize.cy) div 2,LabelText);
-
-if Forecast.EndHealthDef<=0 then
-  begin
-  BitBlt(ca.Handle,xm+9+LDDamage-7,ym-6,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm+8+LDDamage-7,ym-7,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm+8+LDDamage-7,ym-7,14,17,
-    GrExt[HGrSystem].Data.Canvas.Handle,51,153,SRCPAINT);
-  end;
-LabelText:=Format('%d', [DDamage]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cx div 2+2>LDDamage div 2 then
-  begin
-  if Forecast.EndHealthDef>0 then
-    RisedTextOut(ca,xm+10,ym-(TextSize.cy+1) div 2, LabelText)
-  end
-else RisedTextOut(ca,xm+8+(LDDamage-TextSize.cx) div 2,ym-(TextSize.cy+1) div 2, LabelText);
-
-if Forecast.EndHealthAtt<=0 then
-  begin
-  BitBlt(ca.Handle,xm-6,ym+9+LADamage-7,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm-7,ym+8+LADamage-7,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm-7,ym+8+LADamage-7,14,17,
-    GrExt[HGrSystem].Data.Canvas.Handle,51,153,SRCPAINT);
-  end;
-LabelText:=Format('%d', [MyUn[uix].Health-Forecast.EndHealthAtt]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cy div 2>(LADamage-LAAvoidedDamage) div 2+LAAvoidedDamage then
-  begin
-  if Forecast.EndHealthAtt>0 then
-    RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym+8+LAAvoidedDamage,LabelText)
-  end
-else RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym+8+LAAvoidedDamage+(LADamage-LAAvoidedDamage-TextSize.cy) div 2,LabelText);
-
-NoMap.SetOutput(Buffer);
-BitBlt(Buffer.Canvas.Handle,0,0,66,48,ca.Handle,xm+8+4,ym-8-12-48,SRCCOPY);
-{if TerrType<fForest then
-  Sprite(Buffer,HGrTerrain,0,16,66,32,1+TerrType*(xxt*2+1),1+yyt)
-else
-  begin
-  Sprite(Buffer,HGrTerrain,0,16,66,32,1+2*(xxt*2+1),1+yyt+2*(yyt*3+1));
-  if (TerrType=fForest) and IsJungle(ToLoc div G.lx) then
+  euix, ADamage, DDamage, StrMax, DamageMax, MaxBar, LAStr, LDStr, LADamage,
+    LDDamage, LABaseDamage, LAAvoidedDamage, LDBaseDamage: Integer;
+  // TerrType: Cardinal;
+  UnitInfo: TUnitInfo;
+  TextSize: TSize;
+  LabelText: string;
+  FirstStrike: boolean;
+begin
+  MaxBar := 65;
+
+  // TerrType:=MyMap[ToLoc] and fTerrain;
+  GetUnitInfo(ToLoc, euix, UnitInfo);
+
+  FirstStrike := (MyModel[MyUn[uix].mix].Cap[mcFirst] > 0) and
+    (Forecast.DBaseDamage >= UnitInfo.Health);
+  ADamage := MyUn[uix].Health - Forecast.EndHealthAtt;
+  if FirstStrike then
+    ADamage := ADamage + Forecast.ABaseDamage div 2;
+  DDamage := UnitInfo.Health - Forecast.EndHealthDef;
+  if Forecast.AStr > Forecast.DStr then
+    StrMax := Forecast.AStr
+  else
+    StrMax := Forecast.DStr;
+  if ADamage > DDamage then
+    DamageMax := ADamage
+  else
+    DamageMax := DDamage;
+  if Forecast.ABaseDamage > Forecast.DBaseDamage then
+    StrMax := StrMax * DamageMax div Forecast.ABaseDamage
+  else
+    StrMax := StrMax * DamageMax div Forecast.DBaseDamage;
+
+  LAStr := Forecast.AStr * MaxBar div StrMax;
+  LDStr := Forecast.DStr * MaxBar div StrMax;
+  LADamage := ADamage * MaxBar div DamageMax;
+  LABaseDamage := Forecast.ABaseDamage * MaxBar div DamageMax;
+  if FirstStrike then
+    LAAvoidedDamage := LABaseDamage div 2
+  else
+    LAAvoidedDamage := 0;
+  LDDamage := DDamage * MaxBar div DamageMax;
+  LDBaseDamage := Forecast.DBaseDamage * MaxBar div DamageMax;
+
+  DarkGradient(ca, xm - 8 - LAStr, ym - 8, LAStr, 2);
+  VDarkGradient(ca, xm - 8, ym - 8 - LDStr, LDStr, 2);
+  LightGradient(ca, xm + 8, ym - 8, LDBaseDamage, DamageColor);
+  if LDDamage > LDBaseDamage then
+    LightGradient(ca, xm + 8 + LDBaseDamage, ym - 8, LDDamage - LDBaseDamage,
+      FanaticColor);
+  if LAAvoidedDamage > 0 then
+    VLightGradient(ca, xm - 8, ym + 8, LAAvoidedDamage, FirstStrikeColor);
+  VLightGradient(ca, xm - 8, ym + 8 + LAAvoidedDamage,
+    LABaseDamage - LAAvoidedDamage, DamageColor);
+  if LADamage > LABaseDamage then
+    VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
+      FanaticColor);
+  BitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Mask.Canvas.Handle, 26, 146, SRCAND);
+  BitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Data.Canvas.Handle, 26, 146, SRCPAINT);
+
+  LabelText := Format('%d', [Forecast.AStr]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cx div 2 + 2 > LAStr div 2 then
+    RisedTextOut(ca, xm - 10 - TextSize.cx, ym - (TextSize.cy + 1) div 2,
+      LabelText)
+  else
+    RisedTextOut(ca, xm - 8 - (LAStr + TextSize.cx) div 2,
+      ym - (TextSize.cy + 1) div 2, LabelText);
+
+  LabelText := Format('%d', [Forecast.DStr]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cy div 2 > LDStr div 2 then
+    RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym - 8 - TextSize.cy,
+      LabelText)
+  else
+    RisedTextOut(ca, xm - (TextSize.cx + 1) div 2,
+      ym - 8 - (LDStr + TextSize.cy) div 2, LabelText);
+
+  if Forecast.EndHealthDef <= 0 then
+  begin
+    BitBlt(ca.Handle, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+  end;
+  LabelText := Format('%d', [DDamage]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cx div 2 + 2 > LDDamage div 2 then
+  begin
+    if Forecast.EndHealthDef > 0 then
+      RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText)
+  end
+  else
+    RisedTextOut(ca, xm + 8 + (LDDamage - TextSize.cx) div 2,
+      ym - (TextSize.cy + 1) div 2, LabelText);
+
+  if Forecast.EndHealthAtt <= 0 then
+  begin
+    BitBlt(ca.Handle, xm - 6, ym + 9 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+  end;
+  LabelText := Format('%d', [MyUn[uix].Health - Forecast.EndHealthAtt]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cy div 2 > (LADamage - LAAvoidedDamage) div 2 + LAAvoidedDamage
+  then
+  begin
+    if Forecast.EndHealthAtt > 0 then
+      RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym + 8 + LAAvoidedDamage,
+        LabelText)
+  end
+  else
+    RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym + 8 + LAAvoidedDamage +
+      (LADamage - LAAvoidedDamage - TextSize.cy) div 2, LabelText);
+
+  NoMap.SetOutput(Buffer);
+  BitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm + 8 + 4,
+    ym - 8 - 12 - 48, SRCCOPY);
+  { if TerrType<fForest then
+    Sprite(Buffer,HGrTerrain,0,16,66,32,1+TerrType*(xxt*2+1),1+yyt)
+    else
+    begin
+    Sprite(Buffer,HGrTerrain,0,16,66,32,1+2*(xxt*2+1),1+yyt+2*(yyt*3+1));
+    if (TerrType=fForest) and IsJungle(ToLoc div G.lx) then
     Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+19*(yyt*3+1))
-  else Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+2*(2+TerrType-fForest)*(yyt*3+1));
-  end;}
-NoMap.PaintUnit(1,0,UnitInfo,0);
-BitBlt(ca.Handle,xm+8+4,ym-8-12-48,66,48,Buffer.Canvas.Handle,0,0,SRCCOPY);
-
-BitBlt(Buffer.Canvas.Handle,0,0,66,48,ca.Handle,xm-8-4-66,ym+8+12,SRCCOPY);
-MakeUnitInfo(me,MyUn[uix],UnitInfo);
-UnitInfo.Flags:=UnitInfo.Flags and not unFortified;
-NoMap.PaintUnit(1,0,UnitInfo,0);
-BitBlt(ca.Handle,xm-8-4-66,ym+8+12,66,48,Buffer.Canvas.Handle,0,0,SRCCOPY);
-end; {PaintBattleOutcome}
-
+    else Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+2*(2+TerrType-fForest)*(yyt*3+1));
+    end; }
+  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  BitBlt(ca.Handle, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas.Handle,
+    0, 0, SRCCOPY);
+
+  BitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm - 8 - 4 - 66,
+    ym + 8 + 12, SRCCOPY);
+  MakeUnitInfo(me, MyUn[uix], UnitInfo);
+  UnitInfo.Flags := UnitInfo.Flags and not unFortified;
+  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  BitBlt(ca.Handle, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas.Handle,
+    0, 0, SRCCOPY);
+end; { PaintBattleOutcome }
 
 procedure TBattleDlg.FormCreate(Sender: TObject);
 begin
-OKBtn.Caption:=Phrases.Lookup('BTN_YES');
-CancelBtn.Caption:=Phrases.Lookup('BTN_NO');
-InitButtons();
+  OKBtn.Caption := Phrases.Lookup('BTN_YES');
+  CancelBtn.Caption := Phrases.Lookup('BTN_NO');
+  InitButtons();
 end;
 
 procedure TBattleDlg.FormShow(Sender: TObject);
 begin
-if IsSuicideQuery then
-  begin
-  ClientWidth:=300;
-  ClientHeight:=288;
-  OKBtn.Visible:=true;
-  CancelBtn.Visible:=true;
-  Left:=(Screen.Width-ClientWidth) div 2; // center on screen
-  Top:=(Screen.Height-ClientHeight) div 2;
-  end
-else
-  begin
-  ClientWidth:=178;
-  ClientHeight:=178;
-  OKBtn.Visible:=false;
-  CancelBtn.Visible:=false;
+  if IsSuicideQuery then
+  begin
+    ClientWidth := 300;
+    ClientHeight := 288;
+    OKBtn.Visible := true;
+    CancelBtn.Visible := true;
+    Left := (Screen.Width - ClientWidth) div 2; // center on screen
+    Top := (Screen.Height - ClientHeight) div 2;
+  end
+  else
+  begin
+    ClientWidth := 178;
+    ClientHeight := 178;
+    OKBtn.Visible := false;
+    CancelBtn.Visible := false;
   end;
 end;
@@ -209 +227 @@
 procedure TBattleDlg.FormPaint(Sender: TObject);
 var
-ym,cix,p: integer;
-s,s1: string;
-begin
-with Canvas do
-  begin
-  Brush.Color:=0;
-  FillRect(Rect(0,0,ClientWidth,ClientHeight));
-  Brush.Style:=bsClear;
-  PaintBackground(self,3+Border,3+Border,ClientWidth-(6+2*Border),
-    ClientHeight-(6+2*Border))
-  end;
-Frame(Canvas,Border+1,Border+1,ClientWidth-(2+Border),ClientHeight-(2+Border),
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(Canvas,2+Border,2+Border,ClientWidth-(3+Border),ClientHeight-(3+Border),
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-
-if IsSuicideQuery then
-  begin
-  Canvas.Font.Assign(UniFont[ftCaption]);
-  s:=Phrases.Lookup('TITLE_SUICIDE');
-  RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s)) div 2, 7+Border, s);
-  Canvas.Font.Assign(UniFont[ftNormal]);
-  s:=Phrases.Lookup('SUICIDE');
-  p:=pos('\',s);
-  if p=0 then
-    RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s)) div 2, 205, s)
-  else
+  ym, cix, p: Integer;
+  s, s1: string;
+begin
+  with Canvas do
+  begin
+    Brush.Color := 0;
+    FillRect(Rect(0, 0, ClientWidth, ClientHeight));
+    Brush.Style := bsClear;
+    PaintBackground(self, 3 + Border, 3 + Border,
+      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border))
+  end;
+  Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
+    ClientHeight - (2 + Border), MainTexture.clBevelLight,
+    MainTexture.clBevelShade);
+  Frame(Canvas, 2 + Border, 2 + Border, ClientWidth - (3 + Border),
+    ClientHeight - (3 + Border), MainTexture.clBevelLight,
+    MainTexture.clBevelShade);
+
+  if IsSuicideQuery then
+  begin
+    Canvas.Font.Assign(UniFont[ftCaption]);
+    s := Phrases.Lookup('TITLE_SUICIDE');
+    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
+      7 + Border, s);
+    Canvas.Font.Assign(UniFont[ftNormal]);
+    s := Phrases.Lookup('SUICIDE');
+    p := pos('\', s);
+    if p = 0 then
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
+        div 2, 205, s)
+    else
     begin
-    s1:=copy(s,1,p-1);
-    RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s1)) div 2,
-      205-MessageLineSpacing div 2, s1);
-    s1:=copy(s,p+1,255);
-    RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s1)) div 2,
-      205+(MessageLineSpacing-MessageLineSpacing div 2), s1);
+      s1 := copy(s, 1, p - 1);
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
+        205 - MessageLineSpacing div 2, s1);
+      s1 := copy(s, p + 1, 255);
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
+        205 + (MessageLineSpacing - MessageLineSpacing div 2), s1);
     end;
-  ym:=110
-  end
-else ym:=ClientHeight div 2;
-Canvas.Font.Assign(UniFont[ftSmall]);
-PaintBattleOutcome(Canvas, ClientWidth div 2, ym, uix, ToLoc, Forecast);
-
-for cix:=0 to ControlCount-1 do
-  if (Controls[cix].Visible) and (Controls[cix] is TButtonBase) then
-    BtnFrame(Canvas,Controls[cix].BoundsRect,MainTexture);
+    ym := 110
+  end
+  else
+    ym := ClientHeight div 2;
+  Canvas.Font.Assign(UniFont[ftSmall]);
+  PaintBattleOutcome(Canvas, ClientWidth div 2, ym, uix, ToLoc, Forecast);
+
+  for cix := 0 to ControlCount - 1 do
+    if (Controls[cix].Visible) and (Controls[cix] is TButtonBase) then
+      BtnFrame(Canvas, Controls[cix].BoundsRect, MainTexture);
 end;
 
@@ -258 +281 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-if not IsSuicideQuery then
-  Close;
+  if not IsSuicideQuery then
+    Close;
 end;
 
 procedure TBattleDlg.FormDeactivate(Sender: TObject);
 begin
-if not IsSuicideQuery then
-  Close
+  if not IsSuicideQuery then
+    Close
 end;
 
@@ -271 +294 @@
   Shift: TShiftState);
 begin
-if not IsSuicideQuery and (Key<>VK_SHIFT) then
-  begin
-  Close;
-  MainScreen.Update;
-  if Key<>VK_ESCAPE then
-    MainScreen.FormKeyDown(Sender, Key, Shift);
+  if not IsSuicideQuery and (Key <> VK_SHIFT) then
+  begin
+    Close;
+    MainScreen.Update;
+    if Key <> VK_ESCAPE then
+      MainScreen.FormKeyDown(Sender, Key, Shift);
   end
 end;
@@ -282 +305 @@
 procedure TBattleDlg.OKBtnClick(Sender: TObject);
 begin
-ModalResult:=mrOK;
+  ModalResult := mrOK;
 end;
 
 procedure TBattleDlg.CancelBtnClick(Sender: TObject);
 begin
-ModalResult:=mrCancel;
+  ModalResult := mrCancel;
 end;
 
 end.
-

trunk/LocalPlayer/CityScreen.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit CityScreen;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ClientTools,Term,ScreenTools,IsoEngine,BaseWin,
-
-  Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms,ExtCtrls,ButtonA,
+  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
+
+  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
+  ButtonA,
   ButtonB, ButtonBase, ButtonC, Area;
 
 const
-WM_PLAYSOUND=WM_USER;
+  WM_PLAYSOUND = WM_USER;
 
 type
-  TCityCloseAction=(None, RestoreFocus, StepFocus);
+  TCityCloseAction = (None, RestoreFocus, StepFocus);
 
   TCityDlg = class(TBufferedDrawDlg)
@@ -36 +36 @@
     Pop1Area: TArea;
     SupportArea: TArea;
-    procedure FormCreate(Sender:TObject);
-    procedure FormDestroy(Sender:TObject);
-    procedure FormMouseDown(Sender:TObject;Button:TMouseButton;
-      Shift:TShiftState;x,y:integer);
-    procedure BuyClick(Sender:TObject);
-    procedure CloseBtnClick(Sender:TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    procedure BuyClick(Sender: TObject);
+    procedure CloseBtnClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -48 +48 @@
     procedure NextCityBtnClick(Sender: TObject);
     procedure PrevCityBtnClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
-    //procedure AdviceBtnClick(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    // procedure AdviceBtnClick(Sender: TObject);
     procedure PageUpBtnClick(Sender: TObject);
     procedure PageDownBtnClick(Sender: TObject);
@@ -58 +57 @@
     CloseAction: TCityCloseAction;
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode,Loc: integer; ShowEvent: cardinal);
+    procedure ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
     procedure Reset;
     procedure CheckAge;
@@ -64 +63 @@
   private
     c: TCity;
-    Report:TCityReportNew;
-    cOwner,cGov,
-    emix{enemy model index of produced unit},
-    cix,cLoc,Mode,ZoomArea,Page,PageCount,BlinkTime,OpenSoundEvent,
-      SizeClass,AgePrepared: integer;
-    Optimize_cixTileChange,Optimize_TilesBeforeChange: integer;
+    Report: TCityReportNew;
+    cOwner, cGov, emix { enemy model index of produced unit } , cix, cLoc, Mode,
+      ZoomArea, Page, PageCount, BlinkTime, OpenSoundEvent, SizeClass,
+      AgePrepared: integer;
+    Optimize_cixTileChange, Optimize_TilesBeforeChange: integer;
     Happened: cardinal;
-    imix:array[0..15] of integer;
+    imix: array [0 .. 15] of integer;
     CityAreaInfo: TCityAreaInfo;
     AreaMap: TIsoMap;
-    CityMapTemplate, SmallCityMapTemplate, Back, SmallCityMap, ZoomCityMap, Template: TBitmap;
-    IsPort,ProdHint,AllowChange: boolean;
+    CityMapTemplate, SmallCityMapTemplate, Back, SmallCityMap, ZoomCityMap,
+      Template: TBitmap;
+    IsPort, ProdHint, AllowChange: boolean;
     procedure InitSmallCityMap;
     procedure InitZoomCityMap;
@@ -81 +80 @@
     procedure ChangeCity(d: integer);
     procedure ChangeResourceWeights(iResourceWeights: integer);
-    procedure OnPlaySound(var Msg:TMessage); message WM_PLAYSOUND;
+    procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   end;
 
 var
-  CityDlg:TCityDlg;
+  CityDlg: TCityDlg;
 
 implementation
 
 uses
-  Select,Messg,MessgEx,Help,Inp,Tribes,Directories,
+  Select, Messg, MessgEx, Help, Inp, Tribes, Directories,
 
   Math;
@@ -97 +96 @@
 
 const
-{modes}
-mSupp=1; mImp=2;
-
-wBar=106;
-xDiv=400; xService=296;
-xmArea=197; ymArea=170;
-xView=326; yView=275;
-dxBar=wBar+12; dyBar=39;
-xHapp=404; yHapp=9;
-xFood=404; yFood=yHapp+3*dyBar+6;
-xProd=404; yProd=yFood+3*dyBar+6;
-xTrade=404; yTrade=yProd+2*dyBar+22;
-xPoll=xmArea-186; yPoll=ymArea+64;
-xmOpt=40; ymOpt=ymArea+96+34;
-xSmallMap=271; ySmallMap=339; wSmallMap=98; hSmallMap=74;
-xSupport=xSmallMap; ySupport=ySmallmap+hSmallmap+2; wSupport=64; hSupport=18;
-xZoomMap=34; yZoomMap=338; wZoomMap=228; hZoomMap=124; wZoomEnvironment=68;
-
-ImpPosition: array[28..nImp-1] of integer=
-(-1, //imTrGoods
-21, //imBarracks
-6, //imGranary
-1, //imTemple
-7, //imMarket
-14, //imLibrary
-8, //imCourt
-18, //imWalls
-10, //imAqueduct
-11, //imBank
-5, //imCathedral
-13, //imUniversity
-29, //imHarbor
-2, //imTheater
-24, //imFactory
-25, //imMfgPlant
-28, //imRecycling
-27, //imPower
-27, //imHydro
-27, //imNuclear
-26, //imPlatform
-8, //imTownHall
-10, //imSewer
-3, //imSupermarket
-17, //imHighways
-15, //imResLab
-19, //imMissileBat
-23, //imCoastalFort
-22, //imAirport
-20, //imDockyard
-8, //imPalace
--1, //imGrWall
-4, //imColosseum
-16, //imObservatory
-21, //imMilAcademy
--1, //imBunker
--1, //imAlgae
-9, //imStockEx
--1, //imSpacePort
--1, //imShipComp
--1, //imShipPow
--1); //imShipHab
-
+  { modes }
+  mSupp = 1;
+  mImp = 2;
+
+  wBar = 106;
+  xDiv = 400;
+  xService = 296;
+  xmArea = 197;
+  ymArea = 170;
+  xView = 326;
+  yView = 275;
+  dxBar = wBar + 12;
+  dyBar = 39;
+  xHapp = 404;
+  yHapp = 9;
+  xFood = 404;
+  yFood = yHapp + 3 * dyBar + 6;
+  xProd = 404;
+  yProd = yFood + 3 * dyBar + 6;
+  xTrade = 404;
+  yTrade = yProd + 2 * dyBar + 22;
+  xPoll = xmArea - 186;
+  yPoll = ymArea + 64;
+  xmOpt = 40;
+  ymOpt = ymArea + 96 + 34;
+  xSmallMap = 271;
+  ySmallMap = 339;
+  wSmallMap = 98;
+  hSmallMap = 74;
+  xSupport = xSmallMap;
+  ySupport = ySmallMap + hSmallMap + 2;
+  wSupport = 64;
+  hSupport = 18;
+  xZoomMap = 34;
+  yZoomMap = 338;
+  wZoomMap = 228;
+  hZoomMap = 124;
+  wZoomEnvironment = 68;
+
+  ImpPosition: array [28 .. nImp - 1] of integer = (-1, // imTrGoods
+    21, // imBarracks
+    6, // imGranary
+    1, // imTemple
+    7, // imMarket
+    14, // imLibrary
+    8, // imCourt
+    18, // imWalls
+    10, // imAqueduct
+    11, // imBank
+    5, // imCathedral
+    13, // imUniversity
+    29, // imHarbor
+    2, // imTheater
+    24, // imFactory
+    25, // imMfgPlant
+    28, // imRecycling
+    27, // imPower
+    27, // imHydro
+    27, // imNuclear
+    26, // imPlatform
+    8, // imTownHall
+    10, // imSewer
+    3, // imSupermarket
+    17, // imHighways
+    15, // imResLab
+    19, // imMissileBat
+    23, // imCoastalFort
+    22, // imAirport
+    20, // imDockyard
+    8, // imPalace
+    -1, // imGrWall
+    4, // imColosseum
+    16, // imObservatory
+    21, // imMilAcademy
+    -1, // imBunker
+    -1, // imAlgae
+    9, // imStockEx
+    -1, // imSpacePort
+    -1, // imShipComp
+    -1, // imShipPow
+    -1); // imShipHab
 
 var
-ImpSorted: array[0..nImp-1] of integer;
-
-
-procedure TCityDlg.FormCreate(Sender:TObject);
-begin
-inherited;
-AreaMap:=TIsoMap.Create;
-AreaMap.SetOutput(offscreen);
-AreaMap.SetPaintBounds(xmArea-192,ymArea-96-32,xmArea+192,ymArea+96);
-Mode:=mImp;
-ZoomArea:=1;
-ProdHint:=false;
-RestoreUnFocus:=-1;
-OpenSoundEvent:=-1;
-AgePrepared:=-2;
-Optimize_cixTileChange:=-1;
-InitButtons();
-//InitWindowRegion;
-CloseBtn.Caption:=Phrases.Lookup('BTN_OK');
-BuyBtn.Hint:=Phrases.Lookup('BTN_BUY');
-if not Phrases2FallenBackToEnglish then
-  SupportArea.Hint:=Phrases2.Lookup('TIP_SUPUNITS')
-else SupportArea.Hint:=Phrases.Lookup('SUPUNITS');
-if not Phrases2FallenBackToEnglish then
-  begin
-  Pop0Area.Hint:=Phrases2.Lookup('TIP_WORKING');
-  Pop1Area.Hint:=Phrases2.Lookup('TIP_CIVIL');
-  PrimacyArea.Hint:=Phrases2.Lookup('TIP_PRIMACY');
-  ProjectArea.Hint:=Phrases2.Lookup('TIP_PROJECT');
-  end;
-
-Back:=TBitmap.Create;
-Back.PixelFormat:=pf24bit;
-Back.Width:=ClientWidth; Back.Height:=ClientHeight;
-Template:=TBitmap.Create;
-LoadGraphicFile(Template, HomeDir+'Graphics\City', gfNoGamma);
-Template.PixelFormat:=pf8bit;
-CityMapTemplate:=TBitmap.Create;
-LoadGraphicFile(CityMapTemplate, HomeDir+'Graphics\BigCityMap', gfNoGamma);
-CityMapTemplate.PixelFormat:=pf8bit;
-SmallCityMapTemplate:=TBitmap.Create;
-LoadGraphicFile(SmallCityMapTemplate, HomeDir+'Graphics\SmallCityMap', gfNoGamma);
-SmallCityMapTemplate.PixelFormat:=pf24bit;
-SmallCityMap:=TBitmap.Create;
-SmallCityMap.PixelFormat:=pf24bit;
-SmallCityMap.Width:=98; SmallCityMap.Height:=74;
-ZoomCityMap:=TBitmap.Create;
-ZoomCityMap.PixelFormat:=pf24bit;
-ZoomCityMap.Width:=228; ZoomCityMap.Height:=124;
-end;
-
-procedure TCityDlg.FormDestroy(Sender:TObject);
-begin
-AreaMap.Free;
-SmallCityMap.Free;
-ZoomCityMap.Free;
-CityMapTemplate.Free;
-Template.Free;
-Back.Free;
+  ImpSorted: array [0 .. nImp - 1] of integer;
+
+procedure TCityDlg.FormCreate(Sender: TObject);
+begin
+  inherited;
+  AreaMap := TIsoMap.Create;
+  AreaMap.SetOutput(offscreen);
+  AreaMap.SetPaintBounds(xmArea - 192, ymArea - 96 - 32, xmArea + 192,
+    ymArea + 96);
+  Mode := mImp;
+  ZoomArea := 1;
+  ProdHint := false;
+  RestoreUnFocus := -1;
+  OpenSoundEvent := -1;
+  AgePrepared := -2;
+  Optimize_cixTileChange := -1;
+  InitButtons();
+  // InitWindowRegion;
+  CloseBtn.Caption := Phrases.Lookup('BTN_OK');
+  BuyBtn.Hint := Phrases.Lookup('BTN_BUY');
+  if not Phrases2FallenBackToEnglish then
+    SupportArea.Hint := Phrases2.Lookup('TIP_SUPUNITS')
+  else
+    SupportArea.Hint := Phrases.Lookup('SUPUNITS');
+  if not Phrases2FallenBackToEnglish then
+  begin
+    Pop0Area.Hint := Phrases2.Lookup('TIP_WORKING');
+    Pop1Area.Hint := Phrases2.Lookup('TIP_CIVIL');
+    PrimacyArea.Hint := Phrases2.Lookup('TIP_PRIMACY');
+    ProjectArea.Hint := Phrases2.Lookup('TIP_PROJECT');
+  end;
+
+  Back := TBitmap.Create;
+  Back.PixelFormat := pf24bit;
+  Back.Width := ClientWidth;
+  Back.Height := ClientHeight;
+  Template := TBitmap.Create;
+  LoadGraphicFile(Template, HomeDir + 'Graphics\City', gfNoGamma);
+  Template.PixelFormat := pf8bit;
+  CityMapTemplate := TBitmap.Create;
+  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics\BigCityMap', gfNoGamma);
+  CityMapTemplate.PixelFormat := pf8bit;
+  SmallCityMapTemplate := TBitmap.Create;
+  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics\SmallCityMap',
+    gfNoGamma);
+  SmallCityMapTemplate.PixelFormat := pf24bit;
+  SmallCityMap := TBitmap.Create;
+  SmallCityMap.PixelFormat := pf24bit;
+  SmallCityMap.Width := 98;
+  SmallCityMap.Height := 74;
+  ZoomCityMap := TBitmap.Create;
+  ZoomCityMap.PixelFormat := pf24bit;
+  ZoomCityMap.Width := 228;
+  ZoomCityMap.Height := 124;
+end;
+
+procedure TCityDlg.FormDestroy(Sender: TObject);
+begin
+  AreaMap.Free;
+  SmallCityMap.Free;
+  ZoomCityMap.Free;
+  CityMapTemplate.Free;
+  Template.Free;
+  Back.Free;
 end;
 
 procedure TCityDlg.Reset;
 begin
-Mode:=mImp;
-ZoomArea:=1;
+  Mode := mImp;
+  ZoomArea := 1;
 end;
 
 procedure TCityDlg.CheckAge;
 begin
-if MainTextureAge<>AgePrepared then
-  begin
-  AgePrepared:=MainTextureAge;
-  bitblt(Back.Canvas.Handle,0,0,ClientWidth,ClientHeight,
-    MainTexture.Image.Canvas.Handle,0,0,SRCCOPY);
-  ImageOp_B(Back,Template,0,0,0,0,ClientWidth,ClientHeight);
+  if MainTextureAge <> AgePrepared then
+  begin
+    AgePrepared := MainTextureAge;
+    bitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas.Handle, 0, 0, SRCCOPY);
+    ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
   end
 end;
 
-procedure TCityDlg.CloseBtnClick(Sender:TObject);
-begin
-Close
+procedure TCityDlg.CloseBtnClick(Sender: TObject);
+begin
+  Close
 end;
 
 procedure TCityDlg.InitSmallCityMap;
 var
-i,iix,cli1,Color0,Color1,Color2: integer;
-begin
-if cix>=0 then c:=MyCity[cix];
-case MyMap[cLoc] and fTerrain of
-  fPrairie: cli1:=cliPrairie;
-  fHills: cli1:=cliHills;
-  fTundra: cli1:=cliTundra;
-  else cli1:=cliPlains;
-  end;
-Color0:=Colors.Canvas.Pixels[clkAge0+Age,cliRoad];
-Color1:=Colors.Canvas.Pixels[clkCity,cli1];
-Color2:=Colors.Canvas.Pixels[clkAge0+Age,cliHouse];
-BitBlt(SmallCityMap.Canvas.Handle,0,0,83,hSmallMap,SmallCityMapTemplate.Canvas.Handle,83*SizeClass,0,SRCCOPY);
-if IsPort then
-  begin
-  BitBlt(SmallCityMap.Canvas.Handle,83,0,15,hSmallMap,SmallCityMapTemplate.Canvas.Handle,332+15,0,SRCCOPY);
-  ImageOp_CCC(SmallCityMap,0,0,83,hSmallMap,Color0,Color1,Color2);
-  Color2:=Colors.Canvas.Pixels[clkCity,cliWater];
-  ImageOp_CCC(SmallCityMap,83,0,15,hSmallMap,Color0,Color1,Color2);
+  i, iix, cli1, Color0, Color1, Color2: integer;
+begin
+  if cix >= 0 then
+    c := MyCity[cix];
+  case MyMap[cLoc] and fTerrain of
+    fPrairie:
+      cli1 := cliPrairie;
+    fHills:
+      cli1 := cliHills;
+    fTundra:
+      cli1 := cliTundra;
+  else
+    cli1 := cliPlains;
+  end;
+  Color0 := Colors.Canvas.Pixels[clkAge0 + Age, cliRoad];
+  Color1 := Colors.Canvas.Pixels[clkCity, cli1];
+  Color2 := Colors.Canvas.Pixels[clkAge0 + Age, cliHouse];
+  bitblt(SmallCityMap.Canvas.Handle, 0, 0, 83, hSmallMap,
+    SmallCityMapTemplate.Canvas.Handle, 83 * SizeClass, 0, SRCCOPY);
+  if IsPort then
+  begin
+    bitblt(SmallCityMap.Canvas.Handle, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate.Canvas.Handle, 332 + 15, 0, SRCCOPY);
+    ImageOp_CCC(SmallCityMap, 0, 0, 83, hSmallMap, Color0, Color1, Color2);
+    Color2 := Colors.Canvas.Pixels[clkCity, cliWater];
+    ImageOp_CCC(SmallCityMap, 83, 0, 15, hSmallMap, Color0, Color1, Color2);
   end
-else
-  begin
-  BitBlt(SmallCityMap.Canvas.Handle,83,0,15,hSmallMap,SmallCityMapTemplate.Canvas.Handle,332,0,SRCCOPY);
-  ImageOp_CCC(SmallCityMap,0,0,wSmallMap,hSmallMap,Color0,Color1,Color2);
-  end;
-
-with SmallCityMap.canvas do
-  begin
-  brush.Color:=Colors.Canvas.Pixels[clkAge0+Age,cliImp];
-  for i:=0 to 29 do
-    begin
-    for iix:=28 to nImp-1 do
-      if (ImpPosition[iix]=i) and (c.Built[iix]>0) then
+  else
+  begin
+    bitblt(SmallCityMap.Canvas.Handle, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate.Canvas.Handle, 332, 0, SRCCOPY);
+    ImageOp_CCC(SmallCityMap, 0, 0, wSmallMap, hSmallMap, Color0,
+      Color1, Color2);
+  end;
+
+  with SmallCityMap.Canvas do
+  begin
+    brush.Color := Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
+    for i := 0 to 29 do
+    begin
+      for iix := 28 to nImp - 1 do
+        if (ImpPosition[iix] = i) and (c.Built[iix] > 0) then
         begin
-        FillRect(Rect(5+16*(i mod 3)+48*(i div 18), 3+12*(i mod 18 div 3),
-          13+16*(i mod 3)+48*(i div 18), 11+12*(i mod 18 div 3)));
-        break;
+          FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
+            3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
+            11 + 12 * (i mod 18 div 3)));
+          break;
         end
     end;
-  i:=30;
-  for iix:=0 to nImp do
-    if (c.Built[iix]>0) and ((iix<28) or (ImpPosition[iix]<0)) then
+    i := 30;
+    for iix := 0 to nImp do
+      if (c.Built[iix] > 0) and ((iix < 28) or (ImpPosition[iix] < 0)) then
       begin
-      FillRect(Rect(5+16*(i mod 3)+48*(i div 18), 3+12*(i mod 18 div 3),
-        13+16*(i mod 3)+48*(i div 18), 11+12*(i mod 18 div 3)));
-      inc(i);
-      if i=36 then break; // area is full
+        FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
+          3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
+          11 + 12 * (i mod 18 div 3)));
+        inc(i);
+        if i = 36 then
+          break; // area is full
       end;
-  if c.Project and cpImp<>0 then
-    begin
-    iix:=c.Project and cpIndex;
-    if iix<>imTrGoods then
+    if c.Project and cpImp <> 0 then
+    begin
+      iix := c.Project and cpIndex;
+      if iix <> imTrGoods then
       begin
-      if (iix>=28) and (ImpPosition[iix]>=0) then
-        i:=ImpPosition[iix];
-      if i<36 then
+        if (iix >= 28) and (ImpPosition[iix] >= 0) then
+          i := ImpPosition[iix];
+        if i < 36 then
         begin
-        brush.Color:=Colors.Canvas.Pixels[clkAge0+Age,cliImpProject];
-        FillRect(Rect(5+16*(i mod 3)+48*(i div 18), 3+12*(i mod 18 div 3),
-          13+16*(i mod 3)+48*(i div 18), 11+12*(i mod 18 div 3)));
+          brush.Color := Colors.Canvas.Pixels[clkAge0 + Age, cliImpProject];
+          FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
+            3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
+            11 + 12 * (i mod 18 div 3)));
         end
       end
     end;
-  brush.style:=bsClear;
+    brush.style := bsClear;
   end
 end;
@@ -315 +351 @@
 procedure TCityDlg.InitZoomCityMap;
 begin
-bitblt(ZoomCityMap.canvas.handle,0,0,wZoomMap,hZoomMap,Back.Canvas.handle,
-  xZoomMap,yZoomMap,SRCCOPY);
-if Mode=mImp then
-  begin
-  if ZoomArea<3 then
-    ImageOp_B(ZoomCityMap,CityMapTemplate,0,0,376*SizeClass,
-      112*ZoomArea,wZoomMap,hZoomMap)
-  else
-    begin
-    ImageOp_B(ZoomCityMap,CityMapTemplate,0,0,376*SizeClass+216,
-      112*(ZoomArea-3),wZoomMap-wZoomEnvironment,hZoomMap);
-    ImageOp_B(ZoomCityMap,CityMapTemplate,wZoomMap-wZoomEnvironment,0,
-      1504+wZoomEnvironment*byte(IsPort),112*(ZoomArea-3),wZoomEnvironment,hZoomMap);
-    end;
-  end  
+  bitblt(ZoomCityMap.Canvas.Handle, 0, 0, wZoomMap, hZoomMap,
+    Back.Canvas.Handle, xZoomMap, yZoomMap, SRCCOPY);
+  if Mode = mImp then
+  begin
+    if ZoomArea < 3 then
+      ImageOp_B(ZoomCityMap, CityMapTemplate, 0, 0, 376 * SizeClass,
+        112 * ZoomArea, wZoomMap, hZoomMap)
+    else
+    begin
+      ImageOp_B(ZoomCityMap, CityMapTemplate, 0, 0, 376 * SizeClass + 216,
+        112 * (ZoomArea - 3), wZoomMap - wZoomEnvironment, hZoomMap);
+      ImageOp_B(ZoomCityMap, CityMapTemplate, wZoomMap - wZoomEnvironment, 0,
+        1504 + wZoomEnvironment * byte(IsPort), 112 * (ZoomArea - 3),
+        wZoomEnvironment, hZoomMap);
+    end;
+  end
 end;
 
 procedure TCityDlg.OffscreenPaint;
 
-  procedure FillBar(x,y,pos,Growth,max,Kind: integer; IndicateComplete: boolean);
+  procedure FillBar(x, y, pos, Growth, max, Kind: integer;
+    IndicateComplete: boolean);
   var
-  Tex: TTexture;
-  begin
-  Tex:=MainTexture;
-  if Kind=3 then
-    begin
-    Tex.clBevelLight:=GrExt[HGrSystem].Data.Canvas.Pixels[104,36];
-    Tex.clBevelShade:=Tex.clBevelLight;
-    end;
-  PaintRelativeProgressBar(offscreen.Canvas,Kind,x-3,y,wBar-4,pos,Growth,max,
-    IndicateComplete,Tex);
-  end;
-
-  procedure PaintResources(x,y,Loc:integer; Add4Happy: boolean);
+    Tex: TTexture;
+  begin
+    Tex := MainTexture;
+    if Kind = 3 then
+    begin
+      Tex.clBevelLight := GrExt[HGrSystem].Data.Canvas.Pixels[104, 36];
+      Tex.clBevelShade := Tex.clBevelLight;
+    end;
+    PaintRelativeProgressBar(offscreen.Canvas, Kind, x - 3, y, wBar - 4, pos,
+      Growth, max, IndicateComplete, Tex);
+  end;
+
+  procedure PaintResources(x, y, Loc: integer; Add4Happy: boolean);
   var
-  d,i,Total,xGr,yGr:integer;
-  TileInfo:TTileInfo;
-  rare: boolean;
-  begin
-  if Server(sGetCityTileInfo,me,Loc,TileInfo)<>eOk then
-    begin assert(cix<0); exit end;
-  Total:=TileInfo.Food+TileInfo.Prod+TileInfo.Trade;
-  rare:=MyMap[Loc] and $06000000>0;
-  if rare then
-    inc(Total);
-  if Add4Happy then
-    inc(Total,4);
-  if Total>1 then d:=(xxt-11) div (Total-1);
-  if d<1 then d:=1;
-  if d>4 then d:=4;
-  for i:=0 to Total-1 do
-    begin
-    yGr:=115;
-    if Add4Happy and (i>=Total-4) then
-      begin xGr:=132; yGr:=126 end
-    else if rare and (i=Total-1) then xGr:=66+110
-    else if i>=TileInfo.Food+TileInfo.Prod then xGr:=66+44
-    else if i>=TileInfo.Prod then xGr:=66
-    else xGr:=66+22;
-    Sprite(offscreen,HGrSystem,x+xxt-5+d*(2*i+1-Total),y+yyt-5,10,10,xGr,yGr);
+    d, i, Total, xGr, yGr: integer;
+    TileInfo: TTileInfo;
+    rare: boolean;
+  begin
+    if Server(sGetCityTileInfo, me, Loc, TileInfo) <> eOk then
+    begin
+      assert(cix < 0);
+      exit
+    end;
+    Total := TileInfo.Food + TileInfo.Prod + TileInfo.Trade;
+    rare := MyMap[Loc] and $06000000 > 0;
+    if rare then
+      inc(Total);
+    if Add4Happy then
+      inc(Total, 4);
+    if Total > 1 then
+      d := (xxt - 11) div (Total - 1);
+    if d < 1 then
+      d := 1;
+    if d > 4 then
+      d := 4;
+    for i := 0 to Total - 1 do
+    begin
+      yGr := 115;
+      if Add4Happy and (i >= Total - 4) then
+      begin
+        xGr := 132;
+        yGr := 126
+      end
+      else if rare and (i = Total - 1) then
+        xGr := 66 + 110
+      else if i >= TileInfo.Food + TileInfo.Prod then
+        xGr := 66 + 44
+      else if i >= TileInfo.Prod then
+        xGr := 66
+      else
+        xGr := 66 + 22;
+      Sprite(offscreen, HGrSystem, x + xxt - 5 + d * (2 * i + 1 - Total),
+        y + yyt - 5, 10, 10, xGr, yGr);
     end
   end;
 
-  procedure MakeRed(x,y,w,h: integer);
+  procedure MakeRed(x, y, w, h: integer);
   type
-  TLine=array[0..99999,0..2] of Byte;
-  PLine=^TLine;
+    TLine = array [0 .. 99999, 0 .. 2] of byte;
+    PLine = ^TLine;
 
     procedure RedLine(line: PLine; length: integer);
     var
-    i,gray: integer;
-    begin
-    for i:=0 to length-1 do
+      i, gray: integer;
+    begin
+      for i := 0 to length - 1 do
       begin
-      gray:=(integer(line[i,0])+integer(line[i,1])+integer(line[i,2])) *85 shr 8;
-      line[i,0]:=0;
-      line[i,1]:=0;
-      line[i,2]:=gray; //255-(255-gray) div 2;
+        gray := (integer(line[i, 0]) + integer(line[i, 1]) + integer(line[i, 2])
+          ) * 85 shr 8;
+        line[i, 0] := 0;
+        line[i, 1] := 0;
+        line[i, 2] := gray; // 255-(255-gray) div 2;
       end
     end;
 
   var
-  i: integer;              
-  begin
-  for i:=0 to h-1 do
-    RedLine(@(PLine(Offscreen.ScanLine[y+i])[x]),w)
+    i: integer;
+  begin
+    for i := 0 to h - 1 do
+      RedLine(@(PLine(offscreen.ScanLine[y + i])[x]), w)
   end;
 
 var
-line, MessageCount: integer;
+  line, MessageCount: integer;
 
   procedure CheckMessage(Flag: integer);
   var
-  i, test: integer;
-  s: string;
-  begin
-  if Happened and Flag<>0 then
-    begin
-    i:=0;
-    test:=1;
-    while test<Flag do begin inc(i); inc(test,test) end;
-
-    if AllowChange and (Sounds<>nil) and (OpenSoundEvent=-1) then
+    i, test: integer;
+    s: string;
+  begin
+    if Happened and Flag <> 0 then
+    begin
+      i := 0;
+      test := 1;
+      while test < Flag do
       begin
-      s:=CityEventSoundItem[i];
-      if s<>'' then s:=Sounds.Lookup(s);
-      if (Flag=chProduction) or (s<>'') and (s[1]<>'*') and (s[1]<>'[') then
-        OpenSoundEvent:=i
+        inc(i);
+        inc(test, test)
       end;
 
-    s:=CityEventName(i);
-{    if Flag=chNoGrowthWarning then
-      if c.Built[imAqueduct]=0 then
+      if AllowChange and (Sounds <> nil) and (OpenSoundEvent = -1) then
+      begin
+        s := CityEventSoundItem[i];
+        if s <> '' then
+          s := Sounds.Lookup(s);
+        if (Flag = chProduction) or (s <> '') and (s[1] <> '*') and (s[1] <> '[')
+        then
+          OpenSoundEvent := i
+      end;
+
+      s := CityEventName(i);
+      { if Flag=chNoGrowthWarning then
+        if c.Built[imAqueduct]=0 then
         s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-      else s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]);}
-    RisedTextOut(offscreen.Canvas,xmOpt+40,ymOpt-1-8*MessageCount+16*line,s);
-    inc(line)
+        else s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); }
+      RisedTextOut(offscreen.Canvas, xmOpt + 40, ymOpt - 1 - 8 * MessageCount +
+        16 * line, s);
+      inc(line)
     end
   end;
 
 var
-x,y,xGr,i,i1,j,iix,d,dx,dy,PrCost,Cnt,Loc1,FreeSupp,Paintiix,HappyGain,
-  OptiType,rx,ry,TrueFood,TrueProd,TruePoll: integer;
-av: Integer;
-PrName,s:string;
-UnitInfo: TUnitInfo;
-UnitReport: TUnitReport;
-RedTex: TTexture;
-IsCityAlive,CanGrow: boolean;
-begin
-inherited;
-if cix>=0 then c:=MyCity[cix];
-Report.HypoTiles:=-1;
-Report.HypoTaxRate:=-1;
-Report.HypoLuxuryRate:=-1;
-if cix>=0 then Server(sGetCityReportNew,me,cix,Report) // own city
-else Server(sGetEnemyCityReportNew,me,cLoc,Report); // enemy city
-TrueFood:=c.Food;
-TrueProd:=c.Prod;
-TruePoll:=c.Pollution;
-if supervising or (cix<0) then
+  x, y, xGr, i, i1, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
+    HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: integer;
+  av: integer;
+  PrName, s: string;
+  UnitInfo: TUnitInfo;
+  UnitReport: TUnitReport;
+  RedTex: TTexture;
+  IsCityAlive, CanGrow: boolean;
+begin
+  inherited;
+  if cix >= 0 then
+    c := MyCity[cix];
+  Report.HypoTiles := -1;
+  Report.HypoTaxRate := -1;
+  Report.HypoLuxuryRate := -1;
+  if cix >= 0 then
+    Server(sGetCityReportNew, me, cix, Report) // own city
+  else
+    Server(sGetEnemyCityReportNew, me, cLoc, Report); // enemy city
+  TrueFood := c.Food;
+  TrueProd := c.Prod;
+  TruePoll := c.Pollution;
+  if supervising or (cix < 0) then
   begin // normalize city from after-turn state
-  dec(TrueFood,Report.FoodSurplus);
-  if TrueFood<0 then
-    TrueFood:=0; // shouldn't happen
-  dec(TrueProd,Report.Production);
-  if TrueProd<0 then
-    TrueProd:=0; // shouldn't happen
-  dec(TruePoll,Report.AddPollution);
-  if TruePoll<0 then
-    TruePoll:=0; // shouldn't happen
-  end;
-IsCityAlive:= (cGov<>gAnarchy) and (c.Flags and chCaptured=0);
-if not IsCityAlive then Report.Working:=c.Size;
-
-RedTex:=MainTexture;
-RedTex.clBevelLight:=$0000FF;
-RedTex.clBevelShade:=$000000;
-RedTex.clTextLight:=$000000;
-RedTex.clTextShade:=$0000FF;
-
-bitblt(offscreen.canvas.handle,0,0,640,480,Back.Canvas.handle,0,0,SRCCOPY);
-
-offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-RisedTextout(offscreen.Canvas,42,7,Caption);
-with offscreen.canvas do
+    dec(TrueFood, Report.FoodSurplus);
+    if TrueFood < 0 then
+      TrueFood := 0; // shouldn't happen
+    dec(TrueProd, Report.Production);
+    if TrueProd < 0 then
+      TrueProd := 0; // shouldn't happen
+    dec(TruePoll, Report.AddPollution);
+    if TruePoll < 0 then
+      TruePoll := 0; // shouldn't happen
+  end;
+  IsCityAlive := (cGov <> gAnarchy) and (c.Flags and chCaptured = 0);
+  if not IsCityAlive then
+    Report.Working := c.Size;
+
+  RedTex := MainTexture;
+  RedTex.clBevelLight := $0000FF;
+  RedTex.clBevelShade := $000000;
+  RedTex.clTextLight := $000000;
+  RedTex.clTextShade := $0000FF;
+
+  bitblt(offscreen.Canvas.Handle, 0, 0, 640, 480, Back.Canvas.Handle, 0,
+    0, SRCCOPY);
+
+  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  RisedTextOut(offscreen.Canvas, 42, 7, Caption);
+  with offscreen.Canvas do
   begin // city size
-  brush.color:=$000000;
-  fillrect(rect(8+1,7+1,36+1,32+1));
-  brush.color:=$FFFFFF;
-  fillrect(rect(8,7,36,32));
-  brush.style:=bsClear;
-  font.color:=$000000;
-  s:=inttostr(c.Size);
-  TextOut(8+14-textwidth(s) div 2, 7, s);
-  end;
-offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-
-if not IsCityAlive then
-  begin
-  MakeRed(18,280,298,40);
-  if cGov=gAnarchy then s:=Phrases.Lookup('GOVERNMENT',gAnarchy)
-  else {if c.Flags and chCaptured<>0 then}
-    s:=Phrases.Lookup('CITYEVENTS',14);
-  RisedTextout(offscreen.canvas,167-BiColorTextWidth(offscreen.canvas,s) div 2,ymOpt-9, s);
+    brush.Color := $000000;
+    FillRect(Rect(8 + 1, 7 + 1, 36 + 1, 32 + 1));
+    brush.Color := $FFFFFF;
+    FillRect(Rect(8, 7, 36, 32));
+    brush.style := bsClear;
+    Font.Color := $000000;
+    s := inttostr(c.Size);
+    TextOut(8 + 14 - textwidth(s) div 2, 7, s);
+  end;
+  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+
+  if not IsCityAlive then
+  begin
+    MakeRed(18, 280, 298, 40);
+    if cGov = gAnarchy then
+      s := Phrases.Lookup('GOVERNMENT', gAnarchy)
+    else { if c.Flags and chCaptured<>0 then }
+      s := Phrases.Lookup('CITYEVENTS', 14);
+    RisedTextOut(offscreen.Canvas, 167 - BiColorTextWidth(offscreen.Canvas, s)
+      div 2, ymOpt - 9, s);
   end
-else if AllowChange then
-  begin
-  OptiType:=c.Status shr 4 and $0F;
-  Sprite(offscreen,HGrSystem2,xmOpt-32,ymOpt-32,64,64,1+OptiType mod 3*64,217+OptiType div 3*64);
-
-  {display messages now}
-  MessageCount:=0;
-  for i:=0 to 31 do
-    if Happened and ($FFFFFFFF-chCaptured) and (1 shl i)<>0 then
-      inc(MessageCount);
-  if MessageCount>3 then
-    MessageCount:=3;
-  if MessageCount>0 then
-    begin
-    MakeBlue(Offscreen,74,280,242,40);
-    line:=0;
-    for i:=0 to nCityEventPriority-1 do
-      if line<MessageCount then
-        CheckMessage(CityEventPriority[i]);
+  else if AllowChange then
+  begin
+    OptiType := c.Status shr 4 and $0F;
+    Sprite(offscreen, HGrSystem2, xmOpt - 32, ymOpt - 32, 64, 64,
+      1 + OptiType mod 3 * 64, 217 + OptiType div 3 * 64);
+
+    { display messages now }
+    MessageCount := 0;
+    for i := 0 to 31 do
+      if Happened and ($FFFFFFFF - chCaptured) and (1 shl i) <> 0 then
+        inc(MessageCount);
+    if MessageCount > 3 then
+      MessageCount := 3;
+    if MessageCount > 0 then
+    begin
+      MakeBlue(offscreen, 74, 280, 242, 40);
+      line := 0;
+      for i := 0 to nCityEventPriority - 1 do
+        if line < MessageCount then
+          CheckMessage(CityEventPriority[i]);
     end
-  else
-    begin
-    s:=Phrases.Lookup('CITYMANAGETYPE',OptiType);
-    j:=pos('\',s);
-    if j=0 then
-      LoweredTextout(offscreen.canvas, -1, MainTexture, xmOpt+40, ymOpt-9, s)
-    else
+    else
+    begin
+      s := Phrases.Lookup('CITYMANAGETYPE', OptiType);
+      j := pos('\', s);
+      if j = 0 then
+        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+          ymOpt - 9, s)
+      else
       begin
-      LoweredTextout(offscreen.canvas, -1, MainTexture, xmOpt+40, ymOpt-17,
-        copy(s,1,j-1));
-      LoweredTextout(offscreen.canvas, -1, MainTexture, xmOpt+40, ymOpt-1,
-        copy(s,j+1,255));
+        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+          ymOpt - 17, copy(s, 1, j - 1));
+        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
+          copy(s, j + 1, 255));
       end
     end
   end;
 
-rx:=(192+xxt*2-1) div (xxt*2);
-ry:=(96+yyt*2-1) div (yyt*2);
-AreaMap.Paint(xmArea-xxt*2*rx,ymArea-yyt*2*ry-3*yyt,dLoc(cLoc,-2*rx+1,-2*ry-1),4*rx-1,4*ry+1,cLoc,cOwner,
-  false,AllowChange and IsCityAlive and (c.Status and csResourceWeightsMask=0));
-bitblt(offscreen.canvas.handle,xmArea+102,42,90,33,Back.Canvas.handle,xmArea+102,42,SRCCOPY);
-
-if IsCityAlive then
-  for dy:=-3 to 3 do for dx:=-3 to 3 do
-    if ((dx+dy) and 1=0) and (dx*dx*dy*dy<81) then
+  rx := (192 + xxt * 2 - 1) div (xxt * 2);
+  ry := (96 + yyt * 2 - 1) div (yyt * 2);
+  AreaMap.Paint(xmArea - xxt * 2 * rx, ymArea - yyt * 2 * ry - 3 * yyt,
+    dLoc(cLoc, -2 * rx + 1, -2 * ry - 1), 4 * rx - 1, 4 * ry + 1, cLoc, cOwner,
+    false, AllowChange and IsCityAlive and
+    (c.Status and csResourceWeightsMask = 0));
+  bitblt(offscreen.Canvas.Handle, xmArea + 102, 42, 90, 33, Back.Canvas.Handle,
+    xmArea + 102, 42, SRCCOPY);
+
+  if IsCityAlive then
+    for dy := -3 to 3 do
+      for dx := -3 to 3 do
+        if ((dx + dy) and 1 = 0) and (dx * dx * dy * dy < 81) then
+        begin
+          Loc1 := dLoc(cLoc, dx, dy);
+          av := CityAreaInfo.Available[(dy + 3) shl 2 + (dx + 3) shr 1];
+          if ((av = faNotAvailable) or (av = faTreaty) or (av = faInvalid)) and
+            ((Loc1 < 0) or (Loc1 >= G.lx * G.ly) or (MyMap[Loc1] and fCity = 0))
+          then
+            Sprite(offscreen, HGrTerrain, xmArea - xxt + xxt * dx,
+              ymArea - yyt + yyt * dy, xxt * 2, yyt * 2, 1 + 5 * (xxt * 2 + 1),
+              1 + yyt + 15 * (yyt * 3 + 1));
+          if (1 shl ((dy + 3) shl 2 + (dx + 3) shr 1) and c.Tiles <> 0) then
+            PaintResources(xmArea - xxt + xxt * dx, ymArea - yyt + yyt * dy,
+              Loc1, (dx = 0) and (dy = 0));
+        end;
+
+  if Report.Working > 1 then
+    d := (xService - (xmArea - 192) - 8 - 32) div (Report.Working - 1);
+  if d > 28 then
+    d := 28;
+  for i := Report.Working - 1 downto 0 do
+  begin
+    if IsCityAlive then
+      xGr := 29
+    else
+      xGr := 141;
+    bitblt(offscreen.Canvas.Handle, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+      27, 30, GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
+      30, xGr, 171);
+  end;
+  if c.Size - Report.Working > 1 then
+    d := (xmArea + 192 - xService - 32) div (c.Size - Report.Working - 1);
+  if d > 28 then
+    d := 28;
+  for i := 0 to c.Size - Report.Working - 1 do
+  begin
+    xGr := 1 + 112;
+    bitblt(offscreen.Canvas.Handle, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+      30, GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
+      xGr, 171);
+    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 + 4 - i * d, 29 + 32, 10,
+      10, 121, 126);
+    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 + 13 - i * d, 29 + 32, 10,
+      10, 121, 126);
+    // Sprite(offscreen,HGrSystem,xmArea+192-31+18-i*d,ymArea-96-80+32,10,10,88,115);
+  end;
+
+  if c.Project and cpImp = 0 then
+    PrName := Tribe[cOwner].ModelName[c.Project and cpIndex]
+  else
+    PrName := Phrases.Lookup('IMPROVEMENTS', c.Project and cpIndex);
+  PrCost := Report.ProjectCost;
+
+  // happiness section
+  if IsCityAlive then
+  begin
+    if cGov = gFundamentalism then
+      CountBar(offscreen, xHapp, yHapp + dyBar, wBar, 17,
+        Phrases.Lookup('FAITH'), Report.CollectedControl, MainTexture)
+    else
+    begin
+      CountBar(offscreen, xHapp, yHapp + dyBar, wBar, 17,
+        Phrases.Lookup('HAPPINESS'), Report.Morale, MainTexture);
+      CountBar(offscreen, xHapp, yHapp + 2 * dyBar, wBar, 16,
+        Phrases.Lookup('CONTROL'), Report.CollectedControl, MainTexture);
+    end;
+    CountBar(offscreen, xHapp, yHapp, wBar, 8, Phrases.Lookup('LUX'),
+      Report.Luxury, MainTexture);
+    CountBar(offscreen, xHapp + dxBar, yHapp, wBar, 19,
+      Phrases.Lookup('UNREST'), 2 * Report.Deployed, MainTexture);
+    CountBar(offscreen, xHapp + dxBar, yHapp + dyBar, wBar, 17,
+      Phrases.Lookup('HAPPINESSDEMAND'), c.Size, MainTexture);
+    if Report.HappinessBalance >= 0 then
+      CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 17,
+        Phrases.Lookup('HAPPINESSPLUS'), Report.HappinessBalance, MainTexture)
+    else
+    begin
+      MakeRed(xHapp + dxBar - 6, yHapp + 2 * dyBar, wBar + 10, 38);
+      CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 18,
+        Phrases.Lookup('LACK'), -Report.HappinessBalance, RedTex);
+    end;
+  end;
+
+  // food section
+  if IsCityAlive then
+  begin
+    CountBar(offscreen, xFood, yFood + dyBar div 2, wBar, 0,
+      Phrases.Lookup('FOOD'), Report.CollectedFood, MainTexture);
+    CountBar(offscreen, xFood + dxBar, yFood + dyBar, wBar, 0,
+      Phrases.Lookup('DEMAND'), 2 * c.Size, MainTexture);
+    CountBar(offscreen, xFood + dxBar, yFood, wBar, 0,
+      Phrases.Lookup('SUPPORT'), Report.FoodSupport, MainTexture);
+    if Report.FoodSurplus >= 0 then
+      if (cGov = gFuture) or (c.Size >= NeedAqueductSize) and
+        (Report.FoodSurplus < 2) then
+        CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 6,
+          Phrases.Lookup('PROFIT'), Report.FoodSurplus, MainTexture)
+      else
+        CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 0,
+          Phrases.Lookup('SURPLUS'), Report.FoodSurplus, MainTexture)
+    else
+    begin
+      MakeRed(xFood + dxBar - 6, yFood + 2 * dyBar, wBar + 10, 38);
+      CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 1,
+        Phrases.Lookup('LACK'), -Report.FoodSurplus, RedTex);
+    end;
+  end;
+  CanGrow := (c.Size < MaxCitySize) and (cGov <> gFuture) and
+    (Report.FoodSurplus > 0) and ((c.Size < NeedAqueductSize) or
+    (c.Built[imAqueduct] = 1) and (c.Size < NeedSewerSize) or
+    (c.Built[imSewer] = 1));
+  FillBar(xFood + 3, yFood + 102, TrueFood,
+    CutCityFoodSurplus(Report.FoodSurplus, IsCityAlive, cGov, c.Size),
+    Report.Storage, 1, CanGrow);
+  LoweredTextout(offscreen.Canvas, -1, MainTexture, xFood + 3 - 5,
+    yFood + 102 - 20, Format('%d/%d', [TrueFood, Report.Storage]));
+  LoweredTextout(offscreen.Canvas, -1, MainTexture, xFood - 2, yFood + 66,
+    Phrases.Lookup('STORAGE'));
+
+  // production section
+  if IsCityAlive then
+  begin
+    CountBar(offscreen, xProd, yProd, wBar, 2, Phrases.Lookup('MATERIAL'),
+      Report.CollectedMaterial, MainTexture);
+    CountBar(offscreen, xProd + dxBar, yProd, wBar, 2,
+      Phrases.Lookup('SUPPORT'), Report.MaterialSupport, MainTexture);
+    if Report.Production >= 0 then
+      if c.Project and (cpImp + cpIndex) = cpImp + imTrGoods then
+        CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 6,
+          Phrases.Lookup('PROFIT'), Report.Production, MainTexture)
+      else
+        CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 2,
+          Phrases.Lookup('PROD'), Report.Production, MainTexture)
+    else
+    begin
+      MakeRed(xProd + dxBar - 6, yProd + dyBar, wBar + 10, 38);
+      CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 3,
+        Phrases.Lookup('LACK'), -Report.Production, RedTex);
+    end;
+  end;
+  if c.Project and (cpImp + cpIndex) <> cpImp + imTrGoods then
+    with offscreen.Canvas do
+    begin
+      i := Report.Production;
+      if (i < 0) or not IsCityAlive then
+        i := 0;
+      FillBar(xProd + 3, yProd + 16 + 63, TrueProd, i, PrCost, 4, true);
+      LoweredTextout(offscreen.Canvas, -1, MainTexture, xProd + 3 - 5,
+        yProd + 16 + 43, Format('%d/%d', [TrueProd, PrCost]));
+      if BiColorTextWidth(offscreen.Canvas, PrName) > wBar + dxBar then
       begin
-      Loc1:=dLoc(cLoc,dx,dy);
-      av := CityAreaInfo.Available[(dy+3) shl 2+(dx+3) shr 1];
-      if ((av = faNotAvailable) or (av = faTreaty) or (av =faInvalid))
-        and ((Loc1<0) or (Loc1>=G.lx*G.ly) or (MyMap[Loc1] and fCity=0)) then
-        Sprite(offscreen,HGrTerrain,xmArea-xxt+xxt*dx,ymArea-yyt+yyt*dy,xxt*2,
-          yyt*2,1+5*(xxt*2+1),1+yyt+15*(yyt*3+1));
-      if (1 shl((dy+3) shl 2+(dx+3) shr 1) and c.Tiles<>0) then
-        PaintResources(xmArea-xxt+xxt*dx,ymArea-yyt+yyt*dy,Loc1,(dx=0) and (dy=0));
+        repeat
+          Delete(PrName, length(PrName), 1)
+        until BiColorTextWidth(offscreen.Canvas, PrName) <= wBar + dxBar;
+        PrName := PrName + '.'
       end;
-
-if Report.Working>1 then d:=(xService-(xmArea-192)-8-32) div(Report.Working-1);
-if d>28 then d:=28;
-for i:=Report.Working-1 downto 0 do
-  begin
-  if IsCityAlive then xGr:=29
-  else xGr:=141;
-  BitBlt(offscreen.Canvas.Handle,xmArea-192+5+i*d,ymArea-96-29,
-    27,30,GrExt[HGrSystem].Mask.Canvas.Handle,xGr,171,SRCAND); {shadow}
-  Sprite(offscreen,HGrSystem,xmArea-192+4+i*d,ymArea-96-30,27,30,xGr,171);
-  end;
-if c.Size-Report.Working>1 then d:=(xmArea+192-xService-32) div(c.Size-Report.Working-1);
-if d>28 then d:=28;
-for i:=0 to c.Size-Report.Working-1 do
-  begin
-  xGr:=1+112;
-  BitBlt(offscreen.Canvas.Handle,xmArea+192-27+1-i*d,29+1,
-    27,30,GrExt[HGrSystem].Mask.Canvas.Handle,xGr,171,SRCAND); {shadow}
-  Sprite(offscreen,HGrSystem,xmArea+192-27-i*d,29,27,30,xGr,171);
-  Sprite(offscreen,HGrSystem,xmArea+192-27+4-i*d,29+32,10,10,121,126);
-  Sprite(offscreen,HGrSystem,xmArea+192-27+13-i*d,29+32,10,10,121,126);
-//  Sprite(offscreen,HGrSystem,xmArea+192-31+18-i*d,ymArea-96-80+32,10,10,88,115);
-  end;
-
-if c.Project and cpImp=0 then
-  PrName:=Tribe[cOwner].ModelName[c.Project and cpIndex]
-else PrName:=Phrases.Lookup('IMPROVEMENTS',c.Project and cpIndex);
-PrCost:=Report.ProjectCost;
-
-// happiness section
-if IsCityAlive then
-  begin
-  if cGov=gFundamentalism then
-    CountBar(offscreen,xHapp,yHapp+dyBar,wBar,17,Phrases.Lookup('FAITH'),
-      Report.CollectedControl,MainTexture)
+    end;
+  RisedTextOut(offscreen.Canvas, xProd - 2, yProd + 36, PrName);
+
+  // pollution section
+  if IsCityAlive and (Report.AddPollution > 0) then
+  begin
+    FillBar(xPoll + 3, yPoll + 20, TruePoll, Report.AddPollution,
+      MaxPollution, 3, true);
+    RisedTextOut(offscreen.Canvas, xPoll + 3 - 5, yPoll + 20 - 20,
+      Phrases.Lookup('POLL'));
+  end;
+
+  // trade section
+  if IsCityAlive and (Report.CollectedTrade > 0) then
+  begin
+    CountBar(offscreen, xTrade, yTrade + dyBar div 2, wBar, 4,
+      Phrases.Lookup('TRADE'), Report.CollectedTrade, MainTexture);
+    CountBar(offscreen, xTrade + dxBar, yTrade + 2 * dyBar, wBar, 5,
+      Phrases.Lookup('CORR'), Report.Corruption, MainTexture);
+    CountBar(offscreen, xTrade + dxBar, yTrade, wBar, 6, Phrases.Lookup('TAX'),
+      Report.Tax, MainTexture);
+    CountBar(offscreen, xTrade + dxBar, yTrade + dyBar, wBar, 12,
+      Phrases.Lookup('SCIENCE'), Report.Science, MainTexture);
+  end;
+
+  // small map
+  bitblt(offscreen.Canvas.Handle, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+    SmallCityMap.Canvas.Handle, 0, 0, SRCCOPY);
+  if Mode = mImp then
+    Frame(offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
+      ySmallMap + 24 * (ZoomArea mod 3), xSmallMap + 48 * (ZoomArea div 3) + 49,
+      ySmallMap + 24 * (ZoomArea mod 3) + 25, MainTexture.clMark,
+      MainTexture.clMark);
+  Frame(offscreen.Canvas, xSmallMap - 1, ySmallMap - 1, xSmallMap + wSmallMap,
+    ySmallMap + hSmallMap, $B0B0B0, $FFFFFF);
+  RFrame(offscreen.Canvas, xSmallMap - 2, ySmallMap - 2, xSmallMap + wSmallMap +
+    1, ySmallMap + hSmallMap + 1, $FFFFFF, $B0B0B0);
+
+  Frame(offscreen.Canvas, xSupport - 1, ySupport - 1, xSupport + wSupport,
+    ySupport + hSupport, $B0B0B0, $FFFFFF);
+  RFrame(offscreen.Canvas, xSupport - 2, ySupport - 2, xSupport + wSupport + 1,
+    ySupport + hSupport + 1, $FFFFFF, $B0B0B0);
+  x := xSupport + wSupport div 2;
+  y := ySupport + hSupport div 2;
+  if Mode = mSupp then
+  begin
+    offscreen.Canvas.brush.Color := MainTexture.clMark;
+    offscreen.Canvas.FillRect(Rect(x - 27, y - 6, x + 27, y + 6));
+    offscreen.Canvas.brush.style := bsClear;
+  end;
+  Sprite(offscreen, HGrSystem, x - 16, y - 5, 10, 10, 88, 115);
+  Sprite(offscreen, HGrSystem, x - 5, y - 5, 10, 10, 66, 115);
+  Sprite(offscreen, HGrSystem, x + 6, y - 5, 10, 10, 154, 126);
+
+  bitblt(offscreen.Canvas.Handle, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
+    ZoomCityMap.Canvas.Handle, 0, 0, SRCCOPY);
+
+  for i := 0 to 5 do
+    imix[i] := -1;
+  if Mode = mImp then
+  begin
+    if ZoomArea = 5 then
+    begin
+      Cnt := 0;
+      for iix := 0 to nImp - 1 do
+        if ((iix < 28) or (ImpPosition[iix] < 0)) and (c.Built[iix] > 0) then
+        begin
+          i := Cnt - Page * 6;
+          if (i >= 0) and (i < 6) then
+            imix[i] := iix;
+          inc(Cnt);
+        end;
+      PageCount := (Cnt + 5) div 6;
+    end
+    else
+    begin
+      for iix := 28 to nImp - 1 do
+      begin
+        i := ImpPosition[iix] - 6 * ZoomArea;
+        if (i >= 0) and (i < 6) and (c.Built[iix] > 0) then
+          imix[i] := iix;
+      end;
+      PageCount := 0;
+    end;
+    for i := 0 to 5 do
+      if imix[i] >= 0 then
+      begin
+        iix := imix[i];
+        x := xZoomMap + 14 + 72 * (i mod 3);
+        y := yZoomMap + 14 + 56 * (i div 3);
+        ImpImage(offscreen.Canvas, x, y, iix, cGov, AllowChange and
+          (ClientMode < scContact));
+        if IsCityAlive then
+        begin
+          if iix = imColosseum then
+          begin
+            Sprite(offscreen, HGrSystem, x + 46, y, 14, 14, 82, 100);
+          end
+          else
+          begin
+            HappyGain := 0;
+            case iix of
+              0 .. 27, imTemple:
+                HappyGain := 2;
+              imTheater:
+                HappyGain := 4;
+              imCathedral:
+                if MyRO.Wonder[woBach].EffectiveOwner = cOwner then
+                  HappyGain := 6
+                else
+                  HappyGain := 4;
+            end;
+            if HappyGain > 1 then
+            begin
+              d := 30 div (HappyGain - 1);
+              if d > 10 then
+                d := 10
+            end;
+            for j := 0 to HappyGain - 1 do
+              Sprite(offscreen, HGrSystem, x + 50, y + d * j, 10, 10, 132, 126);
+          end;
+          for j := 0 to Imp[iix].Maint - 1 do
+            Sprite(offscreen, HGrSystem, x - 4, y + 29 - 3 * j, 10, 10,
+              132, 115);
+        end
+      end;
+    if imix[0] >= 0 then
+      Imp0Area.Hint := Phrases.Lookup('IMPROVEMENTS', imix[0])
+    else
+      Imp0Area.Hint := '';
+    if imix[1] >= 0 then
+      Imp1Area.Hint := Phrases.Lookup('IMPROVEMENTS', imix[1])
+    else
+      Imp1Area.Hint := '';
+    if imix[2] >= 0 then
+      Imp2Area.Hint := Phrases.Lookup('IMPROVEMENTS', imix[2])
+    else
+      Imp2Area.Hint := '';
+    if imix[3] >= 0 then
+      Imp3Area.Hint := Phrases.Lookup('IMPROVEMENTS', imix[3])
+    else
+      Imp3Area.Hint := '';
+    if imix[4] >= 0 then
+      Imp4Area.Hint := Phrases.Lookup('IMPROVEMENTS', imix[4])
+    else
+      Imp4Area.Hint := '';
+    if imix[5] >= 0 then
+      Imp5Area.Hint := Phrases.Lookup('IMPROVEMENTS', imix[5])
+    else
+      Imp5Area.Hint := '';
+  end
+  else { if mode=mSupp then }
+  begin
+    LoweredTextout(offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
+      yZoomMap + 2, Phrases.Lookup('SUPUNITS'));
+    FreeSupp := c.Size * SupportFree[cGov] shr 1;
+    Cnt := 0;
+    for i := 0 to MyRO.nUn - 1 do
+      if (MyUn[i].Loc >= 0) and (MyUn[i].Home = cix) then
+        with MyModel[MyUn[i].mix] do
+        begin
+          Server(sGetUnitReport, me, i, UnitReport);
+          if (Cnt >= 6 * Page) and (Cnt < 6 * (Page + 1)) then
+          begin // unit visible in display
+            imix[Cnt - 6 * Page] := i;
+            x := ((Cnt - 6 * Page) mod 3) * 64 + xZoomMap;
+            y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
+            MakeUnitInfo(me, MyUn[i], UnitInfo);
+            NoMap.SetOutput(offscreen);
+            NoMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
+
+            for j := 0 to UnitReport.FoodSupport - 1 do
+              Sprite(offscreen, HGrSystem, x + 38 + 11 * j, y + 40, 10,
+                10, 66, 115);
+            for j := 0 to UnitReport.ProdSupport - 1 do
+            begin
+              if (FreeSupp > 0) and
+                (UnitReport.ReportFlags and urfAlwaysSupport = 0) then
+              begin
+                Sprite(offscreen, HGrSystem, x + 16 - 11 * j, y + 40, 10,
+                  10, 143, 115);
+                dec(FreeSupp);
+              end
+              else
+                Sprite(offscreen, HGrSystem, x + 16 - 11 * j, y + 40, 10,
+                  10, 88, 115);
+            end;
+            if UnitReport.ReportFlags and urfDeployed <> 0 then
+              for j := 0 to 1 do
+                Sprite(offscreen, HGrSystem, x + 27 + 11 * j, y + 40, 10,
+                  10, 154, 126)
+          end // unit visible in display
+          else
+            dec(FreeSupp, UnitReport.ProdSupport);
+          inc(Cnt);
+        end;
+    PageCount := (Cnt + 5) div 6;
+    Imp0Area.Hint := '';
+    Imp1Area.Hint := '';
+    Imp2Area.Hint := '';
+    Imp3Area.Hint := '';
+    Imp4Area.Hint := '';
+    Imp5Area.Hint := '';
+  end;
+  PageUpBtn.Visible := PageCount > 1;
+  PageDownBtn.Visible := PageCount > 1;
+
+  with offscreen.Canvas do
+  begin
+    { display project now }
+    DLine(offscreen.Canvas, xView + 9 + xSizeBig, xProd + 2 * wBar + 10,
+      yProd + dyBar + 16, $FFFFFF, $B0B0B0);
+    if ProdHint then
+    begin
+      Frame(offscreen.Canvas, xView + 9 - 1, yView + 5 - 1,
+        xView + 9 + xSizeBig, yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
+      RFrame(offscreen.Canvas, xView + 9 - 2, yView + 5 - 2,
+        xView + 9 + xSizeBig + 1, yView + 5 + ySizeBig + 1, $FFFFFF, $B0B0B0);
+      with offscreen.Canvas do
+      begin
+        brush.Color := $000000;
+        FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
+          yView + 5 + 40));
+        brush.style := bsClear;
+      end
+    end
+    else if AllowChange and (c.Status and 7 <> 0) then
+    begin // city type autobuild
+      FrameImage(offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
+        ySizeBig, (c.Status and 7 - 1 + 3) * xSizeBig, 0, (cix >= 0) and
+        (ClientMode < scContact));
+    end
+    else if c.Project and cpImp = 0 then
+    begin // project is unit
+      FrameImage(offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
+        ySizeBig, 0, 0, AllowChange and (ClientMode < scContact));
+      with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
+        Sprite(offscreen, HGr, xView + 5, yView + 1, 64, 44,
+          pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
+    end
+    else
+    begin // project is building
+      if ProdHint then
+        Paintiix := c.Project0 and cpIndex
+      else
+        Paintiix := c.Project and cpIndex;
+      ImpImage(offscreen.Canvas, xView + 9, yView + 5, Paintiix, cGov,
+        AllowChange and (ClientMode < scContact));
+    end;
+  end;
+
+  if AllowChange and (ClientMode < scContact) then
+  begin
+    i := Server(sBuyCityProject - sExecute, me, cix, nil^);
+    BuyBtn.Visible := (i = eOk) or (i = eViolation);
+  end
   else
-    begin
-    CountBar(offscreen,xHapp,yHapp+dyBar,wBar,17,Phrases.Lookup('HAPPINESS'),
-      Report.Morale,MainTexture);
-    CountBar(offscreen,xHapp,yHapp+2*dyBar,wBar,16,Phrases.Lookup('CONTROL'),
-      Report.CollectedControl,MainTexture);
-    end;
-  CountBar(offscreen,xHapp,yHapp,wBar,8,Phrases.Lookup('LUX'),
-    Report.Luxury,MainTexture);
-  CountBar(offscreen,xHapp+dxBar,yHapp,wBar,19,Phrases.Lookup('UNREST'),
-    2*Report.Deployed,MainTexture);
-  CountBar(offscreen,xHapp+dxBar,yHapp+dyBar,wBar,17,Phrases.Lookup('HAPPINESSDEMAND'),
-    c.Size,MainTexture);
-  if Report.HappinessBalance>=0 then
-    CountBar(offscreen,xHapp+dxBar,yHapp+2*dyBar,wBar,17,Phrases.Lookup('HAPPINESSPLUS'),
-      Report.HappinessBalance,MainTexture)
+    BuyBtn.Visible := false;
+
+  MarkUsedOffscreen(ClientWidth, ClientHeight);
+end; { OffscreenPaint }
+
+procedure TCityDlg.FormShow(Sender: TObject);
+var
+  dx, dy, Loc1: integer;
+  GetCityData: TGetCityData;
+begin
+  BlinkTime := 5;
+  if cix >= 0 then
+  begin { own city }
+    c := MyCity[cix];
+    cOwner := me;
+    cGov := MyRO.Government;
+    ProdHint := (cGov <> gAnarchy) and
+      (Happened and (chProduction or chFounded or chCaptured or
+      chAllImpsMade) <> 0);
+    Server(sGetCityAreaInfo, me, cix, CityAreaInfo);
+    NextCityBtn.Visible := WindowMode = wmPersistent;
+    PrevCityBtn.Visible := WindowMode = wmPersistent;
+  end
+  else { enemy city }
+  begin
+    Mode := mImp;
+    Server(sGetCity, me, cLoc, GetCityData);
+    c := GetCityData.c;
+    cOwner := GetCityData.Owner;
+    cGov := MyRO.EnemyReport[cOwner].Government;
+    Happened := c.Flags and $7FFFFFFF;
+    ProdHint := false;
+    Server(sGetEnemyCityAreaInfo, me, cLoc, CityAreaInfo);
+
+    if c.Project and cpImp = 0 then
+    begin
+      emix := MyRO.nEnemyModel - 1;
+      while (emix > 0) and ((MyRO.EnemyModel[emix].Owner <> cOwner) or
+        (integer(MyRO.EnemyModel[emix].mix) <> c.Project and cpIndex)) do
+        dec(emix);
+      if Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr = 0 then
+        InitEnemyModel(emix);
+    end;
+
+    NextCityBtn.Visible := false;
+    PrevCityBtn.Visible := false;
+  end;
+  Page := 0;
+
+  if c.Size < 5 then
+    SizeClass := 0
+  else if c.Size < 9 then
+    SizeClass := 1
+  else if c.Size < 13 then
+    SizeClass := 2
   else
-    begin
-    MakeRed(xHapp+dxBar-6,yHapp+2*dyBar,wBar+10,38);
-    CountBar(offscreen,xHapp+dxBar,yHapp+2*dyBar,wBar,18,Phrases.Lookup('LACK'),
-      -Report.HappinessBalance,RedTex);
-    end;
-  end;
-
-// food section
-if IsCityAlive then
-  begin
-  CountBar(offscreen,xFood,yFood+dyBar div 2,wBar,0,Phrases.Lookup('FOOD'),Report.CollectedFood,MainTexture);
-  CountBar(offscreen,xFood+dxBar,yFood+dyBar,wBar,0,Phrases.Lookup('DEMAND'),2*c.Size,MainTexture);
-  CountBar(offscreen,xFood+dxBar,yFood,wBar,0,Phrases.Lookup('SUPPORT'),Report.FoodSupport,MainTexture);
-  if Report.FoodSurplus>=0 then
-    if (cGov=gFuture)
-      or (c.Size>=NeedAqueductSize) and (Report.FoodSurplus<2) then
-      CountBar(offscreen,xFood+dxBar,yFood+2*dyBar,wBar,6,Phrases.Lookup('PROFIT'),
-        Report.FoodSurplus,MainTexture)
-    else CountBar(offscreen,xFood+dxBar,yFood+2*dyBar,wBar,0,Phrases.Lookup('SURPLUS'),
-      Report.FoodSurplus,MainTexture)
+    SizeClass := 3;
+
+  // check if port
+  IsPort := false;
+  for dx := -2 to 2 do
+    for dy := -2 to 2 do
+      if abs(dx) + abs(dy) = 2 then
+      begin
+        Loc1 := dLoc(cLoc, dx, dy);
+        if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) and
+          (MyMap[Loc1] and fTerrain < fGrass) then
+          IsPort := true;
+      end;
+
+  if WindowMode = wmModal then
+  begin { center on screen }
+    Left := (Screen.Width - Width) div 2;
+    Top := (Screen.Height - Height) div 2;
+  end;
+
+  Caption := CityName(c.ID);
+
+  InitSmallCityMap;
+  InitZoomCityMap;
+  OpenSoundEvent := -1;
+  OffscreenPaint;
+  Timer1.Enabled := true;
+end;
+
+procedure TCityDlg.ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+begin
+  if MyMap[Loc] and fOwned <> 0 then
+  begin // own city
+    cix := MyRO.nCity - 1;
+    while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
+      dec(cix);
+    assert(cix >= 0);
+    if (Optimize_cixTileChange >= 0) and
+      (Optimize_TilesBeforeChange and not MyCity[Optimize_cixTileChange].Tiles
+      <> 0) then
+    begin
+      CityOptimizer_ReleaseCityTiles(Optimize_cixTileChange,
+        Optimize_TilesBeforeChange and
+        not MyCity[Optimize_cixTileChange].Tiles);
+      if WindowMode <> wmModal then
+        MainScreen.UpdateViews;
+    end;
+    Optimize_cixTileChange := cix;
+    Optimize_TilesBeforeChange := MyCity[cix].Tiles;
+  end
   else
-    begin
-    MakeRed(xFood+dxBar-6,yFood+2*dyBar,wBar+10,38);
-    CountBar(offscreen,xFood+dxBar,yFood+2*dyBar,wBar,1,Phrases.Lookup('LACK'),
-      -Report.FoodSurplus,RedTex);
-    end;
-  end;
-CanGrow:= (c.Size<MaxCitySize) and (cGov<>gFuture)
-  and (Report.FoodSurplus>0)
-  and ((c.Size<NeedAqueductSize)
-    or (c.Built[imAqueduct]=1) and (c.Size<NeedSewerSize)
-    or (c.Built[imSewer]=1));
-FillBar(xFood+3,yFood+102,TrueFood,
-  CutCityFoodSurplus(Report.FoodSurplus,IsCityAlive,cGov,c.size),
-  Report.Storage,1,CanGrow);
-LoweredTextOut(offscreen.Canvas,-1,MainTexture,xFood+3-5,yFood+102-20,Format('%d/%d',[TrueFood,Report.Storage]));
-LoweredTextOut(offscreen.Canvas,-1,MainTexture,xFood-2,yFood+66,Phrases.Lookup('STORAGE'));
-
-// production section
-if IsCityAlive then
-  begin
-  CountBar(offscreen,xProd,yProd,wBar,2,Phrases.Lookup('MATERIAL'),
-    Report.CollectedMaterial,MainTexture);
-  CountBar(offscreen,xProd+dxBar,yProd,wBar,2,Phrases.Lookup('SUPPORT'),
-    Report.MaterialSupport,MainTexture);
-  if Report.Production>=0 then
-    if c.Project and (cpImp+cpIndex)=cpImp+imTrGoods then
-      CountBar(offscreen,xProd+dxBar,yProd+dyBar+16,wBar,6,Phrases.Lookup('PROFIT'),
-        Report.Production,MainTexture)
-    else CountBar(offscreen,xProd+dxBar,yProd+dyBar+16,wBar,2,Phrases.Lookup('PROD'),
-      Report.Production,MainTexture)
-  else
-    begin
-    MakeRed(xProd+dxBar-6,yProd+dyBar,wBar+10,38);
-    CountBar(offscreen,xProd+dxBar,yProd+dyBar+16,wBar,3,Phrases.Lookup('LACK'),
-      -Report.Production,RedTex);
-    end;
-  end;
-if c.Project and (cpImp+cpIndex)<>cpImp+imTrGoods then with offscreen.Canvas do
-  begin
-  i:=Report.Production;
-  if (i<0) or not IsCityAlive then i:=0;
-  FillBar(xProd+3,yProd+16+63,TrueProd,i,PrCost,4,true);
-  LoweredTextOut(offscreen.Canvas,-1,MainTexture,xProd+3-5,yProd+16+43,
-    Format('%d/%d',[TrueProd,PrCost]));
-  if BiColorTextWidth(offscreen.Canvas,PrName)>wBar+dxBar then
-    begin
-    repeat Delete(PrName,Length(PrName),1)
-    until BiColorTextWidth(offscreen.Canvas,PrName)<=wBar+dxBar;
-    PrName:=PrName+'.'
-    end;
-  end;
-RisedTextOut(offscreen.Canvas,xProd-2,yProd+36,PrName);
-
-// pollution section
-if IsCityAlive and (Report.AddPollution>0) then
-  begin
-  FillBar(xPoll+3,yPoll+20,TruePoll,Report.AddPollution,
-    MaxPollution,3,true);
-  RisedTextOut(offscreen.Canvas,xPoll+3-5,yPoll+20-20,Phrases.Lookup('POLL'));
-  end;
-
-// trade section
-if IsCityAlive and (Report.CollectedTrade>0) then
-  begin
-  CountBar(offscreen,xTrade,yTrade+dyBar div 2,wBar,4,Phrases.Lookup('TRADE'),Report.CollectedTrade,MainTexture);
-  CountBar(offscreen,xTrade+dxBar,yTrade+2*dyBar,wBar,5,Phrases.Lookup('CORR'),Report.Corruption,MainTexture);
-  CountBar(offscreen,xTrade+dxBar,yTrade,wBar,6,Phrases.Lookup('TAX'),Report.Tax,MainTexture);
-  CountBar(offscreen,xTrade+dxBar,yTrade+dyBar,wBar,12,Phrases.Lookup('SCIENCE'),Report.Science,MainTexture);
-  end;
-
-// small map
-BitBlt(Offscreen.Canvas.Handle,xSmallMap,ySmallmap,wSmallMap,hSmallMap,SmallCitymap.Canvas.Handle,0,0,SRCCOPY);
-if Mode=mImp then
-  Frame(Offscreen.Canvas,xSmallMap+48*(ZoomArea div 3),ySmallmap+24*(ZoomArea mod 3),
-    xSmallMap+48*(ZoomArea div 3)+49,ySmallmap+24*(ZoomArea mod 3)+25,
-    MainTexture.clMark,MainTexture.clMark);
-Frame(Offscreen.Canvas,xSmallMap-1,ySmallmap-1,xSmallMap+wSmallMap,ySmallmap+hSmallMap,$B0B0B0,$FFFFFF);
-RFrame(Offscreen.Canvas,xSmallMap-2,ySmallmap-2,xSmallMap+wSmallMap+1,ySmallmap+hSmallMap+1,$FFFFFF,$B0B0B0);
-
-Frame(Offscreen.Canvas,xSupport-1,ySupport-1,xSupport+wSupport,ySupport+hSupport,$B0B0B0,$FFFFFF);
-RFrame(Offscreen.Canvas,xSupport-2,ySupport-2,xSupport+wSupport+1,ySupport+hSupport+1,$FFFFFF,$B0B0B0);
-x:=xSupport+wSupport div 2;
-y:=ySupport+hSupport div 2;
-if Mode=mSupp then
-  begin
-  Offscreen.Canvas.brush.Color:=MainTexture.clMark;
-  Offscreen.Canvas.FillRect(Rect(x-27,y-6,x+27,y+6));
-  Offscreen.Canvas.brush.style:=bsClear;
-  end;
-Sprite(offscreen,HGrSystem,x-16,y-5,10,10,88,115);
-Sprite(offscreen,HGrSystem,x-5,y-5,10,10,66,115);
-Sprite(offscreen,HGrSystem,x+6,y-5,10,10,154,126);
-
-BitBlt(Offscreen.Canvas.Handle,xZoomMap,yZoommap,wZoomMap,hZoomMap,ZoomCitymap.Canvas.Handle,0,0,SRCCOPY);
-
-for i:=0 to 5 do imix[i]:=-1;
-if Mode=mImp then
-  begin
-  if ZoomArea=5 then
-    begin
-    Cnt:=0;
-    for iix:=0 to nImp-1 do
-      if ((iix<28) or (ImpPosition[iix]<0)) and (c.Built[iix]>0) then
+    cix := -1;
+  AllowChange := not supervising and (cix >= 0);
+  cLoc := Loc;
+  Happened := ShowEvent;
+  inherited ShowNewContent(NewMode);
+end;
+
+procedure TCityDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; x, y: integer);
+var
+  i, qx, qy, dx, dy, fix, NewTiles, Loc1, iix, SellResult: integer;
+  Rebuild: boolean;
+begin
+  if (ssLeft in Shift) and (x >= xSmallMap) and (x < xSmallMap + wSmallMap) and
+    (y >= ySmallMap) and (y < ySmallMap + hSmallMap) then
+  begin
+    Mode := mImp;
+    ZoomArea := (y - ySmallMap) * 3 div hSmallMap + 3 *
+      ((x - xSmallMap) * 2 div wSmallMap);
+    Page := 0;
+    InitZoomCityMap;
+    SmartUpdateContent;
+    exit;
+  end;
+  if (ssLeft in Shift) and (x >= xSupport) and (x < xSupport + wSupport) and
+    (y >= ySupport) and (y < ySupport + hSupport) then
+  begin
+    Mode := mSupp;
+    Page := 0;
+    InitZoomCityMap;
+    SmartUpdateContent;
+    exit;
+  end;
+  if not AllowChange then
+    exit; // not an own city
+
+  if (ssLeft in Shift) then
+    if (ClientMode < scContact) and (x >= xView) and (y >= yView) and
+      (x < xView + 73) and (y < yView + 50) then
+      if cGov = gAnarchy then
+        with MessgExDlg do
         begin
-        i:=Cnt-Page*6;
-        if (i>=0) and (i<6) then
-          imix[i]:=iix;
-        inc(Cnt);
-        end;
-    PageCount:=(Cnt+5) div 6;
-    end
-  else
-    begin
-    for iix:=28 to nImp-1 do
-      begin
-      i:=ImpPosition[iix]-6*ZoomArea;
-      if (i>=0) and (i<6) and (c.Built[iix]>0) then
-        imix[i]:=iix;
-      end;
-    PageCount:=0;
-    end;
-  for i:=0 to 5 do if imix[i]>=0 then
-    begin
-    iix:=imix[i];
-    x:=xZoomMap+14+72*(i mod 3);
-    y:=yZoomMap+14+56*(i div 3);
-    ImpImage(offscreen.Canvas,x,y,iix,cGov,AllowChange and (ClientMode<scContact));
-    if IsCityAlive then
-      begin
-      if iix=imColosseum then
-        begin
-        Sprite(offscreen,HGrSystem,x+46,y,14,14,82,100);
+          { MessgText:=Phrases.Lookup('OUTOFCONTROL');
+            if c.Project and cpImp=0 then
+            MessgText:=Format(MessgText,[Tribe[cOwner].ModelName[c.Project and cpIndex]])
+            else MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',c.Project and cpIndex)]); }
+          MessgText := Phrases.Lookup('NOCHANGEINANARCHY');
+          Kind := mkOk;
+          ShowModal;
         end
       else
+      begin
+        if ProdHint then
         begin
-        HappyGain:=0;
-        case iix of
-          0..27,imTemple: HappyGain:=2;
-          imTheater: HappyGain:=4;
-          imCathedral:
-            if MyRO.Wonder[woBach].EffectiveOwner=cOwner then HappyGain:=6
-            else HappyGain:=4;
-          end;
-        if HappyGain>1 then
-          begin d:=30 div(HappyGain-1);if d>10 then d:=10 end;
-        for j:=0 to HappyGain-1 do
-          Sprite(offscreen,HGrSystem,x+50,y+d*j,10,10,132,126);
+          ProdHint := false;
+          SmartUpdateContent
         end;
-      for j:=0 to Imp[iix].Maint-1 do
-        Sprite(offscreen,HGrSystem,x-4,y+29-3*j,10,10,132,115);
+        ChooseProject;
       end
-    end;
-  if imix[0]>=0 then
-    Imp0Area.Hint:=Phrases.Lookup('IMPROVEMENTS',imix[0])
-  else Imp0Area.Hint:='';
-  if imix[1]>=0 then
-    Imp1Area.Hint:=Phrases.Lookup('IMPROVEMENTS',imix[1])
-  else Imp1Area.Hint:='';
-  if imix[2]>=0 then
-    Imp2Area.Hint:=Phrases.Lookup('IMPROVEMENTS',imix[2])
-  else Imp2Area.Hint:='';
-  if imix[3]>=0 then
-    Imp3Area.Hint:=Phrases.Lookup('IMPROVEMENTS',imix[3])
-  else Imp3Area.Hint:='';
-  if imix[4]>=0 then
-    Imp4Area.Hint:=Phrases.Lookup('IMPROVEMENTS',imix[4])
-  else Imp4Area.Hint:='';
-  if imix[5]>=0 then
-    Imp5Area.Hint:=Phrases.Lookup('IMPROVEMENTS',imix[5])
-  else Imp5Area.Hint:='';
-  end
-else {if mode=mSupp then}
-  begin
-  LoweredTextOut(offscreen.Canvas,-1,MainTexture,xZoomMap+6,yZoomMap+2,Phrases.Lookup('SUPUNITS'));
-  FreeSupp:=c.Size*SupportFree[cGov] shr 1;
-  Cnt:=0;
-  for i:=0 to MyRO.nUn-1 do if (MyUn[i].Loc>=0) and (MyUn[i].Home=cix) then
-    with MyModel[MyUn[i].mix] do
+    else if (Mode = mImp) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
+      (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
+    begin
+      i := 5;
+      while (i >= 0) and not((x >= xZoomMap + 14 + 72 * (i mod 3)) and
+        (x < xZoomMap + 14 + 56 + 72 * (i mod 3)) and
+        (y >= yZoomMap + 14 + 56 * (i div 3)) and
+        (y < yZoomMap + 14 + 40 + 56 * (i div 3))) do
+        dec(i);
+      if i >= 0 then
       begin
-      Server(sGetUnitReport, me, i, UnitReport);
-      if (Cnt>=6*Page) and (Cnt<6*(Page+1)) then
-        begin // unit visible in display
-        imix[Cnt-6*Page]:=i;
-        x:=((Cnt-6*Page) mod 3)*64+xZoomMap;
-        y:=((Cnt-6*Page) div 3)*52+yZoomMap+20;
-        MakeUnitInfo(me,MyUn[i],UnitInfo);
-        NoMap.SetOutput(offscreen);
-        NoMap.PaintUnit(x,y,UnitInfo,MyUn[i].Status);
-
-        for j:=0 to UnitReport.FoodSupport-1 do
-          Sprite(offscreen,HGrSystem,x+38+11*j,y+40,10,10,66,115);
-        for j:=0 to UnitReport.ProdSupport-1 do
-          begin
-          if (FreeSupp>0) and (UnitReport.ReportFlags and urfAlwaysSupport=0) then
+        iix := imix[i];
+        if iix >= 0 then
+          if ssShift in Shift then
+            HelpDlg.ShowNewContent(Mode or wmPersistent, hkImp, iix)
+          else if (ClientMode < scContact) then
+            with MessgExDlg do
             begin
-            Sprite(offscreen,HGrSystem,x+16-11*j,y+40,10,10,143,115);
-            dec(FreeSupp);
-            end
-          else Sprite(offscreen,HGrSystem,x+16-11*j,y+40,10,10,88,115);
-          end;
-        if UnitReport.ReportFlags and urfDeployed<>0 then
-          for j:=0 to 1 do
-          Sprite(offscreen,HGrSystem,x+27+11*j,y+40,10,10,154,126)
-        end // unit visible in display
-      else dec(FreeSupp, UnitReport.ProdSupport);
-      inc(Cnt);
-      end;
-  PageCount:=(Cnt+5) div 6;
-  Imp0Area.Hint:='';
-  Imp1Area.Hint:='';
-  Imp2Area.Hint:='';
-  Imp3Area.Hint:='';
-  Imp4Area.Hint:='';
-  Imp5Area.Hint:='';
-  end;
-PageUpBtn.Visible:= PageCount>1;
-PageDownBtn.Visible:= PageCount>1;
-
-with offscreen.Canvas do
-  begin
-  {display project now}
-  DLine(offscreen.Canvas,xView+9+xSizeBig,xProd+2*wBar+10,yProd+dyBar+16,
-    $FFFFFF,$B0B0B0);
-  if prodhint then
-    begin
-    Frame(offscreen.canvas,xView+9-1,yView+5-1,xView+9+xSizeBig,yView+5+ySizeBig,$B0B0B0,$FFFFFF);
-    RFrame(offscreen.canvas,xView+9-2,yView+5-2,xView+9+xSizeBig+1,yView+5+ySizeBig+1,$FFFFFF,$B0B0B0);
-    with offscreen.canvas do
-      begin
-      Brush.Color:=$000000;
-      FillRect(Rect(xView+9,yView+5,xView+1+72-8,yView+5+40));
-      Brush.Style:=bsClear;
-      end
-    end
-  else if AllowChange and (c.Status and 7<>0) then
-    begin // city type autobuild
-    FrameImage(offscreen.canvas,bigimp,xView+9,yView+5,xSizeBig,ySizeBig,
-      (c.Status and 7-1+3)*xSizeBig,0,
-      (cix>=0) and (ClientMode<scContact));
-    end
-  else if c.Project and cpImp=0 then
-    begin // project is unit
-    FrameImage(offscreen.canvas,bigimp,xView+9,yView+5,xSizeBig,ySizeBig,0,0,
-      AllowChange and (ClientMode<scContact));
-    with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
-      Sprite(offscreen,HGr,xView+5,yView+1,64,44,
-        pix mod 10 *65+1,pix div 10*49+1);
-    end
-  else
-    begin // project is building
-    if ProdHint then Paintiix:=c.Project0 and cpIndex
-    else Paintiix:=c.Project and cpIndex;
-    ImpImage(Offscreen.Canvas,xView+9,yView+5,Paintiix,cGov,
-      AllowChange and (ClientMode<scContact));
-    end;
-  end;
-
-if AllowChange and (ClientMode<scContact) then
-  begin
-  i:=Server(sBuyCityProject-sExecute,me,cix,nil^);
-  BuyBtn.Visible:= (i=eOk) or (i=eViolation);
-  end
-else BuyBtn.Visible:=false;
-
-MarkUsedOffscreen(ClientWidth,ClientHeight);
-end;{OffscreenPaint}
-
-procedure TCityDlg.FormShow(Sender: TObject);
-var
-dx,dy,Loc1: integer;
-GetCityData: TGetCityData;
-begin
-BlinkTime:=5;
-if cix>=0 then
-  begin {own city}
-  c:=MyCity[cix];
-  cOwner:=me;
-  cGov:=MyRO.Government;
-  ProdHint:= (cGov<>gAnarchy)
-    and (Happened and (chProduction or chFounded or chCaptured or chAllImpsMade)<>0);
-  Server(sGetCityAreaInfo,me,cix,CityAreaInfo);
-  NextCityBtn.Visible:= WindowMode=wmPersistent;
-  PrevCityBtn.Visible:= WindowMode=wmPersistent;
-  end
-else {enemy city}
-  begin
-  Mode:=mImp;
-  Server(sGetCity,me,cLoc,GetCityData);
-  c:=GetCityData.c;
-  cOwner:=GetCityData.Owner;
-  cGov:=MyRO.EnemyReport[cOwner].Government;
-  Happened:=c.Flags and $7FFFFFFF;
-  ProdHint:=false;
-  Server(sGetEnemyCityAreaInfo,me,cLoc,CityAreaInfo);
-
-  if c.Project and cpImp=0 then
-    begin
-    emix:=MyRO.nEnemyModel-1;
-    while (emix>0) and ((MyRO.EnemyModel[emix].Owner<>cOwner)
-      or (integer(MyRO.EnemyModel[emix].mix)<>c.Project and cpIndex)) do dec(emix);
-    if Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr=0 then
-      InitEnemyModel(emix);
-    end;
-
-  NextCityBtn.Visible:=false;
-  PrevCityBtn.Visible:=false;
-  end;
-Page:=0;
-
-if c.Size<5 then SizeClass:=0
-else if c.Size<9 then SizeClass:=1
-else if c.Size<13 then SizeClass:=2
-else SizeClass:=3;
-
-// check if port
-IsPort:=false;
-for dx:=-2 to 2 do for dy:=-2 to 2 do if abs(dx)+abs(dy)=2 then
-  begin
-  Loc1:=dLoc(cLoc,dx,dy);
-  if (Loc1>=0) and (Loc1<G.lx*G.ly) and (MyMap[Loc1] and fTerrain<fGrass) then
-    IsPort:=true;
-  end;
-
-if WindowMode=wmModal then
-  begin {center on screen}
-  Left:=(Screen.Width-Width) div 2;
-  Top:=(Screen.Height-Height) div 2;
-  end;
-
-Caption:=CityName(c.ID);
-
-InitSmallCityMap;
-InitZoomCityMap;
-OpenSoundEvent:=-1;
-OffscreenPaint;
-Timer1.Enabled:=true;
-end;
-
-procedure TCityDlg.ShowNewContent(NewMode,Loc: integer; ShowEvent: cardinal);
-begin
-if MyMap[Loc] and fOwned<>0 then
-  begin // own city
-  cix:=MyRO.nCity-1;
-  while (cix>=0) and (MyCity[cix].Loc<>Loc) do dec(cix);
-  assert(cix>=0);
-  if (Optimize_cixTileChange>=0)
-    and (Optimize_TilesBeforeChange
-      and not MyCity[Optimize_cixTileChange].Tiles<>0) then
-    begin
-    CityOptimizer_ReleaseCityTiles(Optimize_cixTileChange,
-      Optimize_TilesBeforeChange and not MyCity[Optimize_cixTileChange].Tiles);
-    if WindowMode<>wmModal then
-      MainScreen.UpdateViews;
-    end;
-  Optimize_cixTileChange:=cix;
-  Optimize_TilesBeforeChange:=MyCity[cix].Tiles;
-  end
-else cix:=-1;
-AllowChange:=not supervising and (cix>=0);
-cLoc:=Loc;
-Happened:=ShowEvent;
-inherited ShowNewContent(NewMode);
-end;
-
-procedure TCityDlg.FormMouseDown(Sender:TObject;
-  Button:TMouseButton;Shift:TShiftState;x,y:integer);
-var
-i,qx,qy,dx,dy,fix,NewTiles,Loc1,iix,SellResult: integer;
-Rebuild: boolean;
-begin
-if (ssLeft in Shift) and (x>=xSmallMap) and (x<xSmallMap+wSmallMap)
-  and (y>=ySmallMap) and (y<ySmallMap+hSmallMap) then
-  begin
-  Mode:=mImp;
-  ZoomArea:=(y-ySmallMap)*3 div hSmallMap+3*((x-xSmallMap)*2 div wSmallMap);
-  Page:=0;
-  InitZoomCityMap;
-  SmartUpdateContent;
-  exit;
-  end;
-if (ssLeft in Shift) and (x>=xSupport) and (x<xSupport+wSupport)
-  and (y>=ySupport) and (y<ySupport+hSupport) then
-  begin
-  Mode:=mSupp;
-  Page:=0;
-  InitZoomCityMap;
-  SmartUpdateContent;
-  exit;
-  end;
-if not AllowChange then exit; // not an own city
-
-if (ssLeft in Shift) then
-  if (ClientMode<scContact)
-    and (x>=xView) and (y>=yView) and (x<xView+73) and (y<yView+50) then
-    if cGov=gAnarchy then with MessgExDlg do
-      begin
-{      MessgText:=Phrases.Lookup('OUTOFCONTROL');
-      if c.Project and cpImp=0 then
-        MessgText:=Format(MessgText,[Tribe[cOwner].ModelName[c.Project and cpIndex]])
-      else MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',c.Project and cpIndex)]);}
-      MessgText:=Phrases.Lookup('NOCHANGEINANARCHY');
-      Kind:=mkOk;
-      ShowModal;
-      end
-    else
-      begin
-      if ProdHint then
-        begin
-        ProdHint:=false;
-        SmartUpdateContent
-        end;
-      ChooseProject;
-      end
-  else if (Mode=mImp) and (x>=xZoomMap) and (x<xZoomMap+wZoomMap)
-    and (y>=yZoomMap) and (y<yZoomMap+hZoomMap) then
-    begin
-    i:=5;
-    while (i>=0) and
-      not ((x>=xZoomMap+14+72*(i mod 3))
-        and (x<xZoomMap+14+56+72*(i mod 3))
-        and (y>=yZoomMap+14+56*(i div 3))
-        and (y<yZoomMap+14+40+56*(i div 3))) do
-      dec(i);
-    if i>=0 then
-      begin
-      iix:=imix[i];
-      if iix>=0 then
-        if ssShift in Shift then
-          HelpDlg.ShowNewContent(Mode or wmPersistent, hkImp, iix)
-        else if (ClientMode<scContact) then with MessgExDlg do
-          begin
-          IconKind:=mikImp;
-          IconIndex:=iix;
-          if (iix=imPalace) or (Imp[iix].Kind=ikWonder) then
-            begin
-            MessgText:=Phrases.Lookup('IMPROVEMENTS',iix);
-            if iix=woOracle then
-              MessgText:=MessgText+'\'+Format(Phrases.Lookup('ORACLEINCOME'),
-                [MyRO.OracleIncome]);
-            Kind:=mkOk;
-            ShowModal;
-            end
-          else
-            begin
-            SellResult:=Server(sSellCityImprovement-sExecute,me,cix,iix);
-            if SellResult<rExecuted then
+              IconKind := mikImp;
+              IconIndex := iix;
+              if (iix = imPalace) or (Imp[iix].Kind = ikWonder) then
               begin
-              if SellResult=eOnlyOnce then
-                MessgText:=Phrases.Lookup('NOSELLAGAIN')
-              else MessgText:=Phrases.Lookup('OUTOFCONTROL');
-              MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',iix)]);
-              Kind:=mkOk;
-              ShowModal;
+                MessgText := Phrases.Lookup('IMPROVEMENTS', iix);
+                if iix = woOracle then
+                  MessgText := MessgText + '\' +
+                    Format(Phrases.Lookup('ORACLEINCOME'), [MyRO.OracleIncome]);
+                Kind := mkOk;
+                ShowModal;
               end
-            else
+              else
               begin
-              if Server(sRebuildCityImprovement-sExecute,me,cix,iix)<rExecuted then
-                begin // no rebuild possible, ask for sell only
-                Rebuild:=false;
-                MessgText:=Phrases.Lookup('IMPROVEMENTS',iix);
-                if not Phrases2FallenBackToEnglish then
-                  MessgText:=Format(Phrases2.Lookup('SELL2'),[MessgText,
-                    Imp[iix].Cost*BuildCostMod[G.Difficulty[me]] div 12])
-                else MessgText:=Format(Phrases.Lookup('SELL'),[MessgText]);
-                if iix=imSpacePort then with MyRO.Ship[me] do
-                  if Parts[0]+Parts[1]+Parts[2]>0 then
-                    MessgText:=MessgText+' '+Phrases.Lookup('SPDESTRUCTQUERY');
-                Kind:=mkYesNo;
-                ShowModal;
-                if ModalResult<>mrOK then iix:=-1
+                SellResult := Server(sSellCityImprovement - sExecute, me,
+                  cix, iix);
+                if SellResult < rExecuted then
+                begin
+                  if SellResult = eOnlyOnce then
+                    MessgText := Phrases.Lookup('NOSELLAGAIN')
+                  else
+                    MessgText := Phrases.Lookup('OUTOFCONTROL');
+                  MessgText := Format(MessgText,
+                    [Phrases.Lookup('IMPROVEMENTS', iix)]);
+                  Kind := mkOk;
+                  ShowModal;
                 end
-              else
+                else
                 begin
-                Rebuild:=true;
-                MessgText:=Phrases.Lookup('IMPROVEMENTS',iix);
-                if not Phrases2FallenBackToEnglish then
-                  MessgText:=Format(Phrases2.Lookup('DISPOSE2'),[MessgText,
-                    Imp[iix].Cost*BuildCostMod[G.Difficulty[me]] div 12 *2 div 3])
-                else MessgText:=Format(Phrases.Lookup('DISPOSE'),[MessgText]);
-                if iix=imSpacePort then with MyRO.Ship[me] do
-                  if Parts[0]+Parts[1]+Parts[2]>0 then
-                    MessgText:=MessgText+' '+Phrases.Lookup('SPDESTRUCTQUERY');
-                Kind:=mkYesNo;
-                ShowModal;
-                if ModalResult<>mrOK then iix:=-1
-                end;
-              if iix>=0 then
-                begin
-                if Rebuild then
+                  if Server(sRebuildCityImprovement - sExecute, me, cix, iix) < rExecuted
+                  then
+                  begin // no rebuild possible, ask for sell only
+                    Rebuild := false;
+                    MessgText := Phrases.Lookup('IMPROVEMENTS', iix);
+                    if not Phrases2FallenBackToEnglish then
+                      MessgText := Format(Phrases2.Lookup('SELL2'),
+                        [MessgText, Imp[iix].Cost * BuildCostMod
+                        [G.Difficulty[me]] div 12])
+                    else
+                      MessgText := Format(Phrases.Lookup('SELL'), [MessgText]);
+                    if iix = imSpacePort then
+                      with MyRO.Ship[me] do
+                        if Parts[0] + Parts[1] + Parts[2] > 0 then
+                          MessgText := MessgText + ' ' +
+                            Phrases.Lookup('SPDESTRUCTQUERY');
+                    Kind := mkYesNo;
+                    ShowModal;
+                    if ModalResult <> mrOK then
+                      iix := -1
+                  end
+                  else
                   begin
-                  Play('CITY_REBUILDIMP');
-                  Server(sRebuildCityImprovement,me,cix,iix);
+                    Rebuild := true;
+                    MessgText := Phrases.Lookup('IMPROVEMENTS', iix);
+                    if not Phrases2FallenBackToEnglish then
+                      MessgText := Format(Phrases2.Lookup('DISPOSE2'),
+                        [MessgText, Imp[iix].Cost * BuildCostMod
+                        [G.Difficulty[me]] div 12 * 2 div 3])
+                    else
+                      MessgText := Format(Phrases.Lookup('DISPOSE'),
+                        [MessgText]);
+                    if iix = imSpacePort then
+                      with MyRO.Ship[me] do
+                        if Parts[0] + Parts[1] + Parts[2] > 0 then
+                          MessgText := MessgText + ' ' +
+                            Phrases.Lookup('SPDESTRUCTQUERY');
+                    Kind := mkYesNo;
+                    ShowModal;
+                    if ModalResult <> mrOK then
+                      iix := -1
+                  end;
+                  if iix >= 0 then
+                  begin
+                    if Rebuild then
+                    begin
+                      Play('CITY_REBUILDIMP');
+                      Server(sRebuildCityImprovement, me, cix, iix);
+                    end
+                    else
+                    begin
+                      Play('CITY_SELLIMP');
+                      Server(sSellCityImprovement, me, cix, iix);
+                    end;
+                    CityOptimizer_CityChange(cix);
+                    InitSmallCityMap;
+                    SmartUpdateContent;
+                    if WindowMode <> wmModal then
+                      MainScreen.UpdateViews;
                   end
-                else
-                  begin
-                  Play('CITY_SELLIMP');
-                  Server(sSellCityImprovement,me,cix,iix);
-                  end;
-                CityOptimizer_CityChange(cix);
-                InitSmallCityMap;
-                SmartUpdateContent;
-                if WindowMode<>wmModal then
-                  MainScreen.UpdateViews;
                 end
               end
             end
-          end
       end
     end
-  else if (Mode=mSupp) and (x>=xZoomMap) and (x<xZoomMap+wZoomMap)
-    and (y>=yZoomMap) and (y<yZoomMap+hZoomMap) then
-    begin
-    i:=5;
-    while (i>=0) and
-      not ((x>=xZoomMap+64*(i mod 3))
-        and (x<xZoomMap+64+64*(i mod 3))
-        and (y>=yZoomMap+20+48*(i div 3))
-        and (y<yZoomMap+20+52+48*(i div 3))) do
-      dec(i);
-    if (i>=0) and (imix[i]>=0) then
-      if ssShift in Shift then
-      else if (cix>=0) and (ClientMode<scContact) and (WindowMode<>wmModal) then
+    else if (Mode = mSupp) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
+      (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
+    begin
+      i := 5;
+      while (i >= 0) and not((x >= xZoomMap + 64 * (i mod 3)) and
+        (x < xZoomMap + 64 + 64 * (i mod 3)) and
+        (y >= yZoomMap + 20 + 48 * (i div 3)) and
+        (y < yZoomMap + 20 + 52 + 48 * (i div 3))) do
+        dec(i);
+      if (i >= 0) and (imix[i] >= 0) then
+        if ssShift in Shift then
+        else if (cix >= 0) and (ClientMode < scContact) and
+          (WindowMode <> wmModal) then
         begin
-        CloseAction:=None;
-        Close;
-        MainScreen.CityClosed(imix[i],false,true);
+          CloseAction := None;
+          Close;
+          MainScreen.CityClosed(imix[i], false, true);
         end
     end
-  else if (x>=xmArea-192) and (x<xmArea+192) and (y>=ymArea-96) and (y<ymArea+96) then
-    begin
-    qx:=((4000*xxt*yyt)+(x-xmArea)*(yyt*2)+(y-ymArea+yyt)*(xxt*2)) div (xxt*yyt*4)-1000;
-    qy:=((4000*xxt*yyt)+(y-ymArea+yyt)*(xxt*2)-(x-xmArea)*(yyt*2)) div (xxt*yyt*4)-1000;
-    dx:=qx-qy;
-    dy:=qx+qy;
-    if (dx>=-3) and (dx<=3) and (dy>=-3) and (dy<=3) and (dx*dx*dy*dy<81)
-      and ((dx<>0) or (dy<>0)) then
-      if ssShift in Shift then
+    else if (x >= xmArea - 192) and (x < xmArea + 192) and (y >= ymArea - 96)
+      and (y < ymArea + 96) then
+    begin
+      qx := ((4000 * xxt * yyt) + (x - xmArea) * (yyt * 2) + (y - ymArea + yyt)
+        * (xxt * 2)) div (xxt * yyt * 4) - 1000;
+      qy := ((4000 * xxt * yyt) + (y - ymArea + yyt) * (xxt * 2) - (x - xmArea)
+        * (yyt * 2)) div (xxt * yyt * 4) - 1000;
+      dx := qx - qy;
+      dy := qx + qy;
+      if (dx >= -3) and (dx <= 3) and (dy >= -3) and (dy <= 3) and
+        (dx * dx * dy * dy < 81) and ((dx <> 0) or (dy <> 0)) then
+        if ssShift in Shift then
         begin // terrain help
-        Loc1:=dLoc(cLoc,dx,dy);
-        if (Loc1>=0) and (Loc1<G.lx*G.ly) then
-          HelpOnTerrain(Loc1, Mode or wmPersistent)
+          Loc1 := dLoc(cLoc, dx, dy);
+          if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) then
+            HelpOnTerrain(Loc1, Mode or wmPersistent)
         end
-      else if (ClientMode<scContact) and (cGov<>gAnarchy)
-        and (c.Flags and chCaptured=0) then
+        else if (ClientMode < scContact) and (cGov <> gAnarchy) and
+          (c.Flags and chCaptured = 0) then
         begin // toggle exploitation
-        assert(not supervising);
-        if c.Status and csResourceWeightsMask<>0 then
+          assert(not supervising);
+          if c.Status and csResourceWeightsMask <> 0 then
           begin
-          with MessgExDlg do
+            with MessgExDlg do
             begin
-            MessgText:=Phrases.Lookup('CITYMANAGEOFF');
-            OpenSound:='MSG_DEFAULT';
-            Kind:=mkOkCancel;
-            IconKind:=mikFullControl;
-            ShowModal;
+              MessgText := Phrases.Lookup('CITYMANAGEOFF');
+              OpenSound := 'MSG_DEFAULT';
+              Kind := mkOkCancel;
+              IconKind := mikFullControl;
+              ShowModal;
             end;
-          if MessgExDlg.ModalResult=mrOK then
+            if MessgExDlg.ModalResult = mrOK then
             begin
-            MyCity[cix].Status:=MyCity[cix].Status
-              and not csResourceWeightsMask; // off
-            c.Status:=MyCity[cix].Status;
-            SmartUpdateContent
+              MyCity[cix].Status := MyCity[cix].Status and
+                not csResourceWeightsMask; // off
+              c.Status := MyCity[cix].Status;
+              SmartUpdateContent
             end;
-          exit;
+            exit;
           end;
-        fix:=(dy+3) shl 2+(dx+3) shr 1;
-        NewTiles:=MyCity[cix].Tiles xor (1 shl fix);
-        if Server(sSetCityTiles,me,cix,NewTiles)>=rExecuted then
+          fix := (dy + 3) shl 2 + (dx + 3) shr 1;
+          NewTiles := MyCity[cix].Tiles xor (1 shl fix);
+          if Server(sSetCityTiles, me, cix, NewTiles) >= rExecuted then
           begin
-          SmartUpdateContent;
-          if WindowMode<>wmModal then
-            MainScreen.UpdateViews;
+            SmartUpdateContent;
+            if WindowMode <> wmModal then
+              MainScreen.UpdateViews;
           end
         end
     end
-  else if (ClientMode<scContact) and (cGov<>gAnarchy) and (c.Flags and chCaptured=0)
-    and (x>=xmOpt-32) and (x<xmOpt+32) and (y>=ymOpt-32) and (y<ymOpt+32) then
-    begin
-    i:=sqr(x-xmOpt)+sqr(y-ymOpt); // click radius
-    if i<=32*32 then
+    else if (ClientMode < scContact) and (cGov <> gAnarchy) and
+      (c.Flags and chCaptured = 0) and (x >= xmOpt - 32) and (x < xmOpt + 32)
+      and (y >= ymOpt - 32) and (y < ymOpt + 32) then
+    begin
+      i := sqr(x - xmOpt) + sqr(y - ymOpt); // click radius
+      if i <= 32 * 32 then
       begin
-      if i<16*16 then // inner area clicked
-        if c.Status and csResourceWeightsMask<>0 then
-          i:=(c.Status shr 4 and $0F) mod 5 +1 // rotate except off
-        else i:=3 // rwGrowth
-      else case trunc(arctan2(x-xmOpt,ymOpt-y)*180/pi) of
-        -25-52*2..-26-52: i:=1;
-        -25-52..-26: i:=2;
-        -25..25: i:=3;
-        26..25+52: i:=4;
-        26+52..25+52*2: i:=5;
-        180-26..180,-180..-180+26: i:=0;
-        else i:=-1;
-        end;
-      if i>=0 then
+        if i < 16 * 16 then // inner area clicked
+          if c.Status and csResourceWeightsMask <> 0 then
+            i := (c.Status shr 4 and $0F) mod 5 + 1 // rotate except off
+          else
+            i := 3 // rwGrowth
+        else
+          case trunc(arctan2(x - xmOpt, ymOpt - y) * 180 / pi) of
+            - 25 - 52 * 2 .. -26 - 52:
+              i := 1;
+            -25 - 52 .. -26:
+              i := 2;
+            -25 .. 25:
+              i := 3;
+            26 .. 25 + 52:
+              i := 4;
+            26 + 52 .. 25 + 52 * 2:
+              i := 5;
+            180 - 26 .. 180, -180 .. -180 + 26:
+              i := 0;
+          else
+            i := -1;
+          end;
+        if i >= 0 then
         begin
-        ChangeResourceWeights(i);
-        SmartUpdateContent;
-        if WindowMode<>wmModal then
-          MainScreen.UpdateViews;
+          ChangeResourceWeights(i);
+          SmartUpdateContent;
+          if WindowMode <> wmModal then
+            MainScreen.UpdateViews;
         end
       end
     end;
-end;{FormMouseDown}
+end; { FormMouseDown }
 
 procedure TCityDlg.ChooseProject;
 const
-ptSelect=0; ptTrGoods=1; ptUn=2; ptCaravan=3; ptImp=4; ptWonder=6;
-ptShip=7; ptInvalid=8;
+  ptSelect = 0;
+  ptTrGoods = 1;
+  ptUn = 2;
+  ptCaravan = 3;
+  ptImp = 4;
+  ptWonder = 6;
+  ptShip = 7;
+  ptInvalid = 8;
 
   function ProjectType(Project: integer): integer;
   begin
-  if Project and cpCompleted<>0 then result:=ptSelect
-  else if Project and (cpImp+cpIndex)=cpImp+imTrGoods then result:=ptTrGoods
-  else if Project and cpImp=0 then
-    if MyModel[Project and cpIndex].Kind=mkCaravan then result:=ptCaravan
-    else result:=ptUn
-  else if Project and cpIndex>=nImp then result:=ptInvalid
-  else if Imp[Project and cpIndex].Kind=ikWonder then result:=ptWonder
-  else if Imp[Project and cpIndex].Kind=ikShipPart then result:=ptShip
-  else result:=ptImp
+    if Project and cpCompleted <> 0 then
+      result := ptSelect
+    else if Project and (cpImp + cpIndex) = cpImp + imTrGoods then
+      result := ptTrGoods
+    else if Project and cpImp = 0 then
+      if MyModel[Project and cpIndex].Kind = mkCaravan then
+        result := ptCaravan
+      else
+        result := ptUn
+    else if Project and cpIndex >= nImp then
+      result := ptInvalid
+    else if Imp[Project and cpIndex].Kind = ikWonder then
+      result := ptWonder
+    else if Imp[Project and cpIndex].Kind = ikShipPart then
+      result := ptShip
+    else
+      result := ptImp
   end;
 
 var
-NewProject, OldMoney,pt0,pt1,cix1: integer;
-QueryOk: boolean;
-begin
-assert(not supervising);
-ModalSelectDlg.ShowNewContent_CityProject(wmModal,cix);
-if ModalSelectDlg.result<>-1 then
-  begin
-  if ModalSelectDlg.result and cpType<>0 then
-    begin
-    MyCity[cix].Status:=MyCity[cix].Status and not 7
-      or (1+ModalSelectDlg.result and cpIndex);
-    AutoBuild(cix, MyData.ImpOrder[ModalSelectDlg.result and cpIndex]);
+  NewProject, OldMoney, pt0, pt1, cix1: integer;
+  QueryOk: boolean;
+begin
+  assert(not supervising);
+  ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
+  if ModalSelectDlg.result <> -1 then
+  begin
+    if ModalSelectDlg.result and cpType <> 0 then
+    begin
+      MyCity[cix].Status := MyCity[cix].Status and not 7 or
+        (1 + ModalSelectDlg.result and cpIndex);
+      AutoBuild(cix, MyData.ImpOrder[ModalSelectDlg.result and cpIndex]);
     end
-  else
-    begin
-    NewProject:=ModalSelectDlg.result;
-    QueryOk:=true;
-    if (NewProject and cpImp<>0) and (NewProject and cpIndex>=28)
-      and (MyRO.NatBuilt[NewProject and cpIndex]>0) then
-      with MessgExDlg do
+    else
+    begin
+      NewProject := ModalSelectDlg.result;
+      QueryOk := true;
+      if (NewProject and cpImp <> 0) and (NewProject and cpIndex >= 28) and
+        (MyRO.NatBuilt[NewProject and cpIndex] > 0) then
+        with MessgExDlg do
         begin
-        cix1:=MyRO.nCity-1;
-        while (cix1>=0) and (MyCity[cix1].Built[NewProject and cpIndex]=0) do
-          dec(cix1);
-        MessgText:=Format(Phrases.Lookup('DOUBLESTATEIMP'),
-          [Phrases.Lookup('IMPROVEMENTS', NewProject and cpIndex),
-          CityName(MyCity[cix1].ID)]);
-        OpenSound:='MSG_DEFAULT';
-        Kind:=mkOkCancel;
-        IconKind:=mikImp;
-        IconIndex:=NewProject and cpIndex;
-        ShowModal;
-        QueryOk:= ModalResult=mrOK;
+          cix1 := MyRO.nCity - 1;
+          while (cix1 >= 0) and
+            (MyCity[cix1].Built[NewProject and cpIndex] = 0) do
+            dec(cix1);
+          MessgText := Format(Phrases.Lookup('DOUBLESTATEIMP'),
+            [Phrases.Lookup('IMPROVEMENTS', NewProject and cpIndex),
+            CityName(MyCity[cix1].ID)]);
+          OpenSound := 'MSG_DEFAULT';
+          Kind := mkOkCancel;
+          IconKind := mikImp;
+          IconIndex := NewProject and cpIndex;
+          ShowModal;
+          QueryOk := ModalResult = mrOK;
         end;
-    if not QueryOk then
-      exit;
-
-    if (MyCity[cix].Prod>0) then
+      if not QueryOk then
+        exit;
+
+      if (MyCity[cix].Prod > 0) then
       begin
-      pt0:=ProjectType(MyCity[cix].Project0);
-      pt1:=ProjectType(NewProject);
-      if (pt0<>ptSelect) and (pt1<>ptTrGoods) then
+        pt0 := ProjectType(MyCity[cix].Project0);
+        pt1 := ProjectType(NewProject);
+        if (pt0 <> ptSelect) and (pt1 <> ptTrGoods) then
         begin
-        if NewProject and (cpImp or cpIndex)<>MyCity[cix].Project0 and (cpImp or cpIndex) then
+          if NewProject and (cpImp or cpIndex) <> MyCity[cix].Project0 and
+            (cpImp or cpIndex) then
           begin // loss of material -- do query
-          if (pt1=ptTrGoods) or (pt1=ptShip) or (pt1<>pt0) and (pt0<>ptCaravan) then
-            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
+            if (pt1 = ptTrGoods) or (pt1 = ptShip) or (pt1 <> pt0) and
+              (pt0 <> ptCaravan) then
+              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;
         end
       end;
-    if not QueryOk then
-      exit;
-
-    OldMoney:=MyRO.Money;
-    MyCity[cix].Status:=MyCity[cix].Status and not 7;
-    if (NewProject and cpImp=0)
-      and ((MyCity[cix].Size<4) and (MyModel[NewProject and cpIndex].Kind=mkSettler)
-        or (MyCity[cix].Size<3) and ((MyModel[NewProject and cpIndex].Kind=mkSlaves)
-          or (NewProject and cpConscripts<>0))) then
-      if SimpleQuery(mkYesNo,Phrases.Lookup('EMIGRATE'),'MSG_DEFAULT')<>mrOK then
-        NewProject:=NewProject or cpDisbandCity;
-    Server(sSetCityProject,me,cix,NewProject);
-    c.Project:=MyCity[cix].Project;
-    if MyRO.Money>OldMoney then
-      Play('CITY_SELLIMP');
-    end;
-  CityOptimizer_CityChange(cix);
-
-  if WindowMode<>wmModal then
-    MainScreen.UpdateViews;
-  InitSmallCityMap;
-  SmartUpdateContent;
-  end;
-end;
-
-procedure TCityDlg.BuyClick(Sender:TObject);
+      if not QueryOk then
+        exit;
+
+      OldMoney := MyRO.Money;
+      MyCity[cix].Status := MyCity[cix].Status and not 7;
+      if (NewProject and cpImp = 0) and
+        ((MyCity[cix].Size < 4) and
+        (MyModel[NewProject and cpIndex].Kind = mkSettler) or
+        (MyCity[cix].Size < 3) and
+        ((MyModel[NewProject and cpIndex].Kind = mkSlaves) or
+        (NewProject and cpConscripts <> 0))) then
+        if SimpleQuery(mkYesNo, Phrases.Lookup('EMIGRATE'), 'MSG_DEFAULT') <> mrOK
+        then
+          NewProject := NewProject or cpDisbandCity;
+      Server(sSetCityProject, me, cix, NewProject);
+      c.Project := MyCity[cix].Project;
+      if MyRO.Money > OldMoney then
+        Play('CITY_SELLIMP');
+    end;
+    CityOptimizer_CityChange(cix);
+
+    if WindowMode <> wmModal then
+      MainScreen.UpdateViews;
+    InitSmallCityMap;
+    SmartUpdateContent;
+  end;
+end;
+
+procedure TCityDlg.BuyClick(Sender: TObject);
 var
-NextProd,Cost:integer;
-begin
-if (cix<0) or (ClientMode>=scContact) then exit;
-with MyCity[cix],MessgExDlg do
-  begin
-  Cost:=Report.ProjectCost;
-  NextProd:=Report.Production;
-  if NextProd<0 then NextProd:=0;
-  Cost:=Cost-Prod-NextProd;
-  if (MyRO.Wonder[woMich].EffectiveOwner=me) and (Project and cpImp<>0) then
-    Cost:=Cost*2
-  else Cost:=Cost*4;
-  if (Cost<=0) and (Report.HappinessBalance>=0) {no disorder} then
-    begin MessgText:=Phrases.Lookup('READY'); Kind:=mkOK; end
-  else if Cost>MyRO.Money then
-    begin
-    OpenSound:='MSG_DEFAULT';
-    MessgText:=Format(Phrases.Lookup('NOMONEY'),[Cost,MyRO.Money]);
-    Kind:=mkOK;
+  NextProd, Cost: integer;
+begin
+  if (cix < 0) or (ClientMode >= scContact) then
+    exit;
+  with MyCity[cix], MessgExDlg do
+  begin
+    Cost := Report.ProjectCost;
+    NextProd := Report.Production;
+    if NextProd < 0 then
+      NextProd := 0;
+    Cost := Cost - Prod - NextProd;
+    if (MyRO.Wonder[woMich].EffectiveOwner = me) and (Project and cpImp <> 0)
+    then
+      Cost := Cost * 2
+    else
+      Cost := Cost * 4;
+    if (Cost <= 0) and (Report.HappinessBalance >= 0) { no disorder } then
+    begin
+      MessgText := Phrases.Lookup('READY');
+      Kind := mkOk;
     end
-  else begin MessgText:=Format(Phrases.Lookup('BUY'),[Cost]); Kind:=mkYesNo; end;
-  ShowModal;
-  if (Kind=mkYesNo) and (ModalResult=mrOK) then
-    begin
-    if Server(sBuyCityProject,me,cix,nil^)>=rExecuted then
+    else if Cost > MyRO.Money then
+    begin
+      OpenSound := 'MSG_DEFAULT';
+      MessgText := Format(Phrases.Lookup('NOMONEY'), [Cost, MyRO.Money]);
+      Kind := mkOk;
+    end
+    else
+    begin
+      MessgText := Format(Phrases.Lookup('BUY'), [Cost]);
+      Kind := mkYesNo;
+    end;
+    ShowModal;
+    if (Kind = mkYesNo) and (ModalResult = mrOK) then
+    begin
+      if Server(sBuyCityProject, me, cix, nil^) >= rExecuted then
       begin
-      Play('CITY_BUYPROJECT');
-      SmartUpdateContent;
-      if WindowMode<>wmModal then
-        MainScreen.UpdateViews;
+        Play('CITY_BUYPROJECT');
+        SmartUpdateContent;
+        if WindowMode <> wmModal then
+          MainScreen.UpdateViews;
       end
     end
@@ -1370 +1588 @@
 procedure TCityDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-Timer1.Enabled:=false;
-ProdHint:=false;
-MarkCityLoc:=-1;
-if Optimize_cixTileChange>=0 then
-  begin
-  if Optimize_TilesBeforeChange
-    and not MyCity[Optimize_cixTileChange].Tiles<>0 then
-    begin
-    CityOptimizer_ReleaseCityTiles(Optimize_cixTileChange,
-      Optimize_TilesBeforeChange and not MyCity[Optimize_cixTileChange].Tiles);
-    if WindowMode<>wmModal then
-      MainScreen.UpdateViews;
-    end;
-  Optimize_cixTileChange:=-1;
-  end;
-if CloseAction>None then
-  MainScreen.CityClosed(RestoreUnFocus,CloseAction=StepFocus);
-RestoreUnFocus:=-1;
-inherited;
+  Timer1.Enabled := false;
+  ProdHint := false;
+  MarkCityLoc := -1;
+  if Optimize_cixTileChange >= 0 then
+  begin
+    if Optimize_TilesBeforeChange and not MyCity[Optimize_cixTileChange]
+      .Tiles <> 0 then
+    begin
+      CityOptimizer_ReleaseCityTiles(Optimize_cixTileChange,
+        Optimize_TilesBeforeChange and
+        not MyCity[Optimize_cixTileChange].Tiles);
+      if WindowMode <> wmModal then
+        MainScreen.UpdateViews;
+    end;
+    Optimize_cixTileChange := -1;
+  end;
+  if CloseAction > None then
+    MainScreen.CityClosed(RestoreUnFocus, CloseAction = StepFocus);
+  RestoreUnFocus := -1;
+  inherited;
 end;
 
 procedure TCityDlg.Timer1Timer(Sender: TObject);
 begin
-if ProdHint then
-  begin
-  BlinkTime:=(BlinkTime+1) mod 12;
-  if BlinkTime=0 then with Canvas do
-    begin
-    BitBlt(canvas.Handle,xView+5,yView+1,64,2,
-      back.Canvas.Handle,xView+5,yView+1,SRCCOPY);
-    BitBlt(canvas.Handle,xView+5,yView+3,2,42,
-      back.Canvas.Handle,xView+5,yView+3,SRCCOPY);
-    BitBlt(canvas.Handle,xView+5+62,yView+3,2,42,
-      back.Canvas.Handle,xView+5+62,yView+3,SRCCOPY);
-    Frame(canvas,xView+9-1,yView+5-1,xView+9+xSizeBig,yView+5+ySizeBig,$B0B0B0,$FFFFFF);
-    RFrame(canvas,xView+9-2,yView+5-2,xView+9+xSizeBig+1,yView+5+ySizeBig+1,$FFFFFF,$B0B0B0);
-    Brush.Color:=$000000;
-    FillRect(Rect(xView+9,yView+5,xView+1+72-8,yView+5+40));
-    Brush.Style:=bsClear;
-    end
-  else if BlinkTime=6 then
-    begin
-    if AllowChange and (c.Status and 7<>0) then
+  if ProdHint then
+  begin
+    BlinkTime := (BlinkTime + 1) mod 12;
+    if BlinkTime = 0 then
+      with Canvas do
+      begin
+        bitblt(Canvas.Handle, xView + 5, yView + 1, 64, 2, Back.Canvas.Handle,
+          xView + 5, yView + 1, SRCCOPY);
+        bitblt(Canvas.Handle, xView + 5, yView + 3, 2, 42, Back.Canvas.Handle,
+          xView + 5, yView + 3, SRCCOPY);
+        bitblt(Canvas.Handle, xView + 5 + 62, yView + 3, 2, 42,
+          Back.Canvas.Handle, xView + 5 + 62, yView + 3, SRCCOPY);
+        Frame(Canvas, xView + 9 - 1, yView + 5 - 1, xView + 9 + xSizeBig,
+          yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
+        RFrame(Canvas, xView + 9 - 2, yView + 5 - 2, xView + 9 + xSizeBig + 1,
+          yView + 5 + ySizeBig + 1, $FFFFFF, $B0B0B0);
+        brush.Color := $000000;
+        FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
+          yView + 5 + 40));
+        brush.style := bsClear;
+      end
+    else if BlinkTime = 6 then
+    begin
+      if AllowChange and (c.Status and 7 <> 0) then
       begin // city type autobuild
-      FrameImage(canvas,bigimp,xView+9,yView+5,xSizeBig,ySizeBig,
-        (c.Status and 7-1+3)*xSizeBig,0,true);
+        FrameImage(Canvas, bigimp, xView + 9, yView + 5, xSizeBig, ySizeBig,
+          (c.Status and 7 - 1 + 3) * xSizeBig, 0, true);
       end
-    else if c.Project and cpImp=0 then
+      else if c.Project and cpImp = 0 then
       begin // project is unit
-      BitBlt(canvas.Handle,xView+9,yView+5,xSizeBig,ySizeBig,
-        bigimp.Canvas.Handle,0,0,SRCCOPY);
-      with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
-        Sprite(canvas,HGr,xView+5,yView+1,64,44,
-          pix mod 10 *65+1,pix div 10*49+1);
+        bitblt(Canvas.Handle, xView + 9, yView + 5, xSizeBig, ySizeBig,
+          bigimp.Canvas.Handle, 0, 0, SRCCOPY);
+        with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
+          Sprite(Canvas, HGr, xView + 5, yView + 1, 64, 44, pix mod 10 * 65 + 1,
+            pix div 10 * 49 + 1);
       end
-    else ImpImage(Canvas,xView+9,yView+5,
-      c.Project0 and cpIndex,cGov,true);
+      else
+        ImpImage(Canvas, xView + 9, yView + 5, c.Project0 and cpIndex,
+          cGov, true);
     end
   end
@@ -1433 +1657 @@
 procedure TCityDlg.FormPaint(Sender: TObject);
 begin
-inherited;
-if OpenSoundEvent>=0 then PostMessage(Handle, WM_PLAYSOUND, 0, 0);
-end;
-
-procedure TCityDlg.OnPlaySound(var Msg:TMessage);
-begin
-if 1 shl OpenSoundEvent=chProduction then
-  begin
-  if c.Project0 and cpImp<>0 then
-    begin
-    if c.Project0 and cpIndex>=28 then // wonders have already extra message with sound
-      if Imp[c.Project0 and cpIndex].Kind=ikShipPart then Play('SHIP_BUILT')
-      else Play('CITY_IMPCOMPLETE')
+  inherited;
+  if OpenSoundEvent >= 0 then
+    PostMessage(Handle, WM_PLAYSOUND, 0, 0);
+end;
+
+procedure TCityDlg.OnPlaySound(var Msg: TMessage);
+begin
+  if 1 shl OpenSoundEvent = chProduction then
+  begin
+    if c.Project0 and cpImp <> 0 then
+    begin
+      if c.Project0 and cpIndex >= 28 then
+      // wonders have already extra message with sound
+        if Imp[c.Project0 and cpIndex].Kind = ikShipPart then
+          Play('SHIP_BUILT')
+        else
+          Play('CITY_IMPCOMPLETE')
     end
-  else Play('CITY_UNITCOMPLETE');
+    else
+      Play('CITY_UNITCOMPLETE');
   end
-else Play(CityEventSoundItem[OpenSoundEvent]);
-OpenSoundEvent:=-2;
+  else
+    Play(CityEventSoundItem[OpenSoundEvent]);
+  OpenSoundEvent := -2;
 end;
 
 function Prio(iix: integer): integer;
 begin
-case Imp[iix].Kind of
-  ikWonder: result:=iix+10000;
-  ikNatLocal, ikNatGlobal:
+  case Imp[iix].Kind of
+    ikWonder:
+      result := iix + 10000;
+    ikNatLocal, ikNatGlobal:
+      case iix of
+        imPalace:
+          result := 0;
+      else
+        result := iix + 20000;
+      end;
+  else
     case iix of
-      imPalace: result:=0;
-      else result:=iix+20000;
-      end;
-  else case iix of
-    imTownHall, imCourt: result:=iix+30000;
-    imAqueduct, imSewer: result:=iix+40000;
-    imTemple, imTheater, imCathedral: result:=iix+50000;
-    else result:=iix+90000;
+      imTownHall, imCourt:
+        result := iix + 30000;
+      imAqueduct, imSewer:
+        result := iix + 40000;
+      imTemple, imTheater, imCathedral:
+        result := iix + 50000;
+    else
+      result := iix + 90000;
     end;
   end;
@@ -1473 +1711 @@
 procedure TCityDlg.NextCityBtnClick(Sender: TObject);
 begin
-ChangeCity(+1);
+  ChangeCity(+1);
 end;
 
 procedure TCityDlg.PrevCityBtnClick(Sender: TObject);
 begin
-ChangeCity(-1);
+  ChangeCity(-1);
 end;
 
 procedure TCityDlg.ChangeCity(d: integer);
 var
-cixNew: integer;
-begin
-cixNew:=cix;
-repeat
-  cixNew:=(cixNew+MyRO.nCity+d) mod MyRO.nCity;
-until (MyCity[cixNew].Loc>=0) or (cixNew=cix);
-if cixNew<>cix then
-  MainScreen.ZoomToCity(MyCity[cixNew].Loc);
+  cixNew: integer;
+begin
+  cixNew := cix;
+  repeat
+    cixNew := (cixNew + MyRO.nCity + d) mod MyRO.nCity;
+  until (MyCity[cixNew].Loc >= 0) or (cixNew = cix);
+  if cixNew <> cix then
+    MainScreen.ZoomToCity(MyCity[cixNew].Loc);
 end;
 
@@ -1496 +1734 @@
   Shift: TShiftState);
 begin
-if ((Key=VK_UP) or (Key=VK_NUMPAD8))
-  and (cix>=0) and (WindowMode=wmPersistent) then
-  ChangeCity(-1)
-else if ((Key=VK_DOWN) or (Key=VK_NUMPAD2))
-  and (cix>=0) and (WindowMode=wmPersistent) then
-  ChangeCity(+1)
-else inherited  
-end;
-
-{procedure TCityDlg.AdviceBtnClick(Sender: TObject);
-begin
-AdvisorDlg.GiveCityAdvice(cix);
-end;}
+  if ((Key = VK_UP) or (Key = VK_NUMPAD8)) and (cix >= 0) and
+    (WindowMode = wmPersistent) then
+    ChangeCity(-1)
+  else if ((Key = VK_DOWN) or (Key = VK_NUMPAD2)) and (cix >= 0) and
+    (WindowMode = wmPersistent) then
+    ChangeCity(+1)
+  else
+    inherited
+end;
+
+{ procedure TCityDlg.AdviceBtnClick(Sender: TObject);
+  begin
+  AdvisorDlg.GiveCityAdvice(cix);
+  end; }
 
 var
-i,j,k: integer;
+  i, j, k: integer;
 
 procedure TCityDlg.PageUpBtnClick(Sender: TObject);
 begin
-if Page>0 then
-  begin
-  dec(Page);
-  SmartUpdateContent
+  if Page > 0 then
+  begin
+    dec(Page);
+    SmartUpdateContent
   end
 end;
@@ -1524 +1763 @@
 procedure TCityDlg.PageDownBtnClick(Sender: TObject);
 begin
-if Page<PageCount-1 then
-  begin
-  inc(Page);
-  SmartUpdateContent
+  if Page < PageCount - 1 then
+  begin
+    inc(Page);
+    SmartUpdateContent
   end
 end;
@@ -1533 +1772 @@
 procedure TCityDlg.ChangeResourceWeights(iResourceWeights: integer);
 var
-Advice: TCityTileAdviceData;
-begin
-assert(not supervising);
-assert(cix>=0);
-MyCity[cix].Status:=MyCity[cix].Status
-  and not csResourceWeightsMask or (iResourceWeights shl 4);
-c.Status:=MyCity[cix].Status;
-if iResourceWeights>0 then
-  begin
-  Advice.ResourceWeights:=OfferedResourceWeights[iResourceWeights];
-  Server(sGetCityTileAdvice,me,cix,Advice);
-  if Advice.Tiles<>MyCity[cix].Tiles then
-    Server(sSetCityTiles,me,cix,Advice.Tiles);
-  end  
-end;
-
+  Advice: TCityTileAdviceData;
+begin
+  assert(not supervising);
+  assert(cix >= 0);
+  MyCity[cix].Status := MyCity[cix].Status and not csResourceWeightsMask or
+    (iResourceWeights shl 4);
+  c.Status := MyCity[cix].Status;
+  if iResourceWeights > 0 then
+  begin
+    Advice.ResourceWeights := OfferedResourceWeights[iResourceWeights];
+    Server(sGetCityTileAdvice, me, cix, Advice);
+    if Advice.Tiles <> MyCity[cix].Tiles then
+      Server(sSetCityTiles, me, cix, Advice.Tiles);
+  end
+end;
 
 initialization
-for i:=0 to nImp-1 do ImpSorted[i]:=i;
-for i:=0 to nImp-2 do for j:=i+1 to nImp-1 do
-  if Prio(ImpSorted[i])>Prio(ImpSorted[j]) then
-    begin k:=ImpSorted[i]; ImpSorted[i]:=ImpSorted[j]; ImpSorted[j]:=k end;
+
+for i := 0 to nImp - 1 do
+  ImpSorted[i] := i;
+for i := 0 to nImp - 2 do
+  for j := i + 1 to nImp - 1 do
+    if Prio(ImpSorted[i]) > Prio(ImpSorted[j]) then
+    begin
+      k := ImpSorted[i];
+      ImpSorted[i] := ImpSorted[j];
+      ImpSorted[j] := k
+    end;
+
 end.
-

trunk/LocalPlayer/CityType.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit CityType;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ClientTools,Term,ScreenTools,BaseWin,
+  Protocol, ClientTools, Term, ScreenTools, BaseWin,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
@@ -26 +25 @@
     procedure DeleteBtnClick(Sender: TObject);
   public
-    procedure ShowNewContent(NewMode: integer); 
+    procedure ShowNewContent(NewMode: integer);
   protected
     procedure OffscreenPaint; override;
   private
-    nPool,dragiix,ctype: integer;
-    Pooliix: array[0..nImp-1] of integer;
-    listed: Set of 0..nImp;
+    nPool, dragiix, ctype: integer;
+    Pooliix: array [0 .. nImp - 1] of integer;
+    listed: Set of 0 .. nImp;
     Changed: boolean;
     procedure LoadType(NewType: integer);
@@ -48 +47 @@
 
 const
-xList=7; yList=0;
-nListRow=4; nListCol=10;
-xPool=7; yPool=220;
-nPoolRow=4; nPoolCol=10;
-xSwitch=7; ySwitch=150;
-xView=226; yView=130;
-
-procedure TCityTypeDlg.FormCreate(Sender:TObject);
-begin
-inherited;
-CaptionRight:=CloseBtn.Left;
-InitButtons();
-HelpContext:='MACRO';
-Caption:=Phrases.Lookup('TITLE_CITYTYPES');
-DeleteBtn.Hint:=Phrases.Lookup('BTN_DELETE');
-end;
-
-procedure TCityTypeDlg.CloseBtnClick(Sender:TObject);
-begin
-Close
-end;
-
-procedure TCityTypeDlg.FormPaint(Sender:TObject);
-begin
-inherited;
-BtnFrame(Canvas,DeleteBtn.BoundsRect,MainTexture);
+  xList = 7;
+  yList = 0;
+  nListRow = 4;
+  nListCol = 10;
+  xPool = 7;
+  yPool = 220;
+  nPoolRow = 4;
+  nPoolCol = 10;
+  xSwitch = 7;
+  ySwitch = 150;
+  xView = 226;
+  yView = 130;
+
+procedure TCityTypeDlg.FormCreate(Sender: TObject);
+begin
+  inherited;
+  CaptionRight := CloseBtn.Left;
+  InitButtons();
+  HelpContext := 'MACRO';
+  Caption := Phrases.Lookup('TITLE_CITYTYPES');
+  DeleteBtn.Hint := Phrases.Lookup('BTN_DELETE');
+end;
+
+procedure TCityTypeDlg.CloseBtnClick(Sender: TObject);
+begin
+  Close
+end;
+
+procedure TCityTypeDlg.FormPaint(Sender: TObject);
+begin
+  inherited;
+  BtnFrame(Canvas, DeleteBtn.BoundsRect, MainTexture);
 end;
 
 procedure TCityTypeDlg.OffscreenPaint;
 var
-i,iix: integer;
-s: string;
-begin
-inherited;
-offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-FillOffscreen(xList-7,yList,42*nListCol+14,32*nListRow);
-FillOffscreen(xPool-7,yPool,42*nPoolCol+14,32*nPoolRow);
-FillOffscreen(0,yList+32*nListRow,42*nPoolCol+14,yPool-yList-32*nListRow);
-
-Frame(offscreen.Canvas,0,yList+32*nListRow,InnerWidth-255,yPool-23,
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(offscreen.Canvas,InnerWidth-254,yList+32*nListRow,InnerWidth-89,yPool-23,
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(offscreen.Canvas,InnerWidth-88,yList+32*nListRow,InnerWidth-1,yPool-23,
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(offscreen.Canvas,0,yPool-22,InnerWidth-1,yPool-1,
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-for i:=0 to nCityType-1 do
-  begin
-  RFrame(offscreen.Canvas,xSwitch+i*42,ySwitch,xSwitch+39+i*42,ySwitch+23,
-    MainTexture.clBevelShade,MainTexture.clBevelLight);
-  if i=ctype then
-    Frame(offscreen.Canvas,xSwitch+1+i*42,ySwitch+1,xSwitch+38+i*42,ySwitch+22,
-      MainTexture.clBevelShade,MainTexture.clBevelLight)
-  else Frame(offscreen.Canvas,xSwitch+1+i*42,ySwitch+1,xSwitch+38+i*42,ySwitch+22,
-    MainTexture.clBevelLight,MainTexture.clBevelShade);
-  BitBlt(offscreen.Canvas.Handle,xSwitch+2+i*42,ySwitch+2,xSizeSmall,
-    ySizeSmall,SmallImp.Canvas.Handle,(i+3)*xSizeSmall,0,SRCCOPY)
-  end;
-RisedTextOut(offscreen.Canvas,8,yList+32*nListRow+2,Phrases.Lookup('BUILDORDER'));
-RisedTextOut(offscreen.Canvas,8,ySwitch+26,Phrases.Lookup('CITYTYPE',ctype));
-s:=Phrases.Lookup('BUILDREST');
-RisedTextOut(offscreen.Canvas,(InnerWidth-BiColorTextWidth(Offscreen.Canvas,s)) div 2,
-  yList+72+32*nListRow,s);
-
-with offscreen.Canvas do
-  begin
-  for i:=1 to nListRow-1 do
-    DLine(offscreen.Canvas,xList-5,xList+4+42*nListCol,yList-1+32*i,
-      MainTexture.clBevelLight,MainTexture.clBevelShade);
-  for i:=0 to nListCol*nListRow-1 do
-    begin
-    s:=IntToStr(i+1);
-    Font.Color:=MainTexture.clTextLight;
-    Textout(xList+20+i mod nListCol *42-TextWidth(s) div 2,
-      yList+15+i div nListCol *32-TextHeight(s) div 2,s);
+  i, iix: integer;
+  s: string;
+begin
+  inherited;
+  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  FillOffscreen(xList - 7, yList, 42 * nListCol + 14, 32 * nListRow);
+  FillOffscreen(xPool - 7, yPool, 42 * nPoolCol + 14, 32 * nPoolRow);
+  FillOffscreen(0, yList + 32 * nListRow, 42 * nPoolCol + 14,
+    yPool - yList - 32 * nListRow);
+
+  Frame(offscreen.Canvas, 0, yList + 32 * nListRow, InnerWidth - 255,
+    yPool - 23, MainTexture.clBevelLight, MainTexture.clBevelShade);
+  Frame(offscreen.Canvas, InnerWidth - 254, yList + 32 * nListRow,
+    InnerWidth - 89, yPool - 23, MainTexture.clBevelLight,
+    MainTexture.clBevelShade);
+  Frame(offscreen.Canvas, InnerWidth - 88, yList + 32 * nListRow,
+    InnerWidth - 1, yPool - 23, MainTexture.clBevelLight,
+    MainTexture.clBevelShade);
+  Frame(offscreen.Canvas, 0, yPool - 22, InnerWidth - 1, yPool - 1,
+    MainTexture.clBevelLight, MainTexture.clBevelShade);
+  for i := 0 to nCityType - 1 do
+  begin
+    RFrame(offscreen.Canvas, xSwitch + i * 42, ySwitch, xSwitch + 39 + i * 42,
+      ySwitch + 23, MainTexture.clBevelShade, MainTexture.clBevelLight);
+    if i = ctype then
+      Frame(offscreen.Canvas, xSwitch + 1 + i * 42, ySwitch + 1,
+        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.clBevelShade,
+        MainTexture.clBevelLight)
+    else
+      Frame(offscreen.Canvas, xSwitch + 1 + i * 42, ySwitch + 1,
+        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.clBevelLight,
+        MainTexture.clBevelShade);
+    BitBlt(offscreen.Canvas.Handle, xSwitch + 2 + i * 42, ySwitch + 2,
+      xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle, (i + 3) * xSizeSmall,
+      0, SRCCOPY)
+  end;
+  RisedTextOut(offscreen.Canvas, 8, yList + 32 * nListRow + 2,
+    Phrases.Lookup('BUILDORDER'));
+  RisedTextOut(offscreen.Canvas, 8, ySwitch + 26,
+    Phrases.Lookup('CITYTYPE', ctype));
+  s := Phrases.Lookup('BUILDREST');
+  RisedTextOut(offscreen.Canvas,
+    (InnerWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2,
+    yList + 72 + 32 * nListRow, s);
+
+  with offscreen.Canvas do
+  begin
+    for i := 1 to nListRow - 1 do
+      DLine(offscreen.Canvas, xList - 5, xList + 4 + 42 * nListCol,
+        yList - 1 + 32 * i, MainTexture.clBevelLight, MainTexture.clBevelShade);
+    for i := 0 to nListCol * nListRow - 1 do
+    begin
+      s := IntToStr(i + 1);
+      Font.Color := MainTexture.clTextLight;
+      Textout(xList + 20 + i mod nListCol * 42 - TextWidth(s) div 2,
+        yList + 15 + i div nListCol * 32 - TextHeight(s) div 2, s);
     end
   end;
 
-i:=0;
-while MyData.ImpOrder[ctype,i]>=0 do
-  begin
-  RFrame(offscreen.Canvas,
-    xList+20-xSizeSmall div 2 + i mod nListCol *42,
-    yList+15-ySizeSmall div 2 + i div nListCol *32,
-    xList+21+xSizeSmall div 2 + i mod nListCol *42,
-    yList+16+ySizeSmall div 2 + i div nListCol *32,
-    MainTexture.clBevelLight,MainTexture.clBevelShade);
-  BitBlt(offscreen.Canvas.Handle,
-    xList+21-xSizeSmall div 2 + i mod nListCol *42,
-    yList+16-ySizeSmall div 2 + i div nListCol *32,
-    xSizeSmall,ySizeSmall,SmallImp.Canvas.Handle,
-    MyData.ImpOrder[ctype,i] mod 7*xSizeSmall,
-    (MyData.ImpOrder[ctype,i]+SystemIconLines*7) div 7*ySizeSmall,SRCCOPY);
-  inc(i);
-  end;
-
-nPool:=0;
-for iix:=28 to nImp-1 do
-  if not (iix in listed) and (Imp[iix].Kind=ikCommon) and (iix<>imTrGoods)
-    and (Imp[iix].Preq<>preNA)
-    and ((Imp[iix].Preq=preNone) or (MyRO.Tech[Imp[iix].Preq]>=tsApplicable)) then
-    begin
-    Pooliix[nPool]:=iix;
-    RFrame(offscreen.Canvas,
-      xPool+20-xSizeSmall div 2 + nPool mod nPoolCol *42,
-      yPool+15-ySizeSmall div 2 + nPool div nPoolCol *32,
-      xPool+21+xSizeSmall div 2 + nPool mod nPoolCol *42,
-      yPool+16+ySizeSmall div 2 + nPool div nPoolCol *32,
+  i := 0;
+  while MyData.ImpOrder[ctype, i] >= 0 do
+  begin
+    RFrame(offscreen.Canvas, xList + 20 - xSizeSmall div 2 + i mod nListCol *
+      42, yList + 15 - ySizeSmall div 2 + i div nListCol * 32,
+      xList + 21 + xSizeSmall div 2 + i mod nListCol * 42,
+      yList + 16 + ySizeSmall div 2 + i div nListCol * 32,
       MainTexture.clBevelLight, MainTexture.clBevelShade);
-    BitBlt(offscreen.Canvas.Handle,
-      xPool+21-xSizeSmall div 2 + nPool mod nPoolCol *42,
-      yPool+16-ySizeSmall div 2 + nPool div nPoolCol *32,
-      xSizeSmall,ySizeSmall,SmallImp.Canvas.Handle,
-      iix mod 7*xSizeSmall,(iix+SystemIconLines*7) div 7*ySizeSmall,SRCCOPY);
-    inc(nPool)
+    BitBlt(offscreen.Canvas.Handle, xList + 21 - xSizeSmall div 2 +
+      i mod nListCol * 42, yList + 16 - ySizeSmall div 2 + i div nListCol * 32,
+      xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+      MyData.ImpOrder[ctype, i] mod 7 * xSizeSmall,
+      (MyData.ImpOrder[ctype, i] + SystemIconLines * 7) div 7 *
+      ySizeSmall, SRCCOPY);
+    inc(i);
+  end;
+
+  nPool := 0;
+  for iix := 28 to nImp - 1 do
+    if not(iix in listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
+      and (Imp[iix].Preq <> preNA) and
+      ((Imp[iix].Preq = preNone) or (MyRO.Tech[Imp[iix].Preq] >= tsApplicable))
+    then
+    begin
+      Pooliix[nPool] := iix;
+      RFrame(offscreen.Canvas, xPool + 20 - xSizeSmall div 2 +
+        nPool mod nPoolCol * 42, yPool + 15 - ySizeSmall div 2 +
+        nPool div nPoolCol * 32, xPool + 21 + xSizeSmall div 2 +
+        nPool mod nPoolCol * 42, yPool + 16 + ySizeSmall div 2 +
+        nPool div nPoolCol * 32, MainTexture.clBevelLight,
+        MainTexture.clBevelShade);
+      BitBlt(offscreen.Canvas.Handle, xPool + 21 - xSizeSmall div 2 +
+        nPool mod nPoolCol * 42, yPool + 16 - ySizeSmall div 2 +
+        nPool div nPoolCol * 32, xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+        iix mod 7 * xSizeSmall, (iix + SystemIconLines * 7) div 7 *
+        ySizeSmall, SRCCOPY);
+      inc(nPool)
     end;
-DeleteBtn.Visible:= MyData.ImpOrder[ctype,0]>=0;
-
-if dragiix>=0 then
-  begin
-  ImpImage(offscreen.Canvas,xView+9,yView+5,dragiix);
-  s:=Phrases.Lookup('IMPROVEMENTS',dragiix);
-  RisedTextOut(offscreen.Canvas,xView+36-BiColorTextWidth(Offscreen.Canvas,s) div 2,
-    ySwitch+26,s);
-  end;
-MarkUsedOffscreen(InnerWidth,InnerHeight);
-end; {MainPaint}
+  DeleteBtn.Visible := MyData.ImpOrder[ctype, 0] >= 0;
+
+  if dragiix >= 0 then
+  begin
+    ImpImage(offscreen.Canvas, xView + 9, yView + 5, dragiix);
+    s := Phrases.Lookup('IMPROVEMENTS', dragiix);
+    RisedTextOut(offscreen.Canvas,
+      xView + 36 - BiColorTextWidth(offscreen.Canvas, s) div 2,
+      ySwitch + 26, s);
+  end;
+  MarkUsedOffscreen(InnerWidth, InnerHeight);
+end; { MainPaint }
 
 procedure TCityTypeDlg.LoadType(NewType: integer);
 var
-i: integer;
-begin
-ctype:=NewType;
-listed:=[];
-i:=0;
-while MyData.ImpOrder[ctype,i]>=0 do
-  begin include(listed,MyData.ImpOrder[ctype,i]); inc(i) end;
-Changed:=false
+  i: integer;
+begin
+  ctype := NewType;
+  listed := [];
+  i := 0;
+  while MyData.ImpOrder[ctype, i] >= 0 do
+  begin
+    include(listed, MyData.ImpOrder[ctype, i]);
+    inc(i)
+  end;
+  Changed := false
 end;
 
 procedure TCityTypeDlg.SaveType;
 var
-cix: integer;
-begin
-if Changed then
-  begin
-  for cix:=0 to MyRO.nCity-1 do
-    if (MyCity[cix].Loc>=0) and (MyCity[cix].Status and 7=ctype+1) then
-      AutoBuild(cix, MyData.ImpOrder[ctype]);
-  Changed:=false
+  cix: integer;
+begin
+  if Changed then
+  begin
+    for cix := 0 to MyRO.nCity - 1 do
+      if (MyCity[cix].Loc >= 0) and (MyCity[cix].Status and 7 = ctype + 1) then
+        AutoBuild(cix, MyData.ImpOrder[ctype]);
+    Changed := false
   end;
 end;
@@ -204 +223 @@
 procedure TCityTypeDlg.FormShow(Sender: TObject);
 begin
-LoadType(0);
-dragiix:=-1;
-OffscreenPaint;
+  LoadType(0);
+  dragiix := -1;
+  OffscreenPaint;
 end;
 
 procedure TCityTypeDlg.ShowNewContent(NewMode: integer);
 begin
-inherited ShowNewContent(NewMode);
-end;
-
-procedure TCityTypeDlg.PaintBox1MouseDown(Sender: TObject;
-  Button: TMouseButton; Shift: TShiftState; x, y: integer);
-var
-i: integer;
-begin
-x:=x-SideFrame; y:=y-WideFrame;
-i:=(x-xList) div 42+(y-yList) div 32 *nListCol;
-if (i<nImp) and (MyData.ImpOrder[ctype,i]>=0)
-  and (x>xList+2+ i mod nListCol *42) and (y>yList+5+ i div nListCol *32)
-  and (x<xList+3+36+ i mod nListCol *42) and (y<yList+6+20+ i div nListCol *32) then
-  begin
-  if ssShift in Shift then
-    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, MyData.ImpOrder[ctype,i])
-  else
-    begin
-    dragiix:=MyData.ImpOrder[ctype,i];
-    Screen.Cursor:=crImpDrag;
+  inherited ShowNewContent(NewMode);
+end;
+
+procedure TCityTypeDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; x, y: integer);
+var
+  i: integer;
+begin
+  x := x - SideFrame;
+  y := y - WideFrame;
+  i := (x - xList) div 42 + (y - yList) div 32 * nListCol;
+  if (i < nImp) and (MyData.ImpOrder[ctype, i] >= 0) and
+    (x > xList + 2 + i mod nListCol * 42) and
+    (y > yList + 5 + i div nListCol * 32) and
+    (x < xList + 3 + 36 + i mod nListCol * 42) and
+    (y < yList + 6 + 20 + i div nListCol * 32) then
+  begin
+    if ssShift in Shift then
+      HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp,
+        MyData.ImpOrder[ctype, i])
+    else
+    begin
+      dragiix := MyData.ImpOrder[ctype, i];
+      Screen.Cursor := crImpDrag;
+      SmartUpdateContent
+    end;
+    exit;
+  end;
+  i := (x - xPool) div 42 + (y - yPool) div 32 * nPoolCol;
+  if (i < nPool) and (x > xPool + 2 + i mod nPoolCol * 42) and
+    (y > yPool + 5 + i div nPoolCol * 32) and
+    (x < xPool + 3 + 36 + i mod nPoolCol * 42) and
+    (y < yPool + 6 + 20 + i div nPoolCol * 32) then
+  begin
+    if ssShift in Shift then
+      HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Pooliix[i])
+    else
+    begin
+      dragiix := Pooliix[i];
+      Screen.Cursor := crImpDrag;
+      SmartUpdateContent
+    end;
+    exit;
+  end;
+  i := (x - xSwitch) div 42;
+  if (i < nCityType) and (x > xSwitch + 2 + i * 42) and
+    (x < xSwitch + 3 + 36 + i * 42) and (y >= ySwitch + 2) and (y < ySwitch + 22)
+  then
+  begin
+    SaveType;
+    LoadType(i);
     SmartUpdateContent
-    end;
-  exit;
-  end;
-i:=(x-xPool) div 42+(y-yPool) div 32 *nPoolCol;
-if (i<nPool) and (x>xPool+2+ i mod nPoolCol *42)
-  and (y>yPool+5+ i div nPoolCol *32) and (x<xPool+3+36+ i mod nPoolCol *42)
-  and (y<yPool+6+20+ i div nPoolCol *32) then
-  begin
-  if ssShift in Shift then
-    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Pooliix[i])
-  else
-    begin
-    dragiix:=Pooliix[i];
-    Screen.Cursor:=crImpDrag;
-    SmartUpdateContent
-    end;
-  exit;
-  end;
-i:=(x-xSwitch) div 42;
-if (i<nCityType) and (x>xSwitch+2+ i*42) and (x<xSwitch+3+36+i*42)
-  and (y>=ySwitch+2) and (y<ySwitch+22) then
-  begin
-  SaveType;
-  LoadType(i);
-  SmartUpdateContent
   end
 end;
@@ -265 +290 @@
   procedure UnList(iix: integer);
   var
+    i: integer;
+  begin
+    i := 0;
+    while (MyData.ImpOrder[ctype, i] >= 0) and
+      (MyData.ImpOrder[ctype, i] <> iix) do
+      inc(i);
+    assert(MyData.ImpOrder[ctype, i] = iix);
+    move(MyData.ImpOrder[ctype, i + 1], MyData.ImpOrder[ctype, i], nImp - i);
+    Exclude(listed, iix);
+  end;
+
+var
   i: integer;
-  begin
-  i:=0;
-  while (MyData.ImpOrder[ctype,i]>=0) and (MyData.ImpOrder[ctype,i]<>iix) do
-    inc(i);
-  assert(MyData.ImpOrder[ctype,i]=iix);
-  move(MyData.ImpOrder[ctype,i+1],MyData.ImpOrder[ctype,i],nImp-i);
-  Exclude(listed,iix);
-  end;
-
-var
-i: integer;
-begin
-x:=x-SideFrame; y:=y-WideFrame;
-if dragiix>=0 then
-  begin
-  if (x>=xList) and (x<xList+nListCol*42)
-    and (y>=yList) and (y<yList+nListRow*32) then
-    begin
-    if dragiix in listed then UnList(dragiix);
-    i:=(x-xList) div 42+(y-yList) div 32 *nListCol;
-    while (i>0) and (MyData.ImpOrder[ctype,i-1]<0) do dec(i);
-    move(MyData.ImpOrder[ctype,i],MyData.ImpOrder[ctype,i+1],nImp-i-1);
-    MyData.ImpOrder[ctype,i]:=dragiix;
-    include(listed,dragiix);
-    Changed:=true
+begin
+  x := x - SideFrame;
+  y := y - WideFrame;
+  if dragiix >= 0 then
+  begin
+    if (x >= xList) and (x < xList + nListCol * 42) and (y >= yList) and
+      (y < yList + nListRow * 32) then
+    begin
+      if dragiix in listed then
+        UnList(dragiix);
+      i := (x - xList) div 42 + (y - yList) div 32 * nListCol;
+      while (i > 0) and (MyData.ImpOrder[ctype, i - 1] < 0) do
+        dec(i);
+      move(MyData.ImpOrder[ctype, i], MyData.ImpOrder[ctype, i + 1],
+        nImp - i - 1);
+      MyData.ImpOrder[ctype, i] := dragiix;
+      include(listed, dragiix);
+      Changed := true
     end
-  else if (dragiix in listed) and (x>=xPool) and (x<xPool+nPoolCol*42)
-    and (y>=yPool) and (y<yPool+nPoolRow*32) then
-    begin
-    UnList(dragiix);
-    Changed:=true
+    else if (dragiix in listed) and (x >= xPool) and (x < xPool + nPoolCol * 42)
+      and (y >= yPool) and (y < yPool + nPoolRow * 32) then
+    begin
+      UnList(dragiix);
+      Changed := true
     end;
-  dragiix:=-1;
+    dragiix := -1;
+    SmartUpdateContent
+  end;
+  Screen.Cursor := crDefault
+end;
+
+procedure TCityTypeDlg.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  SaveType;
+  inherited;
+end;
+
+procedure TCityTypeDlg.DeleteBtnClick(Sender: TObject);
+begin
+  fillchar(MyData.ImpOrder[ctype], sizeof(MyData.ImpOrder[ctype]), -1);
+  listed := [];
+  Changed := true;
   SmartUpdateContent
-  end;
-Screen.Cursor:=crDefault
-end;
-
-procedure TCityTypeDlg.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-SaveType;
-inherited;
-end;
-
-procedure TCityTypeDlg.DeleteBtnClick(Sender: TObject);
-begin
-fillchar(MyData.ImpOrder[ctype],sizeof(MyData.ImpOrder[ctype]),-1);
-listed:=[];
-Changed:=true;
-SmartUpdateContent
 end;
 
 end.
-

trunk/LocalPlayer/ClientTools.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit ClientTools;
 
@@ -9 +8 @@
 
 const
-nOfferedResourceWeights=6;
-OfferedResourceWeights: array[0..nOfferedResourceWeights-1] of cardinal=
-(rwOff, rwMaxScience, rwForceScience, rwMaxGrowth, rwForceProd, rwMaxProd);
+  nOfferedResourceWeights = 6;
+  OfferedResourceWeights: array [0 .. nOfferedResourceWeights - 1] of cardinal =
+    (rwOff, rwMaxScience, rwForceScience, rwMaxGrowth, rwForceProd, rwMaxProd);
 
 type
-TImpOrder=array[0..(nImp+4) div 4 *4 -1] of ShortInt;
-TEnhancementJobs=array[0..11,0..7] of Byte;
-JobResultSet=set of 0..39;
+  TImpOrder = array [0 .. (nImp + 4) div 4 * 4 - 1] of ShortInt;
+  TEnhancementJobs = array [0 .. 11, 0 .. 7] of Byte;
+  JobResultSet = set of 0 .. 39;
 
 var
-Server: TServerCall;
-G: TNewGameData;
-me: integer;
-MyRO: ^TPlayerContext;
-MyMap: ^TTileList;
-MyUn: ^TUnList;
-MyCity: ^TCityList;
-MyModel: ^TModelList;
-
-AdvValue: array[0..nAdv-1] of integer;
-
-
-function dLoc(Loc,dx,dy: integer): integer;
-function Distance(Loc0,Loc1: integer): integer;
-function UnrestAtLoc(uix,Loc: integer): boolean;
+  Server: TServerCall;
+  G: TNewGameData;
+  me: integer;
+  MyRO: ^TPlayerContext;
+  MyMap: ^TTileList;
+  MyUn: ^TUnList;
+  MyCity: ^TCityList;
+  MyModel: ^TModelList;
+
+  AdvValue: array [0 .. nAdv - 1] of integer;
+
+function dLoc(Loc, dx, dy: integer): integer;
+function Distance(Loc0, Loc1: integer): integer;
+function UnrestAtLoc(uix, Loc: integer): boolean;
 function GetMoveAdvice(uix, ToLoc: integer;
   var MoveAdviceData: TMoveAdviceData): integer;
@@ -43 +41 @@
 function IsMilReportNew(Enemy: integer): boolean;
 function CutCityFoodSurplus(FoodSurplus: integer; IsCityAlive: boolean;
-  gov,size: integer): integer;
-function CityTaxBalance(cix: integer; const CityReport: TCityReportNew): integer;
+  gov, size: integer): integer;
+function CityTaxBalance(cix: integer; const CityReport: TCityReportNew)
+  : integer;
 procedure SumCities(var TaxSum, ScienceSum: integer);
-function JobTest(uix,Job: integer; IgnoreResults: JobResultSet = []): boolean;
+function JobTest(uix, Job: integer; IgnoreResults: JobResultSet = []): boolean;
 procedure GetUnitInfo(Loc: integer; var uix: integer; var UnitInfo: TUnitInfo);
 procedure GetCityInfo(Loc: integer; var cix: integer; var CityInfo: TCityInfo);
 function UnitExhausted(uix: integer): boolean;
 function ModelHash(const ModelInfo: TModelInfo): integer;
-function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs): integer;
+function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs)
+  : integer;
 function AutoBuild(cix: integer; const ImpOrder: TImpOrder): boolean;
 procedure DebugMessage(Level: integer; Text: string);
@@ -62 +62 @@
 procedure CityOptimizer_EndOfTurn;
 
-
 implementation
 
 var
-CityNeedsOptimize: array[0..ncmax-1] of boolean;
-
-
-function dLoc(Loc,dx,dy: integer): integer;
+  CityNeedsOptimize: array [0 .. ncmax - 1] of boolean;
+
+function dLoc(Loc, dx, dy: integer): integer;
 var
-y0: integer;
+  y0: integer;
 begin
-y0:=(Loc+G.lx*1024) div G.lx -1024;
-result:=(Loc+(dx+y0 and 1+G.lx*1024) shr 1) mod G.lx +G.lx*(y0+dy)
+  y0 := (Loc + G.lx * 1024) div G.lx - 1024;
+  result := (Loc + (dx + y0 and 1 + G.lx * 1024) shr 1) mod G.lx + G.lx
+    * (y0 + dy)
 end;
 
-function Distance(Loc0,Loc1: integer): integer;
+function Distance(Loc0, Loc1: integer): integer;
 var
-dx,dy: integer;
+  dx, dy: integer;
 begin
-inc(Loc0,G.lx*1024);
-inc(Loc1,G.lx*1024);
-dx:=abs(((Loc1 mod G.lx *2 +Loc1 div G.lx and 1)
-  -(Loc0 mod G.lx *2 +Loc0 div G.lx and 1)+3*G.lx) mod (2*G.lx) -G.lx);
-dy:=abs(Loc1 div G.lx-Loc0 div G.lx);
-result:=dx+dy+abs(dx-dy) shr 1;
+  inc(Loc0, G.lx * 1024);
+  inc(Loc1, G.lx * 1024);
+  dx := abs(((Loc1 mod G.lx * 2 + Loc1 div G.lx and 1) - (Loc0 mod G.lx * 2 +
+    Loc0 div G.lx and 1) + 3 * G.lx) mod (2 * G.lx) - G.lx);
+  dy := abs(Loc1 div G.lx - Loc0 div G.lx);
+  result := dx + dy + abs(dx - dy) shr 1;
 end;
 
-function UnrestAtLoc(uix,Loc: integer): boolean;
+function UnrestAtLoc(uix, Loc: integer): boolean;
 var
-uix1: integer;
+  uix1: integer;
 begin
-result:=false;
-if MyModel[MyUn[uix].mix].Flags and mdCivil=0 then
-  case MyRO.Government of
-    gRepublic, gFuture:
-      result:=(MyRO.Territory[Loc]>=0) and (MyRO.Territory[Loc]<>me)
-        and (MyRO.Treaty[MyRO.Territory[Loc]]<trAlliance);
-    gDemocracy:
-      result:=(MyRO.Territory[Loc]<0) or (MyRO.Territory[Loc]<>me)
-        and (MyRO.Treaty[MyRO.Territory[Loc]]<trAlliance);
+  result := false;
+  if MyModel[MyUn[uix].mix].Flags and mdCivil = 0 then
+    case MyRO.Government of
+      gRepublic, gFuture:
+        result := (MyRO.Territory[Loc] >= 0) and (MyRO.Territory[Loc] <> me) and
+          (MyRO.Treaty[MyRO.Territory[Loc]] < trAlliance);
+      gDemocracy:
+        result := (MyRO.Territory[Loc] < 0) or (MyRO.Territory[Loc] <> me) and
+          (MyRO.Treaty[MyRO.Territory[Loc]] < trAlliance);
     end;
-with MyModel[MyUn[uix].mix] do
-  if Cap[mcSeaTrans]+Cap[mcAirTrans]+Cap[mcCarrier]>0 then
-    for uix1:=0 to MyRO.nUn-1 do // check transported units too
-      if (MyUn[uix1].Loc>=0) and (MyUn[uix1].Master=uix) then
-        result:=result or UnrestAtLoc(uix1,Loc);
+  with MyModel[MyUn[uix].mix] do
+    if Cap[mcSeaTrans] + Cap[mcAirTrans] + Cap[mcCarrier] > 0 then
+      for uix1 := 0 to MyRO.nUn - 1 do // check transported units too
+        if (MyUn[uix1].Loc >= 0) and (MyUn[uix1].Master = uix) then
+          result := result or UnrestAtLoc(uix1, Loc);
 end;
 
-function GetMoveAdvice(uix, ToLoc: integer; var MoveAdviceData: TMoveAdviceData): integer;
+function GetMoveAdvice(uix, ToLoc: integer;
+  var MoveAdviceData: TMoveAdviceData): integer;
 var
-MinEndHealth: integer;
+  MinEndHealth: integer;
 begin
-if MyModel[MyUn[uix].mix].Domain=dGround then MinEndHealth:=100
-else MinEndHealth:=1; // resistent to hostile terrain -- don't consider
-repeat
-  if MyUn[uix].Health>=MinEndHealth then
-    begin
-    MoveAdviceData.ToLoc:=ToLoc;
-    MoveAdviceData.MoreTurns:=999;
-    MoveAdviceData.MaxHostile_MovementLeft:=MyUn[uix].Health-MinEndHealth;
-    result:=Server(sGetMoveAdvice,me,uix,MoveAdviceData);
-    if (MinEndHealth<=1) or (result<>eNoWay) then exit;
+  if MyModel[MyUn[uix].mix].Domain = dGround then
+    MinEndHealth := 100
+  else
+    MinEndHealth := 1; // resistent to hostile terrain -- don't consider
+  repeat
+    if MyUn[uix].Health >= MinEndHealth then
+    begin
+      MoveAdviceData.ToLoc := ToLoc;
+      MoveAdviceData.MoreTurns := 999;
+      MoveAdviceData.MaxHostile_MovementLeft := MyUn[uix].Health - MinEndHealth;
+      result := Server(sGetMoveAdvice, me, uix, MoveAdviceData);
+      if (MinEndHealth <= 1) or (result <> eNoWay) then
+        exit;
     end;
-  case MinEndHealth of
-    100: MinEndHealth:=50;
-    50: MinEndHealth:=25;
-    25: MinEndHealth:=12;
-    else MinEndHealth:=1
+    case MinEndHealth of
+      100:
+        MinEndHealth := 50;
+      50:
+        MinEndHealth := 25;
+      25:
+        MinEndHealth := 12;
+    else
+      MinEndHealth := 1
     end;
-until false
-end;
-
-function ColorOfHealth(Health: integer): integer;
-var
-red,green: integer;
-begin
-green:=400*Health div 100; if green>200 then green:=200;
-red:=510*(100-Health) div 100; if red>255 then red:=255;
-result:=green shl 8 + red
-end;
-
-function IsMultiPlayerGame: boolean;
-var
-p1: integer;
-begin
-result:=false;
-for p1:=1 to nPl-1 do
-  if G.RO[p1]<>nil then result:=true;
-end;
-
-procedure ItsMeAgain(p: integer);
-begin
-if G.RO[p]<>nil then
-  MyRO:=pointer(G.RO[p])
-else if G.SuperVisorRO[p]<>nil then
-  MyRO:=pointer(G.SuperVisorRO[p])
-else exit;
-me:=p;
-MyMap:=pointer(MyRO.Map);
-MyUn:=pointer(MyRO.Un);
-MyCity:=pointer(MyRO.City);
-MyModel:=pointer(MyRO.Model);
-end;
-
-function GetAge(p: integer): integer;
-var
-i: integer;
-begin
-if p=me then
-  begin
-  result:=0;
-  for i:=1 to 3 do
-    if MyRO.Tech[AgePreq[i]]>=tsApplicable then result:=i;
-  end
-else
-  begin
-  result:=0;
-  for i:=1 to 3 do
-    if MyRO.EnemyReport[p].Tech[AgePreq[i]]>=tsApplicable then result:=i;
-  end
-end;
-
-function IsCivilReportNew(Enemy: integer): boolean;
-var
-i: integer;
-begin
-assert(Enemy<>me);
-i:=MyRO.EnemyReport[Enemy].TurnOfCivilReport;
-result:= (i=MyRO.Turn) or (i=MyRO.Turn-1) and (Enemy>me);
-end;
-
-function IsMilReportNew(Enemy: integer): boolean;
-var
-i: integer;
-begin
-assert(Enemy<>me);
-i:=MyRO.EnemyReport[Enemy].TurnOfMilReport;
-result:= (i=MyRO.Turn) or (i=MyRO.Turn-1) and (Enemy>me);
-end;
-
-function CutCityFoodSurplus(FoodSurplus: integer; IsCityAlive: boolean;
-  gov,size: integer): integer;
-begin
-result:=FoodSurplus;
-if not IsCityAlive
-  or (result>0)
-     and ((gov=gFuture)
-       or (size>=NeedAqueductSize) and (result<2)) then
-  result:=0; {no growth}
-end;
-
-function CityTaxBalance(cix: integer; const CityReport: TCityReportNew): integer;
-var
-i: integer;
-begin
-result:=0;
-if (CityReport.HappinessBalance>=0) {no disorder}
-  and (MyCity[cix].Flags and chCaptured=0) then // not captured
-  begin
-  inc(result, CityReport.Tax);
-  if (MyCity[cix].Project and (cpImp+cpIndex)=cpImp+imTrGoods)
-    and (CityReport.Production>0) then
-    inc(result, CityReport.Production);
-  if ((MyRO.Government=gFuture)
-      or (MyCity[cix].Size>=NeedAqueductSize)
-      and (CityReport.FoodSurplus<2))
-    and (CityReport.FoodSurplus>0) then
-    inc(result, CityReport.FoodSurplus);
-  end;
-for i:=28 to nImp-1 do if MyCity[cix].Built[i]>0 then
-  dec(result, Imp[i].Maint);
-end;
-
-procedure SumCities(var TaxSum, ScienceSum: integer);
-var
-cix: integer;
-CityReport: TCityReportNew;
-begin
-TaxSum:=MyRO.OracleIncome;
-ScienceSum:=0;
-if MyRO.Government=gAnarchy then exit;
-for cix:=0 to MyRO.nCity-1 do if MyCity[cix].Loc>=0 then
-  begin
-  CityReport.HypoTiles:=-1;
-  CityReport.HypoTaxRate:=-1;
-  CityReport.HypoLuxuryRate:=-1;
-  Server(sGetCityReportNew,me,cix,CityReport);
-  if (CityReport.HappinessBalance>=0) {no disorder}
-    and (MyCity[cix].Flags and chCaptured=0) then // not captured
-    ScienceSum:=ScienceSum+CityReport.Science;
-  TaxSum:=TaxSum+CityTaxBalance(cix, CityReport);
-  end;
-end;
-
-function JobTest(uix,Job: integer; IgnoreResults: JobResultSet): boolean;
-var
-Test: integer;
-begin
-Test:=Server(sStartJob+Job shl 4-sExecute,me,uix,nil^);
-result:= (Test>=rExecuted) or (Test in IgnoreResults);
-end;
-
-procedure GetUnitInfo(Loc: integer; var uix: integer; var UnitInfo: TUnitInfo);
-var
-i,Cnt: integer;
-begin
-if MyMap[Loc] and fOwned<>0 then
-  begin
-  Server(sGetDefender,me,Loc,uix);
-  Cnt:=0;
-  for i:=0 to MyRO.nUn-1 do
-    if MyUn[i].Loc=Loc then inc(Cnt);
-  MakeUnitInfo(me,MyUn[uix],UnitInfo);
-  if Cnt>1 then UnitInfo.Flags:=UnitInfo.Flags or unMulti;
-  end
-else
-  begin
-  uix:=MyRO.nEnemyUn-1;
-  while (uix>=0) and (MyRO.EnemyUn[uix].Loc<>Loc) do dec(uix);
-  UnitInfo:=MyRO.EnemyUn[uix];
-  end
-end;{GetUnitInfo}
-
-procedure GetCityInfo(Loc: integer; var cix: integer; var CityInfo: TCityInfo);
-begin
-if MyMap[Loc] and fOwned<>0 then
-  begin
-  CityInfo.Loc:=Loc;
-  cix:=MyRO.nCity-1;
-  while (cix>=0) and (MyCity[cix].Loc<>Loc) do dec(cix);
-  with CityInfo do
-    begin
-    Owner:=me;
-    ID:=MyCity[cix].ID;
-    Size:=MyCity[cix].Size;
-    Flags:=0;
-    if MyCity[cix].Built[imPalace]>0 then inc(Flags,ciCapital);
-    if (MyCity[cix].Built[imWalls]>0)
-      or (MyMap[MyCity[cix].Loc] and fGrWall<>0) then inc(Flags,ciWalled);
-    if MyCity[cix].Built[imCoastalFort]>0 then inc(Flags,ciCoastalFort);
-    if MyCity[cix].Built[imMissileBat]>0 then inc(Flags,ciMissileBat);
-    if MyCity[cix].Built[imBunker]>0 then inc(Flags,ciBunker);
-    if MyCity[cix].Built[imSpacePort]>0 then inc(Flags,ciSpacePort);
+  until false end;
+
+  function ColorOfHealth(Health: integer): integer;
+  var
+    red, green: integer;
+  begin
+    green := 400 * Health div 100;
+    if green > 200 then
+      green := 200;
+    red := 510 * (100 - Health) div 100;
+    if red > 255 then
+      red := 255;
+    result := green shl 8 + red
+  end;
+
+  function IsMultiPlayerGame: boolean;
+  var
+    p1: integer;
+  begin
+    result := false;
+    for p1 := 1 to nPl - 1 do
+      if G.RO[p1] <> nil then
+        result := true;
+  end;
+
+  procedure ItsMeAgain(p: integer);
+  begin
+    if G.RO[p] <> nil then
+      MyRO := pointer(G.RO[p])
+    else if G.SuperVisorRO[p] <> nil then
+      MyRO := pointer(G.SuperVisorRO[p])
+    else
+      exit;
+    me := p;
+    MyMap := pointer(MyRO.Map);
+    MyUn := pointer(MyRO.Un);
+    MyCity := pointer(MyRO.City);
+    MyModel := pointer(MyRO.Model);
+  end;
+
+  function GetAge(p: integer): integer;
+  var
+    i: integer;
+  begin
+    if p = me then
+    begin
+      result := 0;
+      for i := 1 to 3 do
+        if MyRO.Tech[AgePreq[i]] >= tsApplicable then
+          result := i;
     end
-  end
-else
-  begin
-  cix:=MyRO.nEnemyCity-1;
-  while (cix>=0) and (MyRO.EnemyCity[cix].Loc<>Loc) do dec(cix);
-  CityInfo:=MyRO.EnemyCity[cix];
-  end
-end;
-
-function UnitExhausted(uix: integer): boolean;
-// check if another move of this unit is still possible
-var
-dx, dy: integer;
-begin
-result:=true;
-if (MyUn[uix].Movement>0) or (MyRO.Wonder[woShinkansen].EffectiveOwner=me) then
-  if (MyUn[uix].Movement>=100) or ((MyModel[MyUn[uix].mix].Kind=mkCaravan)
-    and (MyMap[MyUn[uix].Loc] and fCity<>0)) then
-    result:=false
-  else for dx:=-2 to 2 do for dy:=-2 to 2 do if abs(dx)+abs(dy)=2 then
-    if Server(sMoveUnit-sExecute+dx and 7 shl 4+dy and 7 shl 7,me,uix,nil^)>=rExecuted then
-      result:=false;
-end;
-
-function ModelHash(const ModelInfo: TModelInfo): integer;
-var
-i,FeatureCode,Hash1,Hash2,Hash2r,d: cardinal;
-begin
-with ModelInfo do
-  if Kind>mkEnemyDeveloped then
-    result:=integer($C0000000+Speed div 50+Kind shl 8)
-  else
-    begin
-    FeatureCode:=0;
-    for i:=mcFirstNonCap to nFeature-1 do
-      if 1 shl Domain and Feature[i].Domains<>0 then
-        begin
-        FeatureCode:=FeatureCode*2;
-        if 1 shl (i-mcFirstNonCap)<>0 then
-          inc(FeatureCode);
-        end;
-    case Domain of
-      dGround:
-        begin
-        assert(FeatureCode<1 shl 8);
-        assert(Attack<5113);
-        assert(Defense<2273);
-        assert(Cost<1611);
-        Hash1:=(Attack*2273+Defense)*9+(Speed-150) div 50;
-        Hash2:=FeatureCode*1611+Cost;
-        end;
-      dSea:
-        begin
-        assert(FeatureCode<1 shl 9);
-        assert(Attack<12193);
-        assert(Defense<6097);
-        assert(Cost<4381);
-        Hash1:=((Attack*6097+Defense)*5+(Speed-350) div 100)*2;
-        if Weight>=6 then inc(Hash1);
-        Hash2:=((TTrans*17+ATrans_Fuel) shl 9+FeatureCode)*4381+Cost;
-        end;
-      dAir:
-        begin
-        assert(FeatureCode<1 shl 5);
-        assert(Attack<2407);
-        assert(Defense<1605);
-        assert(Bombs<4813);
-        assert(Cost<2089);
-        Hash1:=(Attack*1605+Defense) shl 5+FeatureCode;
-        Hash2:=((Bombs*7+ATrans_Fuel)*4+TTrans)*2089+Cost;
-        end;
-      end;
-    Hash2r:=0;
-    for i:=0 to 7 do
-      begin
-      Hash2r:=Hash2r*13;
-      d:=Hash2 div 13;
-      inc(Hash2r,Hash2-d*13);
-      Hash2:=d
-      end;
-    result:=integer(Domain shl 30+Hash1 xor Hash2r)
+    else
+    begin
+      result := 0;
+      for i := 1 to 3 do
+        if MyRO.EnemyReport[p].Tech[AgePreq[i]] >= tsApplicable then
+          result := i;
     end
-end;
-
-function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs): integer;
-{ return values:
-eJobDone - all applicable jobs done
-eOK - enhancement not complete
-eDied - job done and died (thurst) }
-var
-stage, NextJob, Tile: integer;
-Done: Set of jNone..jTrans;
-begin
-Done:=[];
-Tile:=MyMap[MyUn[uix].Loc];
-if Tile and fRoad<>0 then include(Done,jRoad);
-if Tile and fRR<>0 then include(Done,jRR);
-if (Tile and fTerImp=tiIrrigation) or (Tile and fTerImp=tiFarm) then
-  include(Done,jIrr);
-if Tile and fTerImp=tiFarm then include(Done,jFarm);
-if Tile and fTerImp=tiMine then include(Done,jMine);
-if Tile and fPoll=0 then include(Done,jPoll);
-
-if MyUn[uix].Job=jNone then result:=eJobDone
-else result:=eOK;
-while (result<>eOK) and (result<>eDied) do
-  begin
-  stage:=-1;
-  repeat
-    if stage=-1 then NextJob:=jPoll
-    else NextJob:=Jobs[Tile and fTerrain,stage];
-    if (NextJob=jNone) or not (NextJob in Done) then Break;
-    inc(stage);
-  until stage=5;
-  if (stage=5) or (NextJob=jNone) then
-    begin result:=eJobDone; Break; end; // tile enhancement complete
-  result:=Server(sStartJob+NextJob shl 4,me,uix,nil^);
-  include(Done,NextJob)
-  end;
-end;
-
-function AutoBuild(cix: integer; const ImpOrder: TImpOrder): boolean;
-var
-i,NewProject: integer;
-begin
-result:=false;
-if (MyCity[cix].Project and (cpImp+cpIndex)=cpImp+imTrGoods)
-  or (MyCity[cix].Flags and chProduction<>0) then
-  begin
-  i:=0;
-  repeat
-    while (ImpOrder[i]>=0) and (MyCity[cix].Built[ImpOrder[i]]>0) do inc(i);
-    if ImpOrder[i]<0 then Break;
-    assert(i<nImp);
-    NewProject:=cpImp+ImpOrder[i];
-    if Server(sSetCityProject,me,cix,NewProject)>=rExecuted then
-      begin
-      result:=true;
-      CityOptimizer_CityChange(cix);
-      Break;
-      end;
-    inc(i);
-  until false
-  end
-end;
-
-procedure CalculateAdvValues;
-var
-i,j: integer;
-known: array[0..nAdv-1] of integer;
-
-  procedure MarkPreqs(i: integer);
-  begin
-  if known[i]=0 then
-    begin
-    known[i]:=1;
-    if (i<>adScience) and (i<>adMassProduction) then
-      begin
-      if (AdvPreq[i,0]>=0) then MarkPreqs(AdvPreq[i,0]);
-      if (AdvPreq[i,1]>=0) then MarkPreqs(AdvPreq[i,1]);
+  end;
+
+  function IsCivilReportNew(Enemy: integer): boolean;
+  var
+    i: integer;
+  begin
+    assert(Enemy <> me);
+    i := MyRO.EnemyReport[Enemy].TurnOfCivilReport;
+    result := (i = MyRO.Turn) or (i = MyRO.Turn - 1) and (Enemy > me);
+  end;
+
+  function IsMilReportNew(Enemy: integer): boolean;
+  var
+    i: integer;
+  begin
+    assert(Enemy <> me);
+    i := MyRO.EnemyReport[Enemy].TurnOfMilReport;
+    result := (i = MyRO.Turn) or (i = MyRO.Turn - 1) and (Enemy > me);
+  end;
+
+  function CutCityFoodSurplus(FoodSurplus: integer; IsCityAlive: boolean;
+    gov, size: integer): integer;
+  begin
+    result := FoodSurplus;
+    if not IsCityAlive or (result > 0) and
+      ((gov = gFuture) or (size >= NeedAqueductSize) and (result < 2)) then
+      result := 0; { no growth }
+  end;
+
+  function CityTaxBalance(cix: integer;
+    const CityReport: TCityReportNew): integer;
+  var
+    i: integer;
+  begin
+    result := 0;
+    if (CityReport.HappinessBalance >= 0) { no disorder }
+      and (MyCity[cix].Flags and chCaptured = 0) then // not captured
+    begin
+      inc(result, CityReport.Tax);
+      if (MyCity[cix].Project and (cpImp + cpIndex) = cpImp + imTrGoods) and
+        (CityReport.Production > 0) then
+        inc(result, CityReport.Production);
+      if ((MyRO.Government = gFuture) or (MyCity[cix].size >= NeedAqueductSize)
+        and (CityReport.FoodSurplus < 2)) and (CityReport.FoodSurplus > 0) then
+        inc(result, CityReport.FoodSurplus);
+    end;
+    for i := 28 to nImp - 1 do
+      if MyCity[cix].Built[i] > 0 then
+        dec(result, Imp[i].Maint);
+  end;
+
+  procedure SumCities(var TaxSum, ScienceSum: integer);
+  var
+    cix: integer;
+    CityReport: TCityReportNew;
+  begin
+    TaxSum := MyRO.OracleIncome;
+    ScienceSum := 0;
+    if MyRO.Government = gAnarchy then
+      exit;
+    for cix := 0 to MyRO.nCity - 1 do
+      if MyCity[cix].Loc >= 0 then
+      begin
+        CityReport.HypoTiles := -1;
+        CityReport.HypoTaxRate := -1;
+        CityReport.HypoLuxuryRate := -1;
+        Server(sGetCityReportNew, me, cix, CityReport);
+        if (CityReport.HappinessBalance >= 0) { no disorder }
+          and (MyCity[cix].Flags and chCaptured = 0) then // not captured
+          ScienceSum := ScienceSum + CityReport.Science;
+        TaxSum := TaxSum + CityTaxBalance(cix, CityReport);
+      end;
+  end;
+
+  function JobTest(uix, Job: integer; IgnoreResults: JobResultSet): boolean;
+  var
+    Test: integer;
+  begin
+    Test := Server(sStartJob + Job shl 4 - sExecute, me, uix, nil^);
+    result := (Test >= rExecuted) or (Test in IgnoreResults);
+  end;
+
+  procedure GetUnitInfo(Loc: integer; var uix: integer;
+    var UnitInfo: TUnitInfo);
+  var
+    i, Cnt: integer;
+  begin
+    if MyMap[Loc] and fOwned <> 0 then
+    begin
+      Server(sGetDefender, me, Loc, uix);
+      Cnt := 0;
+      for i := 0 to MyRO.nUn - 1 do
+        if MyUn[i].Loc = Loc then
+          inc(Cnt);
+      MakeUnitInfo(me, MyUn[uix], UnitInfo);
+      if Cnt > 1 then
+        UnitInfo.Flags := UnitInfo.Flags or unMulti;
+    end
+    else
+    begin
+      uix := MyRO.nEnemyUn - 1;
+      while (uix >= 0) and (MyRO.EnemyUn[uix].Loc <> Loc) do
+        dec(uix);
+      UnitInfo := MyRO.EnemyUn[uix];
+    end
+  end; { GetUnitInfo }
+
+  procedure GetCityInfo(Loc: integer; var cix: integer;
+    var CityInfo: TCityInfo);
+  begin
+    if MyMap[Loc] and fOwned <> 0 then
+    begin
+      CityInfo.Loc := Loc;
+      cix := MyRO.nCity - 1;
+      while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
+        dec(cix);
+      with CityInfo do
+      begin
+        Owner := me;
+        ID := MyCity[cix].ID;
+        size := MyCity[cix].size;
+        Flags := 0;
+        if MyCity[cix].Built[imPalace] > 0 then
+          inc(Flags, ciCapital);
+        if (MyCity[cix].Built[imWalls] > 0) or
+          (MyMap[MyCity[cix].Loc] and fGrWall <> 0) then
+          inc(Flags, ciWalled);
+        if MyCity[cix].Built[imCoastalFort] > 0 then
+          inc(Flags, ciCoastalFort);
+        if MyCity[cix].Built[imMissileBat] > 0 then
+          inc(Flags, ciMissileBat);
+        if MyCity[cix].Built[imBunker] > 0 then
+          inc(Flags, ciBunker);
+        if MyCity[cix].Built[imSpacePort] > 0 then
+          inc(Flags, ciSpacePort);
       end
     end
-  end;
-
-begin
-FillChar(AdvValue,SizeOf(AdvValue),0);
-for i:=0 to nAdv-1 do
-  begin
-  FillChar(known,SizeOf(known),0);
-  MarkPreqs(i);
-  for j:=0 to nAdv-1 do if known[j]>0 then inc(AdvValue[i]);
-  if i in FutureTech then inc(AdvValue[i],3000)
-  else if known[adMassProduction]>0 then inc(AdvValue[i],2000)
-  else if known[adScience]>0 then inc(AdvValue[i],1000)
-  end;
-end;
-
-procedure DebugMessage(Level: integer; Text: string);
-begin
-Server(sMessage,me,Level,pchar(Text)^)
-end;
-
-function MarkCitiesAround(Loc,cixExcept: integer): boolean;
-// return whether a city was marked
-var
-cix: integer;
-begin
-result:=false;
-for cix:=0 to MyRO.nCity-1 do
-  if (cix<>cixExcept) and (MyCity[cix].Loc>=0)
-    and (MyCity[cix].Flags and chCaptured=0)
-    and (Distance(MyCity[cix].Loc,Loc)<=5) then
-    begin
-    CityNeedsOptimize[cix]:=true;
-    result:=true;
+    else
+    begin
+      cix := MyRO.nEnemyCity - 1;
+      while (cix >= 0) and (MyRO.EnemyCity[cix].Loc <> Loc) do
+        dec(cix);
+      CityInfo := MyRO.EnemyCity[cix];
     end
-end;
-
-procedure OptimizeCities(CheckOnly: boolean);
-var
-cix,fix,dx,dy,Loc1,OptiType: integer;
-done: boolean;
-Advice: TCityTileAdviceData;
-begin
-repeat
-  done:=true;
-  for cix:=0 to MyRO.nCity-1 do if CityNeedsOptimize[cix] then
-    begin
-    OptiType:=MyCity[cix].Status shr 4 and $0F;
-    if OptiType<>0 then
-      begin
-      Advice.ResourceWeights:=OfferedResourceWeights[OptiType];
-      Server(sGetCityTileAdvice,me,cix,Advice);
-      if Advice.Tiles<>MyCity[cix].Tiles then
-        if CheckOnly then
-          assert(false)
+  end;
+
+  function UnitExhausted(uix: integer): boolean;
+  // check if another move of this unit is still possible
+  var
+    dx, dy: integer;
+  begin
+    result := true;
+    if (MyUn[uix].Movement > 0) or
+      (MyRO.Wonder[woShinkansen].EffectiveOwner = me) then
+      if (MyUn[uix].Movement >= 100) or
+        ((MyModel[MyUn[uix].mix].Kind = mkCaravan) and
+        (MyMap[MyUn[uix].Loc] and fCity <> 0)) then
+        result := false
+      else
+        for dx := -2 to 2 do
+          for dy := -2 to 2 do
+            if abs(dx) + abs(dy) = 2 then
+              if Server(sMoveUnit - sExecute + dx and 7 shl 4 + dy and 7 shl 7,
+                me, uix, nil^) >= rExecuted then
+                result := false;
+  end;
+
+  function ModelHash(const ModelInfo: TModelInfo): integer;
+  var
+    i, FeatureCode, Hash1, Hash2, Hash2r, d: cardinal;
+  begin
+    with ModelInfo do
+      if Kind > mkEnemyDeveloped then
+        result := integer($C0000000 + Speed div 50 + Kind shl 8)
+      else
+      begin
+        FeatureCode := 0;
+        for i := mcFirstNonCap to nFeature - 1 do
+          if 1 shl Domain and Feature[i].Domains <> 0 then
+          begin
+            FeatureCode := FeatureCode * 2;
+            if 1 shl (i - mcFirstNonCap) <> 0 then
+              inc(FeatureCode);
+          end;
+        case Domain of
+          dGround:
+            begin
+              assert(FeatureCode < 1 shl 8);
+              assert(Attack < 5113);
+              assert(Defense < 2273);
+              assert(Cost < 1611);
+              Hash1 := (Attack * 2273 + Defense) * 9 + (Speed - 150) div 50;
+              Hash2 := FeatureCode * 1611 + Cost;
+            end;
+          dSea:
+            begin
+              assert(FeatureCode < 1 shl 9);
+              assert(Attack < 12193);
+              assert(Defense < 6097);
+              assert(Cost < 4381);
+              Hash1 := ((Attack * 6097 + Defense) * 5 + (Speed - 350)
+                div 100) * 2;
+              if Weight >= 6 then
+                inc(Hash1);
+              Hash2 := ((TTrans * 17 + ATrans_Fuel) shl 9 + FeatureCode) *
+                4381 + Cost;
+            end;
+          dAir:
+            begin
+              assert(FeatureCode < 1 shl 5);
+              assert(Attack < 2407);
+              assert(Defense < 1605);
+              assert(Bombs < 4813);
+              assert(Cost < 2089);
+              Hash1 := (Attack * 1605 + Defense) shl 5 + FeatureCode;
+              Hash2 := ((Bombs * 7 + ATrans_Fuel) * 4 + TTrans) * 2089 + Cost;
+            end;
+        end;
+        Hash2r := 0;
+        for i := 0 to 7 do
+        begin
+          Hash2r := Hash2r * 13;
+          d := Hash2 div 13;
+          inc(Hash2r, Hash2 - d * 13);
+          Hash2 := d
+        end;
+        result := integer(Domain shl 30 + Hash1 xor Hash2r)
+      end
+  end;
+
+  function ProcessEnhancement(uix: integer;
+    const Jobs: TEnhancementJobs): integer;
+  { return values:
+    eJobDone - all applicable jobs done
+    eOK - enhancement not complete
+    eDied - job done and died (thurst) }
+  var
+    stage, NextJob, Tile: integer;
+    Done: Set of jNone .. jTrans;
+  begin
+    Done := [];
+    Tile := MyMap[MyUn[uix].Loc];
+    if Tile and fRoad <> 0 then
+      include(Done, jRoad);
+    if Tile and fRR <> 0 then
+      include(Done, jRR);
+    if (Tile and fTerImp = tiIrrigation) or (Tile and fTerImp = tiFarm) then
+      include(Done, jIrr);
+    if Tile and fTerImp = tiFarm then
+      include(Done, jFarm);
+    if Tile and fTerImp = tiMine then
+      include(Done, jMine);
+    if Tile and fPoll = 0 then
+      include(Done, jPoll);
+
+    if MyUn[uix].Job = jNone then
+      result := eJobDone
+    else
+      result := eOK;
+    while (result <> eOK) and (result <> eDied) do
+    begin
+      stage := -1;
+      repeat
+        if stage = -1 then
+          NextJob := jPoll
         else
+          NextJob := Jobs[Tile and fTerrain, stage];
+        if (NextJob = jNone) or not(NextJob in Done) then
+          Break;
+        inc(stage);
+      until stage = 5;
+      if (stage = 5) or (NextJob = jNone) then
+      begin
+        result := eJobDone;
+        Break;
+      end; // tile enhancement complete
+      result := Server(sStartJob + NextJob shl 4, me, uix, nil^);
+      include(Done, NextJob)
+    end;
+  end;
+
+  function AutoBuild(cix: integer; const ImpOrder: TImpOrder): boolean;
+  var
+    i, NewProject: integer;
+  begin
+    result := false;
+    if (MyCity[cix].Project and (cpImp + cpIndex) = cpImp + imTrGoods) or
+      (MyCity[cix].Flags and chProduction <> 0) then
+    begin
+      i := 0;
+      repeat
+        while (ImpOrder[i] >= 0) and (MyCity[cix].Built[ImpOrder[i]] > 0) do
+          inc(i);
+        if ImpOrder[i] < 0 then
+          Break;
+        assert(i < nImp);
+        NewProject := cpImp + ImpOrder[i];
+        if Server(sSetCityProject, me, cix, NewProject) >= rExecuted then
+        begin
+          result := true;
+          CityOptimizer_CityChange(cix);
+          Break;
+        end;
+        inc(i);
+      until false end end;
+
+      procedure CalculateAdvValues;
+      var
+        i, j: integer;
+        known: array [0 .. nAdv - 1] of integer;
+
+        procedure MarkPreqs(i: integer);
+        begin
+          if known[i] = 0 then
           begin
-          for fix:=1 to 26 do
-            if MyCity[cix].Tiles and not Advice.Tiles and (1 shl fix)<>0 then
-              begin // tile no longer used by this city -- check using it by another
-              dy:=fix shr 2-3; dx:=fix and 3 shl 1 -3 + (dy+3) and 1;
-              Loc1:=dLoc(MyCity[cix].Loc,dx,dy);
-              if MarkCitiesAround(Loc1,cix) then
-                done:=false;
+            known[i] := 1;
+            if (i <> adScience) and (i <> adMassProduction) then
+            begin
+              if (AdvPreq[i, 0] >= 0) then
+                MarkPreqs(AdvPreq[i, 0]);
+              if (AdvPreq[i, 1] >= 0) then
+                MarkPreqs(AdvPreq[i, 1]);
+            end
+          end
+        end;
+
+      begin
+        FillChar(AdvValue, SizeOf(AdvValue), 0);
+        for i := 0 to nAdv - 1 do
+        begin
+          FillChar(known, SizeOf(known), 0);
+          MarkPreqs(i);
+          for j := 0 to nAdv - 1 do
+            if known[j] > 0 then
+              inc(AdvValue[i]);
+          if i in FutureTech then
+            inc(AdvValue[i], 3000)
+          else if known[adMassProduction] > 0 then
+            inc(AdvValue[i], 2000)
+          else if known[adScience] > 0 then
+            inc(AdvValue[i], 1000)
+        end;
+      end;
+
+      procedure DebugMessage(Level: integer; Text: string);
+      begin
+        Server(sMessage, me, Level, pchar(Text)^)
+      end;
+
+      function MarkCitiesAround(Loc, cixExcept: integer): boolean;
+      // return whether a city was marked
+      var
+        cix: integer;
+      begin
+        result := false;
+        for cix := 0 to MyRO.nCity - 1 do
+          if (cix <> cixExcept) and (MyCity[cix].Loc >= 0) and
+            (MyCity[cix].Flags and chCaptured = 0) and
+            (Distance(MyCity[cix].Loc, Loc) <= 5) then
+          begin
+            CityNeedsOptimize[cix] := true;
+            result := true;
+          end
+      end;
+
+      procedure OptimizeCities(CheckOnly: boolean);
+      var
+        cix, fix, dx, dy, Loc1, OptiType: integer;
+        Done: boolean;
+        Advice: TCityTileAdviceData;
+      begin
+        repeat
+          Done := true;
+          for cix := 0 to MyRO.nCity - 1 do
+            if CityNeedsOptimize[cix] then
+            begin
+              OptiType := MyCity[cix].Status shr 4 and $0F;
+              if OptiType <> 0 then
+              begin
+                Advice.ResourceWeights := OfferedResourceWeights[OptiType];
+                Server(sGetCityTileAdvice, me, cix, Advice);
+                if Advice.Tiles <> MyCity[cix].Tiles then
+                  if CheckOnly then
+                    assert(false)
+                  else
+                  begin
+                    for fix := 1 to 26 do
+                      if MyCity[cix].Tiles and not Advice.Tiles and
+                        (1 shl fix) <> 0 then
+                      begin // tile no longer used by this city -- check using it by another
+                        dy := fix shr 2 - 3;
+                        dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
+                        Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
+                        if MarkCitiesAround(Loc1, cix) then
+                          Done := false;
+                      end;
+                    Server(sSetCityTiles, me, cix, Advice.Tiles);
+                  end;
               end;
-          Server(sSetCityTiles,me,cix,Advice.Tiles);
-          end;
-      end;
-    CityNeedsOptimize[cix]:=false;
-    end;
-until done;
-end;
-
-procedure CityOptimizer_BeginOfTurn;
-var
-cix: integer;
-begin
-fillchar(CityNeedsOptimize,MyRO.nCity-1,0); //false
-if MyRO.Government<>gAnarchy then
-  begin
-  for cix:=0 to MyRO.nCity-1 do
-    if (MyCity[cix].Loc>=0) and (MyCity[cix].Flags and chCaptured=0) then
-      CityNeedsOptimize[cix]:=true;
-  OptimizeCities(false); // optimize all cities
-  end
-end;
-
-procedure CityOptimizer_CityChange(cix: integer);
-begin
-if (MyRO.Government<>gAnarchy) and (MyCity[cix].Flags and chCaptured=0) then
-  begin
-  CityNeedsOptimize[cix]:=true;
-  OptimizeCities(false);
-  end
-end;
-
-procedure CityOptimizer_TileBecomesAvailable(Loc: integer);
-begin
-if (MyRO.Government<>gAnarchy) and MarkCitiesAround(Loc,-1) then
-  OptimizeCities(false);
-end;
-
-procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: integer);
-var
-fix,dx,dy,Loc1: integer;
-done: boolean;
-begin
-if (MyRO.Government<>gAnarchy) and (ReleasedTiles<>0) then
-  begin
-  done:=true;
-  for fix:=1 to 26 do if ReleasedTiles and (1 shl fix)<>0 then
-    begin
-    dy:=fix shr 2-3; dx:=fix and 3 shl 1 -3 + (dy+3) and 1;
-    Loc1:=dLoc(MyCity[cix].Loc,dx,dy);
-    if MarkCitiesAround(Loc1,cix) then
-      done:=false;
-    end;
-  if not done then
-    OptimizeCities(false);
-  end
-end;
-
-procedure CityOptimizer_BeforeRemoveUnit(uix: integer);
-var
-uix1: integer;
-begin
-if MyRO.Government<>gAnarchy then
-  begin
-  if MyUn[uix].Home>=0 then
-    CityNeedsOptimize[MyUn[uix].Home]:=true;
-
-  // transported units are also removed
-  for uix1:=0 to MyRO.nUn-1 do
-    if (MyUn[uix1].Loc>=0) and (MyUn[uix1].Master=uix)
-      and (MyUn[uix1].Home>=0) then
-      CityNeedsOptimize[MyUn[uix1].Home]:=true;
-  end
-end;
-
-procedure CityOptimizer_AfterRemoveUnit;
-begin
-if MyRO.Government<>gAnarchy then
-  OptimizeCities(false);
-end;
-
-procedure CityOptimizer_EndOfTurn;
-// all cities should already be optimized here -- only check this
-var
-cix: integer;
-begin
+              CityNeedsOptimize[cix] := false;
+            end;
+        until Done;
+      end;
+
+      procedure CityOptimizer_BeginOfTurn;
+      var
+        cix: integer;
+      begin
+        FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
+        if MyRO.Government <> gAnarchy then
+        begin
+          for cix := 0 to MyRO.nCity - 1 do
+            if (MyCity[cix].Loc >= 0) and (MyCity[cix].Flags and chCaptured = 0)
+            then
+              CityNeedsOptimize[cix] := true;
+          OptimizeCities(false); // optimize all cities
+        end
+      end;
+
+      procedure CityOptimizer_CityChange(cix: integer);
+      begin
+        if (MyRO.Government <> gAnarchy) and
+          (MyCity[cix].Flags and chCaptured = 0) then
+        begin
+          CityNeedsOptimize[cix] := true;
+          OptimizeCities(false);
+        end
+      end;
+
+      procedure CityOptimizer_TileBecomesAvailable(Loc: integer);
+      begin
+        if (MyRO.Government <> gAnarchy) and MarkCitiesAround(Loc, -1) then
+          OptimizeCities(false);
+      end;
+
+      procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: integer);
+      var
+        fix, dx, dy, Loc1: integer;
+        Done: boolean;
+      begin
+        if (MyRO.Government <> gAnarchy) and (ReleasedTiles <> 0) then
+        begin
+          Done := true;
+          for fix := 1 to 26 do
+            if ReleasedTiles and (1 shl fix) <> 0 then
+            begin
+              dy := fix shr 2 - 3;
+              dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
+              Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
+              if MarkCitiesAround(Loc1, cix) then
+                Done := false;
+            end;
+          if not Done then
+            OptimizeCities(false);
+        end
+      end;
+
+      procedure CityOptimizer_BeforeRemoveUnit(uix: integer);
+      var
+        uix1: integer;
+      begin
+        if MyRO.Government <> gAnarchy then
+        begin
+          if MyUn[uix].Home >= 0 then
+            CityNeedsOptimize[MyUn[uix].Home] := true;
+
+          // transported units are also removed
+          for uix1 := 0 to MyRO.nUn - 1 do
+            if (MyUn[uix1].Loc >= 0) and (MyUn[uix1].Master = uix) and
+              (MyUn[uix1].Home >= 0) then
+              CityNeedsOptimize[MyUn[uix1].Home] := true;
+        end
+      end;
+
+      procedure CityOptimizer_AfterRemoveUnit;
+      begin
+        if MyRO.Government <> gAnarchy then
+          OptimizeCities(false);
+      end;
+
+      procedure CityOptimizer_EndOfTurn;
+      // all cities should already be optimized here -- only check this
+      var
+        cix: integer;
+      begin
 {$IFOPT O-}
-if MyRO.Government<>gAnarchy then
-  begin
-  fillchar(CityNeedsOptimize,MyRO.nCity-1,0); //false
-  for cix:=0 to MyRO.nCity-1 do
-    if (MyCity[cix].Loc>=0) and (MyCity[cix].Flags and chCaptured=0) then
-      CityNeedsOptimize[cix]:=true;
-  OptimizeCities(true); // check all cities
-  end;
+        if MyRO.Government <> gAnarchy then
+        begin
+          FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
+          for cix := 0 to MyRO.nCity - 1 do
+            if (MyCity[cix].Loc >= 0) and (MyCity[cix].Flags and chCaptured = 0)
+            then
+              CityNeedsOptimize[cix] := true;
+          OptimizeCities(true); // check all cities
+        end;
 {$ENDIF}
-end;
-
+      end;
 
 initialization
-assert(nImp<128);
+
+assert(nImp < 128);
 CalculateAdvValues;
 
 end.
-

trunk/LocalPlayer/Diagram.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Diagram;
 
@@ -22 +21 @@
     procedure ToggleBtnClick(Sender: TObject);
     procedure PlayerClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
 
   public
@@ -31 +29 @@
 
   private
-    Kind:(dkChart,dkShip);
-    Player,Mode: integer;
+    Kind: (dkChart, dkShip);
+    Player, Mode: integer;
   end;
 
@@ -38 +36 @@
   DiaDlg: TDiaDlg;
 
-procedure PaintColonyShip(canvas: TCanvas; Player,Left,Width,Top: integer);
-
+procedure PaintColonyShip(canvas: TCanvas; Player, Left, Width, Top: integer);
 
 implementation
 
 uses
-Protocol, ScreenTools, ClientTools,Term,Tribes;
+  Protocol, ScreenTools, ClientTools, Term, Tribes;
 
 {$R *.DFM}
 
 const
-Border=24;
-RoundPixels: array[0..nStat-1] of integer=(0,0,0,5,5,5);
-
-yArea=48;
-xComp: array[0..5] of integer=(-60,-28,4,4,36,68);
-yComp: array[0..5] of integer=(-40,-40,-79,-1,-40,-40);
-xPow: array[0..3] of integer=(-116,-116,-116,-116);
-yPow: array[0..3] of integer=(-28,0,-44,16);
-xHab: array[0..1] of integer=(23,23);
-yHab: array[0..1] of integer=(-81,1);
-
-procedure PaintColonyShip(canvas: TCanvas; Player,Left,Width,Top: integer);
-var
-i,x,r,nComp,nPow,nHab: integer;
-begin
-with canvas do
-  begin
-  Brush.Color:=$000000;
-  FillRect(Rect(Left,Top,Left+Width,Top+200));
-  Brush.Style:=bsClear;
-  Frame(Canvas,Left-1,Top-1,Left+Width,Top+200,MainTexture.clBevelShade,MainTexture.clBevelLight);
-  RFrame(Canvas,Left-2,Top-2,Left+Width+1,Top+200+1,MainTexture.clBevelShade,MainTexture.clBevelLight);
-
-  // stars
-  RandSeed:=Player*11111;
-  for i:=1 to Width-16 do
+  Border = 24;
+  RoundPixels: array [0 .. nStat - 1] of integer = (0, 0, 0, 5, 5, 5);
+
+  yArea = 48;
+  xComp: array [0 .. 5] of integer = (-60, -28, 4, 4, 36, 68);
+  yComp: array [0 .. 5] of integer = (-40, -40, -79, -1, -40, -40);
+  xPow: array [0 .. 3] of integer = (-116, -116, -116, -116);
+  yPow: array [0 .. 3] of integer = (-28, 0, -44, 16);
+  xHab: array [0 .. 1] of integer = (23, 23);
+  yHab: array [0 .. 1] of integer = (-81, 1);
+
+procedure PaintColonyShip(canvas: TCanvas; Player, Left, Width, Top: integer);
+var
+  i, x, r, nComp, nPow, nHab: integer;
+begin
+  with canvas do
+  begin
+    Brush.Color := $000000;
+    FillRect(Rect(Left, Top, Left + Width, Top + 200));
+    Brush.Style := bsClear;
+    Frame(canvas, Left - 1, Top - 1, Left + Width, Top + 200,
+      MainTexture.clBevelShade, MainTexture.clBevelLight);
+    RFrame(canvas, Left - 2, Top - 2, Left + Width + 1, Top + 200 + 1,
+      MainTexture.clBevelShade, MainTexture.clBevelLight);
+
+    // stars
+    RandSeed := Player * 11111;
+    for i := 1 to Width - 16 do
     begin
-    x:=Random((Width-16)*200);
-    r:=Random(13)+28;
-    Pixels[x div 200+8,x mod 200+Top]:=(r*r*r*r div 10001)*$10101;
+      x := Random((Width - 16) * 200);
+      r := Random(13) + 28;
+      Pixels[x div 200 + 8, x mod 200 + Top] :=
+        (r * r * r * r div 10001) * $10101;
     end;
 
-  nComp:=MyRO.Ship[Player].Parts[spComp];
-  nPow:=MyRO.Ship[Player].Parts[spPow];
-  nHab:=MyRO.Ship[Player].Parts[spHab];
-  if nComp>6 then nComp:=6;
-  if nPow>4 then nPow:=4;
-  if nHab>2 then nHab:=2;
-  for i:=0 to nHab-1 do
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xHab[i],Top+100+yHab[i],
-      80,80,34,1);
-  for i:=0 to nComp-1 do
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[i],Top+100+yComp[i],
-      32,80,1,1);
-  if nComp>0 then
-    for i:=3 downto nPow do
-      Sprite(canvas,HGrSystem2,Left+Width div 2+xPow[i]+40,Top+100+yPow[i],
-        16,27,1,82);
-  for i:=nPow-1 downto 0 do
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xPow[i],Top+100+yPow[i],
-      56,28,58,82);
-  if (nComp<3) and (nHab>=1) then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[2]+32-16,Top+100+7+yComp[2],
-      16,27,1,82);
-  if (nComp>=3) and (nHab<1) then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[2]+32,Top+100+7+yComp[2],
-      16,27,18,82);
-  if (nComp<4) and (nHab>=2) then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[3]+32-16,Top+100+46+yComp[3],
-      16,27,1,82);
-  if (nComp>=4) and (nHab<2) then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[3]+32,Top+100+46+yComp[3],
-      16,27,18,82);
-  if (nComp<>6) and (nComp<>2) and not ((nComp=0) and (nPow<1)) then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[nComp],Top+100+7+yComp[nComp],
-      16,27,18,82);
-  if (nComp<>6) and (nComp<>3) and not ((nComp=0) and (nPow<2)) then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[nComp],Top+100+46+yComp[nComp],
-      16,27,18,82);
-  if nComp=2 then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[3],Top+100+7+yComp[3],
-      16,27,18,82);
-  if nComp=3 then
-    Sprite(canvas,HGrSystem2,Left+Width div 2+xComp[4],Top+100+7+yComp[4],
-      16,27,18,82);
+    nComp := MyRO.Ship[Player].Parts[spComp];
+    nPow := MyRO.Ship[Player].Parts[spPow];
+    nHab := MyRO.Ship[Player].Parts[spHab];
+    if nComp > 6 then
+      nComp := 6;
+    if nPow > 4 then
+      nPow := 4;
+    if nHab > 2 then
+      nHab := 2;
+    for i := 0 to nHab - 1 do
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xHab[i],
+        Top + 100 + yHab[i], 80, 80, 34, 1);
+    for i := 0 to nComp - 1 do
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[i],
+        Top + 100 + yComp[i], 32, 80, 1, 1);
+    if nComp > 0 then
+      for i := 3 downto nPow do
+        Sprite(canvas, HGrSystem2, Left + Width div 2 + xPow[i] + 40,
+          Top + 100 + yPow[i], 16, 27, 1, 82);
+    for i := nPow - 1 downto 0 do
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xPow[i],
+        Top + 100 + yPow[i], 56, 28, 58, 82);
+    if (nComp < 3) and (nHab >= 1) then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[2] + 32 - 16,
+        Top + 100 + 7 + yComp[2], 16, 27, 1, 82);
+    if (nComp >= 3) and (nHab < 1) then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[2] + 32,
+        Top + 100 + 7 + yComp[2], 16, 27, 18, 82);
+    if (nComp < 4) and (nHab >= 2) then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[3] + 32 - 16,
+        Top + 100 + 46 + yComp[3], 16, 27, 1, 82);
+    if (nComp >= 4) and (nHab < 2) then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[3] + 32,
+        Top + 100 + 46 + yComp[3], 16, 27, 18, 82);
+    if (nComp <> 6) and (nComp <> 2) and not((nComp = 0) and (nPow < 1)) then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
+        Top + 100 + 7 + yComp[nComp], 16, 27, 18, 82);
+    if (nComp <> 6) and (nComp <> 3) and not((nComp = 0) and (nPow < 2)) then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
+        Top + 100 + 46 + yComp[nComp], 16, 27, 18, 82);
+    if nComp = 2 then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[3],
+        Top + 100 + 7 + yComp[3], 16, 27, 18, 82);
+    if nComp = 3 then
+      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[4],
+        Top + 100 + 7 + yComp[4], 16, 27, 18, 82);
   end
 end;
@@ -129 +132 @@
 procedure TDiaDlg.FormCreate(Sender: TObject);
 begin
-inherited;
-TitleHeight:=WideFrame+20;
-InnerHeight:=ClientHeight-TitleHeight-NarrowFrame;
-CaptionRight:=CloseBtn.Left;
-CaptionLeft:=ToggleBtn.Left+ToggleBtn.Width;
-InitButtons();
+  inherited;
+  TitleHeight := WideFrame + 20;
+  InnerHeight := ClientHeight - TitleHeight - NarrowFrame;
+  CaptionRight := CloseBtn.Left;
+  CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
+  InitButtons();
 end;
 
 procedure TDiaDlg.CloseBtnClick(Sender: TObject);
 begin
-Close;
+  Close;
 end;
 
 procedure TDiaDlg.OffscreenPaint;
 type
-TLine=array[0..99999,0..2] of Byte;
-var
-p,T,max,x,y,y0,Stop,r,RoundRange,LineStep: integer;
-s: string;
-List: ^TChart;
+  TLine = array [0 .. 99999, 0 .. 2] of Byte;
+var
+  p, T, max, x, y, y0, Stop, r, RoundRange, LineStep: integer;
+  s: string;
+  List: ^TChart;
 
   function Round(T: integer): integer;
   var
-  n,i: integer;
-  begin
-  if T<RoundRange then n:=T else n:=RoundRange;
-  result:=0;
-  for i:=T-n to T do inc(result,List[i]);
-  result:=result div (n+1);
+    n, i: integer;
+  begin
+    if T < RoundRange then
+      n := T
+    else
+      n := RoundRange;
+    result := 0;
+    for i := T - n to T do
+      inc(result, List[i]);
+    result := result div (n + 1);
   end;
 
-  procedure ShareBar(x,y:integer; Cap:string; val0,val1: integer);
-  begin
-  LoweredTextOut(offscreen.Canvas,-1,MainTexture,x-2,y,Cap);
-  DLine(offscreen.Canvas,x-2,x+169,y+16,MainTexture.clTextShade,
-    MainTexture.clTextLight);
-  if val0>0 then s:=Format(Phrases.Lookup('SHARE'),[val0,val1])
-  else s:='0';
-  RisedTextOut(offscreen.Canvas,x+170-BiColorTextWidth(Offscreen.Canvas,s),y,s);
+  procedure ShareBar(x, y: integer; Cap: string; val0, val1: integer);
+  begin
+    LoweredTextOut(offscreen.canvas, -1, MainTexture, x - 2, y, Cap);
+    DLine(offscreen.canvas, x - 2, x + 169, y + 16, MainTexture.clTextShade,
+      MainTexture.clTextLight);
+    if val0 > 0 then
+      s := Format(Phrases.Lookup('SHARE'), [val0, val1])
+    else
+      s := '0';
+    RisedTextOut(offscreen.canvas,
+      x + 170 - BiColorTextWidth(offscreen.canvas, s), y, s);
   end;
 
 begin
-inherited;
-if Kind=dkChart then with offscreen.Canvas do
-  begin
-  Font.Assign(UniFont[ftTiny]);
-  Font.Color:=$808080;
-
-  RoundRange:=RoundPixels[Mode]*(MyRO.Turn-1) div (InnerWidth-2*Border);
-
-  GetMem(List,4*(MyRO.Turn+2));
-  if Mode=stExplore then max:=G.lx*G.ly
-  else
+  inherited;
+  if Kind = dkChart then
+    with offscreen.canvas do
     begin
-    max:=-1;
-    for p:=0 to nPl-1 do
-      if (G.Difficulty[p]>0)
-        and (Server(sGetChart+Mode shl 4,me,p,List^)>=rExecuted) then
-        for T:=0 to MyRO.Turn-1 do
-          begin r:=Round(T); if r>max then max:=r; end;
+      Font.Assign(UniFont[ftTiny]);
+      Font.Color := $808080;
+
+      RoundRange := RoundPixels[Mode] * (MyRO.Turn - 1)
+        div (InnerWidth - 2 * Border);
+
+      GetMem(List, 4 * (MyRO.Turn + 2));
+      if Mode = stExplore then
+        max := G.lx * G.ly
+      else
+      begin
+        max := -1;
+        for p := 0 to nPl - 1 do
+          if (G.Difficulty[p] > 0) and
+            (Server(sGetChart + Mode shl 4, me, p, List^) >= rExecuted) then
+            for T := 0 to MyRO.Turn - 1 do
+            begin
+              r := Round(T);
+              if r > max then
+                max := r;
+            end;
+      end;
+
+      Brush.Color := $000000;
+      FillRect(Rect(0, 0, InnerWidth, InnerHeight));
+      Brush.Style := bsClear;
+      Pen.Color := $606060;
+      MoveTo(Border, InnerHeight - Border);
+      LineTo(InnerWidth - Border, InnerHeight - Border);
+      if MyRO.Turn >= 800 then
+        LineStep := 200
+      else if MyRO.Turn >= 400 then
+        LineStep := 100
+      else
+        LineStep := 50;
+      for T := 0 to (MyRO.Turn - 1) div LineStep do
+      begin
+        x := Border + (InnerWidth - 2 * Border) * T *
+          LineStep div (MyRO.Turn - 1);
+        MoveTo(x, Border);
+        LineTo(x, InnerHeight - Border);
+        s := IntToStr(abs(TurnToYear(T * LineStep)));
+        Textout(x - TextWidth(s) div 2, Border - 16, s);
+      end;
+
+      if max > 0 then
+      begin
+        for p := 0 to nPl - 1 do
+          if (G.Difficulty[p] > 0) and
+            (Server(sGetChart + Mode shl 4, me, p, List^) >= rExecuted) then
+          begin
+            Pen.Color := Tribe[p].Color;
+            Stop := MyRO.Turn - 1;
+            while (Stop > 0) and (List[Stop] = 0) do
+              dec(Stop);
+            for T := 0 to Stop do
+            begin
+              r := Round(T);
+              x := Border + (InnerWidth - 2 * Border) * T div (MyRO.Turn - 1);
+              y := InnerHeight - Border - (InnerHeight - 2 * Border) *
+                r div max;
+              if T = 0 then
+                MoveTo(x, y)
+                // else if Mode=stTerritory then
+                // begin LineTo(x,y0); LineTo(x,y) end
+              else if RoundPixels[Mode] = 0 then
+              begin
+                if (y <> y0) or (T = Stop) then
+                  LineTo(x, y)
+              end
+              else
+                LineTo(x, y);
+              y0 := y;
+            end;
+          end;
+      end;
+      FreeMem(List);
+    end
+  else
+    with offscreen.canvas do
+    begin
+      Font.Assign(UniFont[ftSmall]);
+      FillOffscreen(0, 0, InnerWidth, InnerHeight);
+
+      PaintColonyShip(offscreen.canvas, Player, 8, InnerWidth - 16, yArea);
+
+      ShareBar(InnerWidth div 2 - 85, InnerHeight - 62,
+        Phrases.Lookup('SHIPHAB'), MyRO.Ship[Player].Parts[spHab], 2);
+      ShareBar(InnerWidth div 2 - 85, InnerHeight - 43,
+        Phrases.Lookup('SHIPPOW'), MyRO.Ship[Player].Parts[spPow], 4);
+      ShareBar(InnerWidth div 2 - 85, InnerHeight - 24,
+        Phrases.Lookup('SHIPCOMP'), MyRO.Ship[Player].Parts[spComp], 6);
     end;
-
-  Brush.Color:=$000000;
-  FillRect(Rect(0,0,InnerWidth,InnerHeight));
-  Brush.Style:=bsClear;
-  Pen.Color:=$606060;
-  MoveTo(Border,InnerHeight-Border);
-  LineTo(InnerWidth-Border,InnerHeight-Border);
-  if MyRO.Turn>=800 then LineStep:=200
-  else if MyRO.Turn>=400 then LineStep:=100
-  else LineStep:=50;
-  for T:=0 to (MyRO.Turn-1) div LineStep do
-    begin
-    x:=Border+(InnerWidth-2*Border)*T*LineStep div (MyRO.Turn-1);
-    MoveTo(x,Border);
-    LineTo(x,InnerHeight-Border);
-    s:=IntToStr(abs(TurnToYear(T*LineStep)));
-    Textout(x-TextWidth(s) div 2,Border-16,s);
-    end;
-
-  if max>0 then
-    begin
-    for p:=0 to nPl-1 do
-      if (G.Difficulty[p]>0)
-        and (Server(sGetChart+Mode shl 4,me,p,List^)>=rExecuted) then
-        begin
-        Pen.Color:=Tribe[p].Color;
-        Stop:=MyRO.Turn-1;
-        while (Stop>0) and (List[Stop]=0) do dec(Stop);
-        for T:=0 to Stop do
-          begin
-          r:=Round(T);
-          x:=Border+(InnerWidth-2*Border)*T div (MyRO.Turn-1);
-          y:=InnerHeight-Border-(InnerHeight-2*Border)*r div max;
-          if T=0 then MoveTo(x,y)
-//          else if Mode=stTerritory then
-//            begin LineTo(x,y0); LineTo(x,y) end
-          else if RoundPixels[Mode]=0 then
-            begin
-            if (y<>y0) or (T=Stop) then LineTo(x,y)
-            end
-          else LineTo(x,y);
-          y0:=y;
-          end;
-        end;
-    end;
-  FreeMem(List);
+  MarkUsedOffscreen(InnerWidth, InnerHeight);
+end; // OffscreenPaint
+
+procedure TDiaDlg.FormPaint(Sender: TObject);
+var
+  s: string;
+begin
+  inherited;
+  canvas.Font.Assign(UniFont[ftNormal]);
+  if Kind = dkChart then
+    s := Phrases.Lookup('DIAGRAM', Mode)
+  else
+    s := Tribe[Player].TPhrase('SHORTNAME');
+  LoweredTextOut(canvas, -1, MainTexture,
+    (ClientWidth - BiColorTextWidth(canvas, s)) div 2, 31, s);
+end;
+
+procedure TDiaDlg.FormShow(Sender: TObject);
+begin
+  if WindowMode = wmModal then
+  begin { center on screen }
+    Left := (Screen.Width - Width) div 2;
+    Top := (Screen.Height - Height) div 2;
+  end;
+  OffscreenPaint;
+end;
+
+procedure TDiaDlg.ShowNewContent_Charts(NewMode: integer);
+begin
+  Kind := dkChart;
+  Mode := stPop;
+  ToggleBtn.ButtonIndex := 15;
+  ToggleBtn.Hint := Phrases.Lookup('BTN_PAGE');
+  Caption := Phrases.Lookup('TITLE_DIAGRAMS');
+  inherited ShowNewContent(NewMode);
+end;
+
+procedure TDiaDlg.ShowNewContent_Ship(NewMode, p: integer);
+begin
+  Kind := dkShip;
+  if p < 0 then
+  begin
+    Player := me;
+    while MyRO.Ship[Player].Parts[spComp] + MyRO.Ship[Player].Parts[spPow] +
+      MyRO.Ship[Player].Parts[spHab] = 0 do
+      Player := (Player + 1) mod nPl;
   end
-else with offscreen.Canvas do
-  begin
-  Font.Assign(UniFont[ftSmall]);
-  FillOffscreen(0,0,InnerWidth,InnerHeight);
-
-  PaintColonyShip(offscreen.Canvas,Player,8,InnerWidth-16,yArea);
-
-  ShareBar(InnerWidth div 2-85,InnerHeight-62,Phrases.Lookup('SHIPHAB'),
-    MyRO.Ship[Player].Parts[spHab],2);
-  ShareBar(InnerWidth div 2-85,InnerHeight-43,Phrases.Lookup('SHIPPOW'),
-    MyRO.Ship[Player].Parts[spPow],4);
-  ShareBar(InnerWidth div 2-85,InnerHeight-24,Phrases.Lookup('SHIPCOMP'),
-    MyRO.Ship[Player].Parts[spComp],6);
-  end;
-MarkUsedOffscreen(InnerWidth,InnerHeight);
-end; // OffscreenPaint
-
-procedure TDiaDlg.FormPaint(Sender: TObject);
-var
-s: string;
-begin
-inherited;
-Canvas.Font.Assign(UniFont[ftNormal]);
-if Kind=dkChart then s:=Phrases.Lookup('DIAGRAM',Mode)
-else s:=Tribe[Player].TPhrase('SHORTNAME');
-LoweredTextOut(Canvas, -1, MainTexture,
-  (ClientWidth-BiColorTextWidth(Canvas,s)) div 2, 31, s);
-end;
-
-procedure TDiaDlg.FormShow(Sender: TObject);
-begin
-if WindowMode=wmModal then
-  begin {center on screen}
-  Left:=(Screen.Width-Width) div 2;
-  Top:=(Screen.Height-Height) div 2;
-  end;
-OffscreenPaint;
-end;
-
-procedure TDiaDlg.ShowNewContent_Charts(NewMode: integer);
-begin
-Kind:=dkChart;
-Mode:=stPop;
-ToggleBtn.ButtonIndex:=15;
-ToggleBtn.Hint:=Phrases.Lookup('BTN_PAGE');
-Caption:=Phrases.Lookup('TITLE_DIAGRAMS');
-inherited ShowNewContent(NewMode);
-end;
-
-procedure TDiaDlg.ShowNewContent_Ship(NewMode,p: integer);
-begin
-Kind:=dkShip;
-if p<0 then
-  begin
-  Player:=me;
-  while MyRO.Ship[Player].Parts[spComp]+MyRO.Ship[Player].Parts[spPow]
-    +MyRO.Ship[Player].Parts[spHab]=0 do
-    Player:=(Player+1) mod nPl;
+  else
+    Player := p;
+  ToggleBtn.ButtonIndex := 28;
+  ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');
+  Caption := Phrases.Lookup('TITLE_SHIPS');
+  inherited ShowNewContent(NewMode);
+end;
+
+procedure TDiaDlg.ToggleBtnClick(Sender: TObject);
+var
+  p1: integer;
+  m: TMenuItem;
+begin
+  if Kind = dkChart then
+  begin
+    Mode := (Mode + 1) mod nStat;
+    OffscreenPaint;
+    Invalidate;
   end
-else Player:=p;
-ToggleBtn.ButtonIndex:=28;
-ToggleBtn.Hint:=Phrases.Lookup('BTN_SELECT');
-Caption:=Phrases.Lookup('TITLE_SHIPS');
-inherited ShowNewContent(NewMode);
-end;
-
-procedure TDiaDlg.ToggleBtnClick(Sender: TObject);
-var
-p1: integer;
-m: TMenuItem;
-begin
-if Kind=dkChart then
-  begin
-  Mode:=(Mode+1) mod nStat;
-  OffscreenPaint;
-  Invalidate;
+  else
+  begin
+    EmptyMenu(Popup.Items);
+    for p1 := 0 to nPl - 1 do
+      if MyRO.Ship[p1].Parts[spComp] + MyRO.Ship[p1].Parts[spPow] +
+        MyRO.Ship[p1].Parts[spHab] > 0 then
+      begin
+        m := TMenuItem.Create(Popup);
+        m.RadioItem := true;
+        m.Caption := Tribe[p1].TPhrase('SHORTNAME');
+        m.Tag := p1;
+        m.OnClick := PlayerClick;
+        if p1 = Player then
+          m.Checked := true;
+        Popup.Items.Add(m);
+      end;
+    Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + ToggleBtn.Height);
   end
-else
-  begin
-  EmptyMenu(Popup.Items);
-  for p1:=0 to nPl-1 do
-    if MyRO.Ship[p1].Parts[spComp]+MyRO.Ship[p1].Parts[spPow]
-      +MyRO.Ship[p1].Parts[spHab]>0 then
-      begin
-      m:=TMenuItem.Create(Popup);
-      m.RadioItem:=true;
-      m.Caption:=Tribe[p1].TPhrase('SHORTNAME');
-      m.Tag:=p1;
-      m.OnClick:=PlayerClick;
-      if p1=Player then m.Checked:=true;
-      Popup.Items.Add(m);
-      end;
-  Popup.Popup(Left+ToggleBtn.Left, Top+ToggleBtn.Top+ToggleBtn.Height);
-  end
 end;
 
 procedure TDiaDlg.PlayerClick(Sender: TObject);
 begin
-ShowNewContent_Ship(FWindowMode, TComponent(Sender).Tag);
+  ShowNewContent_Ship(FWindowMode, TComponent(Sender).Tag);
 end;
 
@@ -341 +372 @@
   Shift: TShiftState);
 begin
-if (Key=VK_F6) and (Kind=dkChart) then // my key
-  ToggleBtnClick(nil)
-else if (Key=VK_F8) and (Kind=dkShip) then // my other key
-else inherited
+  if (Key = VK_F6) and (Kind = dkChart) then // my key
+    ToggleBtnClick(nil)
+  else if (Key = VK_F8) and (Kind = dkShip) then // my other key
+  else
+    inherited
 end;
 
 end.
-

trunk/LocalPlayer/Diplomacy.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Diplomacy;
 
@@ -7 +6 @@
 uses Protocol;
 
-function DipCommandToString(pSender, pTarget, Treaty, OppCommand, Command: integer;
-  const OppOffer, Offer: TOffer): string;
+function DipCommandToString(pSender, pTarget, Treaty, OppCommand,
+  Command: integer; const OppOffer, Offer: TOffer): string;
 
 implementation
 
 uses
-ScreenTools,Tribes,SysUtils;
+  ScreenTools, Tribes, SysUtils;
 
 function DipCommandToString;
@@ -19 +18 @@
   function PriceToString(p, Price: integer): string;
   begin
-  case Price and opMask of
-    opChoose:
-      result:=Phrases.Lookup('PRICE_CHOOSE');
-    opCivilReport:
-      result:=Tribe[p].TPhrase('PRICE_CIVIL');
-    opMilReport:
-      result:=Tribe[p].TPhrase('PRICE_MIL');
-    opMap:
-      result:=Tribe[p].TPhrase('PRICE_MAP');
-    opTreaty:
-      {if Price-opTreaty<Treaty then
-        case Treaty of
+    case Price and opMask of
+      opChoose:
+        result := Phrases.Lookup('PRICE_CHOOSE');
+      opCivilReport:
+        result := Tribe[p].TPhrase('PRICE_CIVIL');
+      opMilReport:
+        result := Tribe[p].TPhrase('PRICE_MIL');
+      opMap:
+        result := Tribe[p].TPhrase('PRICE_MAP');
+      opTreaty:
+        { if Price-opTreaty<Treaty then
+          case Treaty of
           trPeace: result:=Phrases.Lookup('FRENDTREATY_PEACE');
           trFriendlyContact: result:=Phrases.Lookup('FRENDTREATY_FRIENDLY');
           trAlliance: result:=Phrases.Lookup('FRENDTREATY_ALLIANCE');
           end
-      else} result:=Phrases.Lookup('TREATY',Price-opTreaty);
-    opShipParts:
-      case Price shr 16 and $f of
-        0: result:=Format(Phrases.Lookup('PRICE_SHIPCOMP'),[Price and $FFFF]);
-        1: result:=Format(Phrases.Lookup('PRICE_SHIPPOW'),[Price and $FFFF]);
-        2: result:=Format(Phrases.Lookup('PRICE_SHIPHAB'),[Price and $FFFF]);
-        end;
-    opMoney:
-      result:=Format('%d%%c',[Price-opMoney]);
-    opTribute:
-      result:=Format(Phrases.Lookup('PRICE_TRIBUTE'),[Price-opTribute]);
-    opTech:
-      result:=Phrases.Lookup('ADVANCES',Price-opTech);
-    opAllTech:
-      result:=Tribe[p].TPhrase('PRICE_ALLTECH');
-    opModel:
-      result:=Tribe[p].ModelName[Price-opModel];
-    opAllModel:
-      result:=Tribe[p].TPhrase('PRICE_ALLMODEL');
-{    opCity:
-      result:=Format(TPhrase('PRICE_CITY',p),[CityName(Price-opCity)]);}
+          else } result := Phrases.Lookup('TREATY', Price - opTreaty);
+      opShipParts:
+        case Price shr 16 and $F of
+          0:
+            result := Format(Phrases.Lookup('PRICE_SHIPCOMP'),
+              [Price and $FFFF]);
+          1:
+            result := Format(Phrases.Lookup('PRICE_SHIPPOW'),
+              [Price and $FFFF]);
+          2:
+            result := Format(Phrases.Lookup('PRICE_SHIPHAB'),
+              [Price and $FFFF]);
+        end;
+      opMoney:
+        result := Format('%d%%c', [Price - opMoney]);
+      opTribute:
+        result := Format(Phrases.Lookup('PRICE_TRIBUTE'), [Price - opTribute]);
+      opTech:
+        result := Phrases.Lookup('ADVANCES', Price - opTech);
+      opAllTech:
+        result := Tribe[p].TPhrase('PRICE_ALLTECH');
+      opModel:
+        result := Tribe[p].ModelName[Price - opModel];
+      opAllModel:
+        result := Tribe[p].TPhrase('PRICE_ALLMODEL');
+      { opCity:
+        result:=Format(TPhrase('PRICE_CITY',p),[CityName(Price-opCity)]); }
     end
   end;
 
 var
-i: integer;
-sAdd,sDeliver, sCost: string;
-DoIntro: boolean;
+  i: integer;
+  sAdd, sDeliver, sCost: string;
+  DoIntro: boolean;
 begin
-DoIntro:= OppCommand=scDipStart;
-case Command of
-  scDipCancelTreaty:
-    begin
-    case Treaty of
-      trPeace: result:=Phrases.Lookup('FRCANCELTREATY_PEACE');
-      trFriendlyContact: result:=Phrases.Lookup('FRCANCELTREATY_FRIENDLY');
-      trAlliance: result:=Phrases.Lookup('FRCANCELTREATY_ALLIANCE');
-      end;
-    DoIntro:=false;
-    end;
-  scDipNotice: result:=Phrases.Lookup('FRNOTICE');
-  scDipAccept:
-    begin
-    if (OppOffer.nDeliver+OppOffer.nCost=1)
-      and (OppOffer.Price[0] and opMask=opTreaty)
-      and (integer(OppOffer.Price[0]-opTreaty)>Treaty) then // simple treaty offer
-      {if OppOffer.Price[0]-opTreaty=trCeaseFire then
-        result:=Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
-      else} result:=Tribe[pTarget].TPhrase('FRACCEPTTREATY')
-    else if OppOffer.nDeliver=0 then
-      result:=Tribe[pSender].TPhrase('FRACCEPTDEMAND_STRONG')
-    else if OppOffer.nCost=0 then
-      result:=Tribe[pSender].TPhrase('FRACCEPTPRESENT')
-    else result:=Tribe[pSender].TPhrase('FRACCEPTOFFER');
-    end;
-  scDipBreak:
-    begin
-    result:=Tribe[pTarget].TPhrase('FRBREAK');
-    DoIntro:=false;
-    end;
-  scDipOffer:
-    begin
-    result:='';
-    if (OppCommand=scDipOffer) and ((OppOffer.nDeliver>0) or (OppOffer.nCost>0))
-      and (Offer.nCost+Offer.nDeliver<=2) then
-      begin // respond to made offer before making own one
-      if (OppOffer.nDeliver+OppOffer.nCost=1)
-        and (OppOffer.Price[0] and opMask=opTreaty)
-        and (integer(OppOffer.Price[0]-opTreaty)>Treaty) then // simple treaty offer
-        result:=Tribe[pSender].TPhrase('FRNOTACCEPTTREATY')+'\'
-      else if OppOffer.nDeliver=0 then
-        result:=Tribe[pSender].TPhrase('FRNOTACCEPTDEMAND_STRONG')+'\'
-      else if OppOffer.nCost=0 then
-        result:=Tribe[pSender].TPhrase('FRNOTACCEPTPRESENT')+'\';
-      end;
-
-    sDeliver:='';
-    for i:=0 to Offer.nDeliver-1 do
-      begin
-      sAdd:=PriceToString(pSender,Offer.Price[i]);
-      if i=0 then sDeliver:=sAdd
-      else sDeliver:=Format(Phrases.Lookup('PRICE_CONCAT'),[sDeliver,sAdd])
-      end;
-    sCost:='';
-    for i:=0 to Offer.nCost-1 do
-      begin
-      sAdd:=PriceToString(pTarget,Offer.Price[Offer.nDeliver+i]);
-      if i=0 then sCost:=sAdd
-      else sCost:=Format(Phrases.Lookup('PRICE_CONCAT'),[sCost,sAdd])
-      end;
-
-    if (Offer.nDeliver=0) and (Offer.nCost=0) then
-      begin // no offer made
-      if (OppCommand=scDipOffer) and ((OppOffer.nDeliver=0) and (OppOffer.nCost=0)) then
-        result:=Tribe[pTarget].TPhrase('FRBYE')
-      else
-        begin
-        if (result='') and (OppCommand=scDipOffer)
-          and ((OppOffer.nDeliver>0) or (OppOffer.nCost>0)) then
+  DoIntro := OppCommand = scDipStart;
+  case Command of
+    scDipCancelTreaty:
+      begin
+        case Treaty of
+          trPeace:
+            result := Phrases.Lookup('FRCANCELTREATY_PEACE');
+          trFriendlyContact:
+            result := Phrases.Lookup('FRCANCELTREATY_FRIENDLY');
+          trAlliance:
+            result := Phrases.Lookup('FRCANCELTREATY_ALLIANCE');
+        end;
+        DoIntro := false;
+      end;
+    scDipNotice:
+      result := Phrases.Lookup('FRNOTICE');
+    scDipAccept:
+      begin
+        if (OppOffer.nDeliver + OppOffer.nCost = 1) and
+          (OppOffer.Price[0] and opMask = opTreaty) and
+          (integer(OppOffer.Price[0] - opTreaty) > Treaty) then
+        // simple treaty offer
+          { if OppOffer.Price[0]-opTreaty=trCeaseFire then
+            result:=Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
+            else } result := Tribe[pTarget].TPhrase('FRACCEPTTREATY')
+        else if OppOffer.nDeliver = 0 then
+          result := Tribe[pSender].TPhrase('FRACCEPTDEMAND_STRONG')
+        else if OppOffer.nCost = 0 then
+          result := Tribe[pSender].TPhrase('FRACCEPTPRESENT')
+        else
+          result := Tribe[pSender].TPhrase('FRACCEPTOFFER');
+      end;
+    scDipBreak:
+      begin
+        result := Tribe[pTarget].TPhrase('FRBREAK');
+        DoIntro := false;
+      end;
+    scDipOffer:
+      begin
+        result := '';
+        if (OppCommand = scDipOffer) and
+          ((OppOffer.nDeliver > 0) or (OppOffer.nCost > 0)) and
+          (Offer.nCost + Offer.nDeliver <= 2) then
+        begin // respond to made offer before making own one
+          if (OppOffer.nDeliver + OppOffer.nCost = 1) and
+            (OppOffer.Price[0] and opMask = opTreaty) and
+            (integer(OppOffer.Price[0] - opTreaty) > Treaty) then
+          // simple treaty offer
+            result := Tribe[pSender].TPhrase('FRNOTACCEPTTREATY') + '\'
+          else if OppOffer.nDeliver = 0 then
+            result := Tribe[pSender].TPhrase('FRNOTACCEPTDEMAND_STRONG') + '\'
+          else if OppOffer.nCost = 0 then
+            result := Tribe[pSender].TPhrase('FRNOTACCEPTPRESENT') + '\';
+        end;
+
+        sDeliver := '';
+        for i := 0 to Offer.nDeliver - 1 do
+        begin
+          sAdd := PriceToString(pSender, Offer.Price[i]);
+          if i = 0 then
+            sDeliver := sAdd
+          else
+            sDeliver := Format(Phrases.Lookup('PRICE_CONCAT'), [sDeliver, sAdd])
+        end;
+        sCost := '';
+        for i := 0 to Offer.nCost - 1 do
+        begin
+          sAdd := PriceToString(pTarget, Offer.Price[Offer.nDeliver + i]);
+          if i = 0 then
+            sCost := sAdd
+          else
+            sCost := Format(Phrases.Lookup('PRICE_CONCAT'), [sCost, sAdd])
+        end;
+
+        if (Offer.nDeliver = 0) and (Offer.nCost = 0) then
+        begin // no offer made
+          if (OppCommand = scDipOffer) and
+            ((OppOffer.nDeliver = 0) and (OppOffer.nCost = 0)) then
+            result := Tribe[pTarget].TPhrase('FRBYE')
+          else
           begin
-          if (OppOffer.nDeliver=1) and (OppOffer.Price[0]=opChoose)
-            and not Phrases2FallenBackToEnglish then
-            result:=Tribe[pSender].TString(Phrases2.Lookup('FRNOTACCEPTANYOFFER'))+' '
-          else if (OppOffer.nCost=1) and (OppOffer.Price[OppOffer.nDeliver]=opChoose)
-            and not Phrases2FallenBackToEnglish then
-            result:=Tribe[pSender].TString(Phrases2.Lookup('FRNOTACCEPTANYWANT'))+' '
-          else result:=Tribe[pSender].TPhrase('FRNOTACCEPTOFFER')+' ';
-          end;
-        result:=result+Phrases.Lookup('FRDONE');
-        DoIntro:=false
+            if (result = '') and (OppCommand = scDipOffer) and
+              ((OppOffer.nDeliver > 0) or (OppOffer.nCost > 0)) then
+            begin
+              if (OppOffer.nDeliver = 1) and (OppOffer.Price[0] = opChoose) and
+                not Phrases2FallenBackToEnglish then
+                result := Tribe[pSender].TString
+                  (Phrases2.Lookup('FRNOTACCEPTANYOFFER')) + ' '
+              else if (OppOffer.nCost = 1) and
+                (OppOffer.Price[OppOffer.nDeliver] = opChoose) and not Phrases2FallenBackToEnglish
+              then
+                result := Tribe[pSender].TString
+                  (Phrases2.Lookup('FRNOTACCEPTANYWANT')) + ' '
+              else
+                result := Tribe[pSender].TPhrase('FRNOTACCEPTOFFER') + ' ';
+            end;
+            result := result + Phrases.Lookup('FRDONE');
+            DoIntro := false
+          end
         end
-      end
-    else if (Offer.nDeliver+Offer.nCost=1)
-      and (Offer.Price[0] and opMask=opTreaty)
-      and (integer(Offer.Price[0]-opTreaty)>Treaty) then // simple treaty offer
-      begin
-      case Offer.Price[0]-opTreaty of
-        //trCeaseFire: result:=result+Tribe[pTarget].TPhrase('FRCEASEFIRE');
-        trPeace: result:=result+Tribe[pTarget].TPhrase('FRPEACE');
-        trFriendlyContact: result:=result+Tribe[pTarget].TPhrase('FRFRIENDLY');
-        trAlliance: result:=result+Tribe[pTarget].TPhrase('FRALLIANCE');
+        else if (Offer.nDeliver + Offer.nCost = 1) and
+          (Offer.Price[0] and opMask = opTreaty) and
+          (integer(Offer.Price[0] - opTreaty) > Treaty) then
+        // simple treaty offer
+        begin
+          case Offer.Price[0] - opTreaty of
+            // trCeaseFire: result:=result+Tribe[pTarget].TPhrase('FRCEASEFIRE');
+            trPeace:
+              result := result + Tribe[pTarget].TPhrase('FRPEACE');
+            trFriendlyContact:
+              result := result + Tribe[pTarget].TPhrase('FRFRIENDLY');
+            trAlliance:
+              result := result + Tribe[pTarget].TPhrase('FRALLIANCE');
+          end
         end
-      end
-    else if Offer.nDeliver=0 then // demand
-      begin
-      if (Treaty>=trFriendlyContact) and not Phrases2FallenBackToEnglish then
-        result:=result+Format(Tribe[pTarget].TString(Phrases2.Lookup('FRDEMAND_SOFT')),[sCost])
-      else
-        begin
-        result:=result+Format(Tribe[pTarget].TPhrase('FRDEMAND_STRONG'),[sCost]);
-        DoIntro:=false
+        else if Offer.nDeliver = 0 then // demand
+        begin
+          if (Treaty >= trFriendlyContact) and not Phrases2FallenBackToEnglish
+          then
+            result := result +
+              Format(Tribe[pTarget].TString(Phrases2.Lookup('FRDEMAND_SOFT')
+              ), [sCost])
+          else
+          begin
+            result := result +
+              Format(Tribe[pTarget].TPhrase('FRDEMAND_STRONG'), [sCost]);
+            DoIntro := false
+          end
         end
-      end
-    else if Offer.nCost=0 then // present
-      result:=result+Format(Tribe[pTarget].TPhrase('FRPRESENT'),[sDeliver])
-    else if (Offer.nDeliver=1) and (Offer.Price[0]=opChoose) then
-      result:=result+Format(Phrases.Lookup('FRDELCHOICE'),[sCost])
-    else if (Offer.nCost=1) and (Offer.Price[Offer.nDeliver]=opChoose) then
-      result:=result+Format(Phrases.Lookup('FRCOSTCHOICE'),[sDeliver])
-    else result:=result+Format(Phrases.Lookup('FROFFER'),[sDeliver,sCost]);
-    end;
+        else if Offer.nCost = 0 then // present
+          result := result + Format(Tribe[pTarget].TPhrase('FRPRESENT'),
+            [sDeliver])
+        else if (Offer.nDeliver = 1) and (Offer.Price[0] = opChoose) then
+          result := result + Format(Phrases.Lookup('FRDELCHOICE'), [sCost])
+        else if (Offer.nCost = 1) and (Offer.Price[Offer.nDeliver] = opChoose)
+        then
+          result := result + Format(Phrases.Lookup('FRCOSTCHOICE'), [sDeliver])
+        else
+          result := result + Format(Phrases.Lookup('FROFFER'),
+            [sDeliver, sCost]);
+      end;
   end;
-if DoIntro then
-  if Treaty<trPeace then
-    result:=Tribe[pSender].TPhrase('FRSTART_NOTREATY')+' '+result
-  else result:=Tribe[pSender].TPhrase('FRSTART_PEACE')+' '+result
+  if DoIntro then
+    if Treaty < trPeace then
+      result := Tribe[pSender].TPhrase('FRSTART_NOTREATY') + ' ' + result
+    else
+      result := Tribe[pSender].TPhrase('FRSTART_PEACE') + ' ' + result
 end;
 
 end.
-

trunk/LocalPlayer/Draft.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Draft;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ClientTools,Term,ScreenTools,PVSB,BaseWin,
-
-  Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms,ExtCtrls,ButtonA,
+  Protocol, ClientTools, Term, ScreenTools, PVSB, BaseWin,
+
+  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
+  ButtonA,
   ButtonB, ButtonBase, Area;
 
@@ -28 +28 @@
     procedure FormDestroy(Sender: TObject);
   public
-    procedure ShowNewContent(NewMode: integer); 
+    procedure ShowNewContent(NewMode: integer);
   protected
     procedure OffscreenPaint; override;
   private
-    Domain,MaxLines,Lines,Cut,yDomain,yFeature,yWeight,yTotal,yView,IncCap,
-      DecCap: integer;
-    code: array[0..nFeature-1] of integer;
-    Template,Back: TBitmap;
-    function IsFeatureInList(d,i: integer): boolean;
+    Domain, MaxLines, Lines, Cut, yDomain, yFeature, yWeight, yTotal, yView,
+      IncCap, DecCap: integer;
+    code: array [0 .. nFeature - 1] of integer;
+    Template, Back: TBitmap;
+    function IsFeatureInList(d, i: integer): boolean;
     procedure SetDomain(d: integer);
   end;
@@ -45 +45 @@
 implementation
 
-uses Help,Tribes,Directories;
+uses Help, Tribes, Directories;
 
 {$R *.DFM}
 
 const
-MaxLines0=11; LinePitch=20;
-xDomain=30; yDomain0=464; DomainPitch=40;
-xFeature=38; yFeature0=42;
-xWeight=100; yWeight0=271;
-xTotal=20; xTotal2=34; yTotal0=354;
-xView=17; yView0=283;
+  MaxLines0 = 11;
+  LinePitch = 20;
+  xDomain = 30;
+  yDomain0 = 464;
+  DomainPitch = 40;
+  xFeature = 38;
+  yFeature0 = 42;
+  xWeight = 100;
+  yWeight0 = 271;
+  xTotal = 20;
+  xTotal2 = 34;
+  yTotal0 = 354;
+  xView = 17;
+  yView0 = 283;
 
 procedure TDraftDlg.FormCreate(Sender: TObject);
 begin
-inherited;
-InitButtons();
-HelpContext:='CLASSES';
-Caption:=Phrases.Lookup('TITLE_DRAFT');
-OKBtn.Caption:=Phrases.Lookup('BTN_OK');
-
-if not Phrases2FallenBackToEnglish then
-  begin
-  GroundArea.Hint:=Phrases2.Lookup('DRAFTDOMAIN',0);
-  SeaArea.Hint:=Phrases2.Lookup('DRAFTDOMAIN',1);
-  AirArea.Hint:=Phrases2.Lookup('DRAFTDOMAIN',2);
+  inherited;
+  InitButtons();
+  HelpContext := 'CLASSES';
+  Caption := Phrases.Lookup('TITLE_DRAFT');
+  OKBtn.Caption := Phrases.Lookup('BTN_OK');
+
+  if not Phrases2FallenBackToEnglish then
+  begin
+    GroundArea.Hint := Phrases2.Lookup('DRAFTDOMAIN', 0);
+    SeaArea.Hint := Phrases2.Lookup('DRAFTDOMAIN', 1);
+    AirArea.Hint := Phrases2.Lookup('DRAFTDOMAIN', 2);
   end
-else
-  begin
-  GroundArea.Hint:=Phrases.Lookup('DOMAIN',0);
-  SeaArea.Hint:=Phrases.Lookup('DOMAIN',1);
-  AirArea.Hint:=Phrases.Lookup('DOMAIN',2);
-  end;
-
-Back:=TBitmap.Create;
-Back.PixelFormat:=pf24bit;
-Back.Width:=ClientWidth; Back.Height:=ClientHeight;
-Template:=TBitmap.Create;
-LoadGraphicFile(Template, HomeDir+'Graphics\MiliRes', gfNoGamma);
-Template.PixelFormat:=pf8bit;
+  else
+  begin
+    GroundArea.Hint := Phrases.Lookup('DOMAIN', 0);
+    SeaArea.Hint := Phrases.Lookup('DOMAIN', 1);
+    AirArea.Hint := Phrases.Lookup('DOMAIN', 2);
+  end;
+
+  Back := TBitmap.Create;
+  Back.PixelFormat := pf24bit;
+  Back.Width := ClientWidth;
+  Back.Height := ClientHeight;
+  Template := TBitmap.Create;
+  LoadGraphicFile(Template, HomeDir + 'Graphics\MiliRes', gfNoGamma);
+  Template.PixelFormat := pf8bit;
 end;
 
 procedure TDraftDlg.FormDestroy(Sender: TObject);
 begin
-Template.Free;
+  Template.Free;
 end;
 
 procedure TDraftDlg.CloseBtnClick(Sender: TObject);
 begin
-ModalResult:=mrCancel;
+  ModalResult := mrCancel;
 end;
 
@@ -100 +109 @@
   function DomainAvailable(d: integer): boolean;
   begin
-  result:=(upgrade[d,0].Preq=preNone)
-    or (MyRO.Tech[upgrade[d,0].Preq]>=tsApplicable);
+    result := (upgrade[d, 0].Preq = preNone) or
+      (MyRO.Tech[upgrade[d, 0].Preq] >= tsApplicable);
   end;
 
   procedure PaintTotalBars;
   var
-  i,y,dx,num,w: integer;
-  s: string;
-  begin
-  with offscreen.Canvas do
-    begin
-    // strength bar
-    y:=yTotal;
-    DarkGradient(Offscreen.Canvas,xTotal-6,y+1,184,2);
-    DarkGradient(Offscreen.Canvas,xTotal2+172,y+1,95,2);
-    RisedTextOut(Offscreen.Canvas,xTotal-2,y,Phrases.Lookup('UNITSTRENGTH'));
-    RisedTextOut(Offscreen.Canvas,xTotal+112+30,y,'x'+IntToStr(MyRO.DevModel.MStrength));
-    RisedTextOut(Offscreen.Canvas,xTotal2+148+30,y,'=');
-    s:=IntToStr(MyRO.DevModel.Attack)+'/'+IntToStr(MyRO.DevModel.Defense);
-    RisedTextOut(Offscreen.Canvas,xTotal2+170+64+30-BiColorTextWidth(Offscreen.Canvas,s),y,s);
-
-    // transport bar
-    if MyRO.DevModel.MTrans>0 then
+    i, y, dx, num, w: integer;
+    s: string;
+  begin
+    with offscreen.Canvas do
+    begin
+      // strength bar
+      y := yTotal;
+      DarkGradient(offscreen.Canvas, xTotal - 6, y + 1, 184, 2);
+      DarkGradient(offscreen.Canvas, xTotal2 + 172, y + 1, 95, 2);
+      RisedTextOut(offscreen.Canvas, xTotal - 2, y,
+        Phrases.Lookup('UNITSTRENGTH'));
+      RisedTextOut(offscreen.Canvas, xTotal + 112 + 30, y,
+        'x' + IntToStr(MyRO.DevModel.MStrength));
+      RisedTextOut(offscreen.Canvas, xTotal2 + 148 + 30, y, '=');
+      s := IntToStr(MyRO.DevModel.Attack) + '/' +
+        IntToStr(MyRO.DevModel.Defense);
+      RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 -
+        BiColorTextWidth(offscreen.Canvas, s), y, s);
+
+      // transport bar
+      if MyRO.DevModel.MTrans > 0 then
       begin
-      y:=yTotal+19;
-      DarkGradient(Offscreen.Canvas,xTotal-6,y+1,184,1);
-      DarkGradient(Offscreen.Canvas,xTotal2+172,y+1,95,1);
-      RisedTextOut(Offscreen.Canvas,xTotal-2,y,Phrases.Lookup('UNITTRANSPORT'));
-      RisedTextOut(Offscreen.Canvas,xTotal+112+30,y,'x'+IntToStr(MyRO.DevModel.MTrans));
-      RisedTextOut(Offscreen.Canvas,xTotal2+148+30,y,'=');
-
-      Font.Color:=$000000;
-      dx:=-237-30;
-      for i:=mcFirstNonCap-1 downto 3 do
-        if i in [mcSeaTrans,mcCarrier,mcAirTrans] then
+        y := yTotal + 19;
+        DarkGradient(offscreen.Canvas, xTotal - 6, y + 1, 184, 1);
+        DarkGradient(offscreen.Canvas, xTotal2 + 172, y + 1, 95, 1);
+        RisedTextOut(offscreen.Canvas, xTotal - 2, y,
+          Phrases.Lookup('UNITTRANSPORT'));
+        RisedTextOut(offscreen.Canvas, xTotal + 112 + 30, y,
+          'x' + IntToStr(MyRO.DevModel.MTrans));
+        RisedTextOut(offscreen.Canvas, xTotal2 + 148 + 30, y, '=');
+
+        Font.Color := $000000;
+        dx := -237 - 30;
+        for i := mcFirstNonCap - 1 downto 3 do
+          if i in [mcSeaTrans, mcCarrier, mcAirTrans] then
           begin
-          num:=MyRO.DevModel.Cap[i]*MyRO.DevModel.MTrans;
-          if num>0 then
+            num := MyRO.DevModel.Cap[i] * MyRO.DevModel.MTrans;
+            if num > 0 then
             begin
-            inc(dx,15);
-            Brush.Color:=$C0C0C0;
-            FrameRect(Rect(xTotal2-3-dx,y+2,xTotal2+11-dx,y+16));
-            Brush.Style:=bsClear;
-            Sprite(Offscreen,HGrSystem,xTotal2-1-dx,y+4,10,10,66+i mod 11 *11,137+i div 11 *11);
-            if num>1 then
+              inc(dx, 15);
+              Brush.Color := $C0C0C0;
+              FrameRect(Rect(xTotal2 - 3 - dx, y + 2,
+                xTotal2 + 11 - dx, y + 16));
+              Brush.Style := bsClear;
+              Sprite(offscreen, HGrSystem, xTotal2 - 1 - dx, y + 4, 10, 10,
+                66 + i mod 11 * 11, 137 + i div 11 * 11);
+              if num > 1 then
               begin
-              s:=IntToStr(num);
-              w:=TextWidth(s);
-              inc(dx,w+1);
-              Brush.Color:=$FFFFFF;
-              FillRect(Rect(xTotal2-3-dx,y+2,xTotal2+w-1-dx,y+16));
-              Brush.Style:=bsClear;
-              Textout(xTotal2-3-dx+1,y,s);
+                s := IntToStr(num);
+                w := TextWidth(s);
+                inc(dx, w + 1);
+                Brush.Color := $FFFFFF;
+                FillRect(Rect(xTotal2 - 3 - dx, y + 2,
+                  xTotal2 + w - 1 - dx, y + 16));
+                Brush.Style := bsClear;
+                Textout(xTotal2 - 3 - dx + 1, y, s);
               end;
             end;
@@ -158 +176 @@
       end;
 
-    // speed bar
-    y:=yTotal+38;
-    LoweredTextOut(offscreen.Canvas,-1,MainTexture,xTotal-2,y,Phrases.Lookup('UNITSPEED'));
-    DLine(offscreen.Canvas,xTotal-2,xTotal+174,y+16,MainTexture.clBevelShade,
-      MainTexture.clBevelLight);
-    DLine(offscreen.Canvas,xTotal2+176,xTotal2+263,y+16,MainTexture.clBevelShade,
-      MainTexture.clBevelLight);
-    s:=MovementToString(MyRO.DevModel.Speed);
-    RisedTextOut(offscreen.Canvas,xTotal2+170+64+30-TextWidth(s),y,s);
-
-    // cost bar
-    y:=yTotal+57;
-    LoweredTextOut(offscreen.Canvas,-1,MainTexture,xTotal-2,y,Phrases.Lookup('UNITCOST'));
-    LoweredTextOut(Offscreen.Canvas,-1,MainTexture,xTotal+112+30,y,'x'+IntToStr(MyRO.DevModel.MCost));
-    LoweredTextOut(Offscreen.Canvas,-1,MainTexture,xTotal2+148+30,y,'=');
-    DLine(offscreen.Canvas,xTotal-2,xTotal+174,y+16,MainTexture.clBevelShade,
-      MainTexture.clBevelLight);
-    DLine(offscreen.Canvas,xTotal2+176,xTotal2+263,y+16,MainTexture.clBevelShade,
-      MainTexture.clBevelLight);
-    s:=IntToStr(MyRO.DevModel.Cost);
-    RisedTextOut(offscreen.Canvas,xTotal2+170+64+30-12-TextWidth(s),y,s);
-    Sprite(offscreen,HGrSystem,xTotal2+170+54+30,y+4,10,10,88,115);
-
-    if G.Difficulty[me]<>2 then
+      // speed bar
+      y := yTotal + 38;
+      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, y,
+        Phrases.Lookup('UNITSPEED'));
+      DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
+        MainTexture.clBevelShade, MainTexture.clBevelLight);
+      DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
+        MainTexture.clBevelShade, MainTexture.clBevelLight);
+      s := MovementToString(MyRO.DevModel.Speed);
+      RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 -
+        TextWidth(s), y, s);
+
+      // cost bar
+      y := yTotal + 57;
+      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, y,
+        Phrases.Lookup('UNITCOST'));
+      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal + 112 + 30, y,
+        'x' + IntToStr(MyRO.DevModel.MCost));
+      LoweredTextOut(offscreen.Canvas, -1, MainTexture,
+        xTotal2 + 148 + 30, y, '=');
+      DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
+        MainTexture.clBevelShade, MainTexture.clBevelLight);
+      DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
+        MainTexture.clBevelShade, MainTexture.clBevelLight);
+      s := IntToStr(MyRO.DevModel.Cost);
+      RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 - 12 -
+        TextWidth(s), y, s);
+      Sprite(offscreen, HGrSystem, xTotal2 + 170 + 54 + 30, y + 4, 10,
+        10, 88, 115);
+
+      if G.Difficulty[me] <> 2 then
       begin // corrected cost bar
-      y:=yTotal+76;
-      LoweredTextOut(offscreen.Canvas,-1,MainTexture,xTotal-2,y,
-        Phrases.Lookup('COSTDIFF'+char(48+G.Difficulty[me])));
-      LoweredTextOut(Offscreen.Canvas,-1,MainTexture,xTotal2+148+30,y,'=');
-      DLine(offscreen.Canvas,xTotal-2,xTotal+174,y+16,MainTexture.clBevelShade,
-        MainTexture.clBevelLight);
-      DLine(offscreen.Canvas,xTotal2+176,xTotal2+263,y+16,MainTexture.clBevelShade,
-        MainTexture.clBevelLight);
-      s:=IntToStr(MyRO.DevModel.Cost*BuildCostMod[G.Difficulty[me]] div 12);
-      RisedTextOut(offscreen.Canvas,xTotal2+170+64+30-12-TextWidth(s),y,s);
-      Sprite(offscreen,HGrSystem,xTotal2+170+54+30,y+4,10,10,88,115);
+        y := yTotal + 76;
+        LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, y,
+          Phrases.Lookup('COSTDIFF' + char(48 + G.Difficulty[me])));
+        LoweredTextOut(offscreen.Canvas, -1, MainTexture,
+          xTotal2 + 148 + 30, y, '=');
+        DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
+          MainTexture.clBevelShade, MainTexture.clBevelLight);
+        DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
+          MainTexture.clBevelShade, MainTexture.clBevelLight);
+        s := IntToStr(MyRO.DevModel.Cost * BuildCostMod
+          [G.Difficulty[me]] div 12);
+        RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 - 12 -
+          TextWidth(s), y, s);
+        Sprite(offscreen, HGrSystem, xTotal2 + 170 + 54 + 30, y + 4, 10,
+          10, 88, 115);
       end;
     end;
@@ -199 +228 @@
 
 var
-i,j,x,d,n,TextColor,CapWeight,DomainCount: integer;
-begin
-inherited;
-
-ClientHeight:=Template.Height-Cut;
-if ClientHeight>hMainTexture then // assemble background from 2 texture tiles
-  begin
-  bitblt(Back.Canvas.Handle,0,0,ClientWidth,64,MainTexture.Image.Canvas.Handle,
-    (wMainTexture-ClientWidth) div 2,hMainTexture-64,SRCCOPY);
-  bitblt(Back.Canvas.Handle,0,64,ClientWidth,ClientHeight-64,
-    MainTexture.Image.Canvas.Handle,(wMainTexture-ClientWidth) div 2,0,SRCCOPY);
+  i, j, x, d, n, TextColor, CapWeight, DomainCount: integer;
+begin
+  inherited;
+
+  ClientHeight := Template.Height - Cut;
+  if ClientHeight > hMainTexture then
+  // assemble background from 2 texture tiles
+  begin
+    bitblt(Back.Canvas.Handle, 0, 0, ClientWidth, 64,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
+      hMainTexture - 64, SRCCOPY);
+    bitblt(Back.Canvas.Handle, 0, 64, ClientWidth, ClientHeight - 64,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
+      0, SRCCOPY);
   end
-else bitblt(Back.Canvas.Handle,0,0,ClientWidth,ClientHeight,MainTexture.Image.Canvas.Handle,
-  (wMainTexture-ClientWidth) div 2,(hMainTexture-ClientHeight) div 2,SRCCOPY);
-ImageOp_B(Back,Template,0,0,0,0,Template.Width,64);
-ImageOp_B(Back,Template,0,64,0,64+Cut,Template.Width,Template.Height-64-Cut);
-
-bitblt(offscreen.canvas.handle,0,0,ClientWidth,ClientHeight,Back.Canvas.handle,0,0,SRCCOPY);
-
-offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-RisedTextout(offscreen.Canvas,10,7,Caption);
-offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-
-with MyRO.DevModel do
-  begin
-  DomainCount:=0;
-  for d:=0 to nDomains-1 do
-    if DomainAvailable(d) then
-      inc(DomainCount);
-  if DomainCount>1 then
-    begin
-    for d:=0 to nDomains-1 do
+  else
+    bitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
+      (hMainTexture - ClientHeight) div 2, SRCCOPY);
+  ImageOp_B(Back, Template, 0, 0, 0, 0, Template.Width, 64);
+  ImageOp_B(Back, Template, 0, 64, 0, 64 + Cut, Template.Width,
+    Template.Height - 64 - Cut);
+
+  bitblt(offscreen.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
+    Back.Canvas.Handle, 0, 0, SRCCOPY);
+
+  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  RisedTextOut(offscreen.Canvas, 10, 7, Caption);
+  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+
+  with MyRO.DevModel do
+  begin
+    DomainCount := 0;
+    for d := 0 to nDomains - 1 do
       if DomainAvailable(d) then
+        inc(DomainCount);
+    if DomainCount > 1 then
+    begin
+      for d := 0 to nDomains - 1 do
+        if DomainAvailable(d) then
         begin
-        x:=xDomain+d*DomainPitch;
-        if d=Domain then
-          ImageOp_BCC(Offscreen,Templates,x,yDomain,142,246+37*d,36,36,0,$00C0FF)
-        else ImageOp_BCC(Offscreen,Templates,x,yDomain,142,246+37*d,36,36,0,$606060);
+          x := xDomain + d * DomainPitch;
+          if d = Domain then
+            ImageOp_BCC(offscreen, Templates, x, yDomain, 142, 246 + 37 * d, 36,
+              36, 0, $00C0FF)
+          else
+            ImageOp_BCC(offscreen, Templates, x, yDomain, 142, 246 + 37 * d, 36,
+              36, 0, $606060);
         end;
-    Frame(Offscreen.Canvas,xDomain-11,yDomain-3,xDomain+2*DomainPitch+46,
-      yDomain+38,$B0B0B0,$FFFFFF);
-    RFrame(Offscreen.Canvas,xDomain-12,yDomain-4,xDomain+2*DomainPitch+47,
-      yDomain+39,$FFFFFF,$B0B0B0);
-    end;
-  GroundArea.Top:=yDomain;
-  GroundArea.Visible:=DomainAvailable(dGround);
-  SeaArea.Top:=yDomain;
-  SeaArea.Visible:=DomainAvailable(dSea);
-  AirArea.Top:=yDomain;
-  AirArea.Visible:=DomainAvailable(dAir);
-
-  PaintTotalBars;
-
-  // display weight
-  with offscreen.Canvas do
-    begin
-    for i:=0 to MaxWeight-1 do
-      if i<Weight then
-        ImageOp_BCC(Offscreen,Templates,xWeight+20*i,
-          yWeight,123,400,18,20,0,$949494)
-      else ImageOp_BCC(Offscreen,Templates,xWeight+20*i,
-        yWeight,105,400,18,20,0,$949494);
-    end;
-
-  with offscreen.Canvas do for i:=0 to Lines-1 do
-    begin
-    if not (code[i] in AutoFeature) then
+      Frame(offscreen.Canvas, xDomain - 11, yDomain - 3,
+        xDomain + 2 * DomainPitch + 46, yDomain + 38, $B0B0B0, $FFFFFF);
+      RFrame(offscreen.Canvas, xDomain - 12, yDomain - 4,
+        xDomain + 2 * DomainPitch + 47, yDomain + 39, $FFFFFF, $B0B0B0);
+    end;
+    GroundArea.Top := yDomain;
+    GroundArea.Visible := DomainAvailable(dGround);
+    SeaArea.Top := yDomain;
+    SeaArea.Visible := DomainAvailable(dSea);
+    AirArea.Top := yDomain;
+    AirArea.Visible := DomainAvailable(dAir);
+
+    PaintTotalBars;
+
+    // display weight
+    with offscreen.Canvas do
+    begin
+      for i := 0 to MaxWeight - 1 do
+        if i < Weight then
+          ImageOp_BCC(offscreen, Templates, xWeight + 20 * i, yWeight, 123, 400,
+            18, 20, 0, $949494)
+        else
+          ImageOp_BCC(offscreen, Templates, xWeight + 20 * i, yWeight, 105, 400,
+            18, 20, 0, $949494);
+    end;
+
+    with offscreen.Canvas do
+      for i := 0 to Lines - 1 do
       begin
-      // paint +/- butttons
-      if code[i]<mcFirstNonCap then
+        if not(code[i] in AutoFeature) then
         begin
-        Dump(offscreen,HGrSystem,xFeature-21,yFeature+2+LinePitch*i,
-          12,12,169,172);
-        Dump(offscreen,HGrSystem,xFeature-9,yFeature+2+LinePitch*i,
-          12,12,169,159);
-        RFrame(offscreen.Canvas,xFeature-(21+1),yFeature+2+LinePitch*i-1,
-          xFeature-(21-24),yFeature+2+LinePitch*i+12,
-          MainTexture.clBevelShade,MainTexture.clBevelLight);
-        end
-      else
-        begin
-        Dump(offscreen,HGrSystem,xFeature-9,yFeature+2+LinePitch*i,
-          12,12,169,185+13*MyRO.DevModel.Cap[code[i]]);
-        RFrame(offscreen.Canvas,xFeature-(9+1),yFeature+2+LinePitch*i-1,
-          xFeature-(21-24),yFeature+2+LinePitch*i+12,
-          MainTexture.clBevelShade,MainTexture.clBevelLight);
-        end;
-
-      // paint cost
-      LightGradient(offscreen.Canvas,xFeature+34,yFeature+LinePitch*i,50,
-        GrExt[HGrSystem].Data.Canvas.Pixels[187,137]);
-      if (Domain=dGround) and (code[i]=mcDefense) then CapWeight:=2
-      else CapWeight:=Feature[code[i]].Weight;
-      n:=CapWeight+Feature[code[i]].Cost;
-      d:=6;
-      while (n-1)*d*2>48-10 do dec(d);
-      for j:=0 to n-1 do
-        if j<CapWeight then
-          Sprite(offscreen,HGrSystem,xFeature+54+(j*2+1-n)*d,
-            yFeature+2+LinePitch*i+1,10,10,88,126)
-          else Sprite(offscreen,HGrSystem,xFeature+54+(j*2+1-n)*d,
-            yFeature+2+LinePitch*i+1,10,10,88,115);
-      end; // if not (code[i] in AutoFeature)
-    DarkGradient(offscreen.Canvas,xFeature+17,yFeature+LinePitch*i,16,1);
-    Frame(offscreen.canvas,xFeature+18,yFeature+1+LinePitch*i,
-      xFeature+20-2+13,yFeature+2+1-2+13+LinePitch*i,$C0C0C0,$C0C0C0);
-    Sprite(offscreen,HGrSystem,xFeature+20,yFeature+2+1+LinePitch*i,
-      10,10,66+code[i] mod 11 *11,137+code[i] div 11 *11);
-
-    if MyRO.DevModel.Cap[code[i]]>0 then TextColor:=MainTexture.clLitText
-    else TextColor:=-1;
-
-    if code[i]<mcFirstNonCap then
-      LoweredTextOut(offscreen.Canvas,TextColor,MainTexture,xFeature+7,
-        yFeature+LinePitch*i-1,IntToStr(MyRO.DevModel.Cap[code[i]]));
-    LoweredTextOut(offscreen.Canvas,TextColor,MainTexture,xFeature+88,
-      yFeature+LinePitch*i-1,Phrases.Lookup('FEATURES',code[i]));
-    end;
-  end;
-
-// free features
-j:=0;
-for i:=0 to nFeature-1 do
-  if (i in AutoFeature)
-    and (1 shl Domain and Feature[i].Domains<>0) and (Feature[i].Preq<>preNA)
-    and ((Feature[i].Preq=preSun) and (MyRO.Wonder[woSun].EffectiveOwner=me)
-      or (Feature[i].Preq>=0) and (MyRO.Tech[Feature[i].Preq]>=tsApplicable))
-    and not ((Feature[i].Preq=adSteamEngine)
-      and (MyRO.Tech[adNuclearPower]>=tsApplicable)) then
-    begin
-    DarkGradient(offscreen.Canvas,xWeight+4,yWeight+32+LinePitch*j,16,1);
-    Frame(offscreen.canvas,xWeight+5,yWeight+33+LinePitch*j,
-      xWeight+18,yWeight+47+LinePitch*j,$C0C0C0,$C0C0C0);
-    Sprite(offscreen,HGrSystem,xWeight+7,yWeight+36+LinePitch*j,
-      10,10,66+i mod 11 *11,137+i div 11 *11);
-    LoweredTextOut(offscreen.Canvas,-1,MainTexture,xWeight+26,
-      yWeight+31+LinePitch*j,Phrases.Lookup('FEATURES',i));
-    inc(j);
-    end;
-
-with Tribe[me].ModelPicture[MyRO.nModel] do
-  begin
-  FrameImage(offscreen.canvas,BigImp,xView+4,yView+4,xSizeBig,ySizeBig,0,0);
-  Sprite(offscreen,HGr,xView,yView,64,44,pix mod 10 *65+1,pix div 10*49+1);
-  end;
-MarkUsedOffscreen(ClientWidth,ClientHeight);
-end;{MainPaint}
+          // paint +/- butttons
+          if code[i] < mcFirstNonCap then
+          begin
+            Dump(offscreen, HGrSystem, xFeature - 21, yFeature + 2 + LinePitch *
+              i, 12, 12, 169, 172);
+            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              i, 12, 12, 169, 159);
+            RFrame(offscreen.Canvas, xFeature - (21 + 1),
+              yFeature + 2 + LinePitch * i - 1, xFeature - (21 - 24),
+              yFeature + 2 + LinePitch * i + 12, MainTexture.clBevelShade,
+              MainTexture.clBevelLight);
+          end
+          else
+          begin
+            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              i, 12, 12, 169, 185 + 13 * MyRO.DevModel.Cap[code[i]]);
+            RFrame(offscreen.Canvas, xFeature - (9 + 1),
+              yFeature + 2 + LinePitch * i - 1, xFeature - (21 - 24),
+              yFeature + 2 + LinePitch * i + 12, MainTexture.clBevelShade,
+              MainTexture.clBevelLight);
+          end;
+
+          // paint cost
+          LightGradient(offscreen.Canvas, xFeature + 34,
+            yFeature + LinePitch * i, 50, GrExt[HGrSystem].Data.Canvas.Pixels
+            [187, 137]);
+          if (Domain = dGround) and (code[i] = mcDefense) then
+            CapWeight := 2
+          else
+            CapWeight := Feature[code[i]].Weight;
+          n := CapWeight + Feature[code[i]].Cost;
+          d := 6;
+          while (n - 1) * d * 2 > 48 - 10 do
+            dec(d);
+          for j := 0 to n - 1 do
+            if j < CapWeight then
+              Sprite(offscreen, HGrSystem, xFeature + 54 + (j * 2 + 1 - n) * d,
+                yFeature + 2 + LinePitch * i + 1, 10, 10, 88, 126)
+            else
+              Sprite(offscreen, HGrSystem, xFeature + 54 + (j * 2 + 1 - n) * d,
+                yFeature + 2 + LinePitch * i + 1, 10, 10, 88, 115);
+        end; // if not (code[i] in AutoFeature)
+        DarkGradient(offscreen.Canvas, xFeature + 17,
+          yFeature + LinePitch * i, 16, 1);
+        Frame(offscreen.Canvas, xFeature + 18, yFeature + 1 + LinePitch * i,
+          xFeature + 20 - 2 + 13, yFeature + 2 + 1 - 2 + 13 + LinePitch * i,
+          $C0C0C0, $C0C0C0);
+        Sprite(offscreen, HGrSystem, xFeature + 20, yFeature + 2 + 1 + LinePitch
+          * i, 10, 10, 66 + code[i] mod 11 * 11, 137 + code[i] div 11 * 11);
+
+        if MyRO.DevModel.Cap[code[i]] > 0 then
+          TextColor := MainTexture.clLitText
+        else
+          TextColor := -1;
+
+        if code[i] < mcFirstNonCap then
+          LoweredTextOut(offscreen.Canvas, TextColor, MainTexture, xFeature + 7,
+            yFeature + LinePitch * i - 1, IntToStr(MyRO.DevModel.Cap[code[i]]));
+        LoweredTextOut(offscreen.Canvas, TextColor, MainTexture, xFeature + 88,
+          yFeature + LinePitch * i - 1, Phrases.Lookup('FEATURES', code[i]));
+      end;
+  end;
+
+  // free features
+  j := 0;
+  for i := 0 to nFeature - 1 do
+    if (i in AutoFeature) and (1 shl Domain and Feature[i].Domains <> 0) and
+      (Feature[i].Preq <> preNA) and
+      ((Feature[i].Preq = preSun) and (MyRO.Wonder[woSun].EffectiveOwner = me)
+      or (Feature[i].Preq >= 0) and (MyRO.Tech[Feature[i].Preq] >= tsApplicable)
+      ) and not((Feature[i].Preq = adSteamEngine) and
+      (MyRO.Tech[adNuclearPower] >= tsApplicable)) then
+    begin
+      DarkGradient(offscreen.Canvas, xWeight + 4, yWeight + 32 + LinePitch
+        * j, 16, 1);
+      Frame(offscreen.Canvas, xWeight + 5, yWeight + 33 + LinePitch * j,
+        xWeight + 18, yWeight + 47 + LinePitch * j, $C0C0C0, $C0C0C0);
+      Sprite(offscreen, HGrSystem, xWeight + 7, yWeight + 36 + LinePitch * j,
+        10, 10, 66 + i mod 11 * 11, 137 + i div 11 * 11);
+      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xWeight + 26,
+        yWeight + 31 + LinePitch * j, Phrases.Lookup('FEATURES', i));
+      inc(j);
+    end;
+
+  with Tribe[me].ModelPicture[MyRO.nModel] do
+  begin
+    FrameImage(offscreen.Canvas, BigImp, xView + 4, yView + 4, xSizeBig,
+      ySizeBig, 0, 0);
+    Sprite(offscreen, HGr, xView, yView, 64, 44, pix mod 10 * 65 + 1,
+      pix div 10 * 49 + 1);
+  end;
+  MarkUsedOffscreen(ClientWidth, ClientHeight);
+end; { MainPaint }
 
 procedure TDraftDlg.SetDomain(d: integer);
@@ -351 +406 @@
   function Prio(fix: integer): integer;
   var
-  FeaturePreq: integer;
-  begin
-  FeaturePreq:=Feature[fix].Preq;
-  assert(FeaturePreq<>preNA);
-  if fix<mcFirstNonCap then result:=10000+fix
-  else if FeaturePreq=preNone then result:=20000
-  else if FeaturePreq<0 then result:=40000
-  else result:=30000+AdvValue[FeaturePreq];
-  if not (fix in AutoFeature) then inc(result,90000);
+    FeaturePreq: integer;
+  begin
+    FeaturePreq := Feature[fix].Preq;
+    assert(FeaturePreq <> preNA);
+    if fix < mcFirstNonCap then
+      result := 10000 + fix
+    else if FeaturePreq = preNone then
+      result := 20000
+    else if FeaturePreq < 0 then
+      result := 40000
+    else
+      result := 30000 + AdvValue[FeaturePreq];
+    if not(fix in AutoFeature) then
+      inc(result, 90000);
   end;
 
 var
-i,j,x: integer;
-begin
-Domain:=d;
-Lines:=0;
-for i:=0 to nFeature-1 do
-  if IsFeatureInList(Domain,i) then
-    begin code[Lines]:=i; inc(Lines) end;
-yFeature:=yFeature0+(MaxLines-Lines)*LinePitch div 2;
-
-// sort features
-for i:=0 to Lines-2 do for j:=i+1 to Lines-1 do
-  if Prio(code[i])>Prio(code[j]) then
-    begin // exchange
-    x:=code[i];
-    code[i]:=code[j];
-    code[j]:=x
-    end;
-end;
-
-function TDraftDlg.IsFeatureInList(d,i: integer): boolean;
-begin
-result:= not (i in AutoFeature)
-  and (1 shl d and Feature[i].Domains<>0) and (Feature[i].Preq<>preNA)
-  and ((Feature[i].Preq=preNone)
-    or (Feature[i].Preq=preSun) and (MyRO.Wonder[woSun].EffectiveOwner=me)
-    or (Feature[i].Preq>=0) and (MyRO.Tech[Feature[i].Preq]>=tsApplicable));
+  i, j, x: integer;
+begin
+  Domain := d;
+  Lines := 0;
+  for i := 0 to nFeature - 1 do
+    if IsFeatureInList(Domain, i) then
+    begin
+      code[Lines] := i;
+      inc(Lines)
+    end;
+  yFeature := yFeature0 + (MaxLines - Lines) * LinePitch div 2;
+
+  // sort features
+  for i := 0 to Lines - 2 do
+    for j := i + 1 to Lines - 1 do
+      if Prio(code[i]) > Prio(code[j]) then
+      begin // exchange
+        x := code[i];
+        code[i] := code[j];
+        code[j] := x
+      end;
+end;
+
+function TDraftDlg.IsFeatureInList(d, i: integer): boolean;
+begin
+  result := not(i in AutoFeature) and (1 shl d and Feature[i].Domains <> 0) and
+    (Feature[i].Preq <> preNA) and
+    ((Feature[i].Preq = preNone) or (Feature[i].Preq = preSun) and
+    (MyRO.Wonder[woSun].EffectiveOwner = me) or (Feature[i].Preq >= 0) and
+    (MyRO.Tech[Feature[i].Preq] >= tsApplicable));
 end;
 
 procedure TDraftDlg.FormShow(Sender: TObject);
 var
-count,d,i: integer;
-begin
-Domain:=dGround;
-while (Domain<dAir) and (upgrade[Domain,0].Preq<>preNone)
-  and (MyRO.Tech[upgrade[Domain,0].Preq]<tsApplicable) do inc(Domain);
-
-// count max number of features in any domain
-MaxLines:=0;
-for d:=0 to nDomains-1 do
-  if (upgrade[d,0].Preq=preNone)
-    or (MyRO.Tech[upgrade[d,0].Preq]>=tsApplicable) then
-    begin
-    count:=0;
-    for i:=0 to nFeature-1 do
-      if IsFeatureInList(d,i) then
-        inc(count);
-    if count>MaxLines then
-      MaxLines:=count;
-    end;
-Cut:=(MaxLines0-MaxLines)*LinePitch;
-OKBtn.Top:=477-Cut;
-yDomain:=yDomain0-Cut;
-yWeight:=yWeight0-Cut;
-yTotal:=yTotal0-Cut;
-yView:=yView0-Cut;
-
-if WindowMode=wmModal then
-  begin {center on screen}
-  Left:=(Screen.Width-Template.Width) div 2;
-  Top:=(Screen.Height-(Template.Height-Cut)) div 2;
-  end;
-
-SetDomain(Domain);
-Server(sCreateDevModel,me,Domain,nil^);
-MyModel[MyRO.nModel]:=MyRO.DevModel;
-InitMyModel(MyRO.nModel,false);
-OffscreenPaint;
-IncCap:=-1; DecCap:=-1;
+  count, d, i: integer;
+begin
+  Domain := dGround;
+  while (Domain < dAir) and (upgrade[Domain, 0].Preq <> preNone) and
+    (MyRO.Tech[upgrade[Domain, 0].Preq] < tsApplicable) do
+    inc(Domain);
+
+  // count max number of features in any domain
+  MaxLines := 0;
+  for d := 0 to nDomains - 1 do
+    if (upgrade[d, 0].Preq = preNone) or
+      (MyRO.Tech[upgrade[d, 0].Preq] >= tsApplicable) then
+    begin
+      count := 0;
+      for i := 0 to nFeature - 1 do
+        if IsFeatureInList(d, i) then
+          inc(count);
+      if count > MaxLines then
+        MaxLines := count;
+    end;
+  Cut := (MaxLines0 - MaxLines) * LinePitch;
+  OKBtn.Top := 477 - Cut;
+  yDomain := yDomain0 - Cut;
+  yWeight := yWeight0 - Cut;
+  yTotal := yTotal0 - Cut;
+  yView := yView0 - Cut;
+
+  if WindowMode = wmModal then
+  begin { center on screen }
+    Left := (Screen.Width - Template.Width) div 2;
+    Top := (Screen.Height - (Template.Height - Cut)) div 2;
+  end;
+
+  SetDomain(Domain);
+  Server(sCreateDevModel, me, Domain, nil^);
+  MyModel[MyRO.nModel] := MyRO.DevModel;
+  InitMyModel(MyRO.nModel, false);
+  OffscreenPaint;
+  IncCap := -1;
+  DecCap := -1;
 end;
 
 procedure TDraftDlg.ShowNewContent(NewMode: integer);
 begin
-inherited ShowNewContent(NewMode);
+  inherited ShowNewContent(NewMode);
 end;
 
@@ -441 +507 @@
   Shift: TShiftState; x, y: integer);
 var
-i,d: integer;
-begin
-if Button=mbLeft then
-  begin
-  for d:=0 to nDomains-1 do
-    if (d<>Domain) and ((upgrade[d,0].Preq=preNone)
-      or (MyRO.Tech[upgrade[d,0].Preq]>=tsApplicable))
-      and (x>=xDomain+d*DomainPitch) and (x<xDomain+d*DomainPitch+36)
-      and (y>=yDomain) and (y<yDomain+36) then
+  i, d: integer;
+begin
+  if Button = mbLeft then
+  begin
+    for d := 0 to nDomains - 1 do
+      if (d <> Domain) and ((upgrade[d, 0].Preq = preNone) or
+        (MyRO.Tech[upgrade[d, 0].Preq] >= tsApplicable)) and
+        (x >= xDomain + d * DomainPitch) and
+        (x < xDomain + d * DomainPitch + 36) and (y >= yDomain) and
+        (y < yDomain + 36) then
       begin
-      SetDomain(d);
-      Server(sCreateDevModel,me,Domain,nil^);
-      MyModel[MyRO.nModel]:=MyRO.DevModel;
-      InitMyModel(MyRO.nModel,false);
-      SmartUpdateContent;
+        SetDomain(d);
+        Server(sCreateDevModel, me, Domain, nil^);
+        MyModel[MyRO.nModel] := MyRO.DevModel;
+        InitMyModel(MyRO.nModel, false);
+        SmartUpdateContent;
       end;
 
-  if (y>=yFeature) and (y<yFeature+LinePitch*Lines) then
-    begin
-    i:=(y-yFeature) div LinePitch;
-    if (x>=xFeature-21) and (x<ClientWidth) and (ssShift in Shift) then
-      HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkFeature, code[i])
-    else if not (code[i] in AutoFeature) then
+    if (y >= yFeature) and (y < yFeature + LinePitch * Lines) then
+    begin
+      i := (y - yFeature) div LinePitch;
+      if (x >= xFeature - 21) and (x < ClientWidth) and (ssShift in Shift) then
+        HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkFeature, code[i])
+      else if not(code[i] in AutoFeature) then
       begin
-      if (code[i]<mcFirstNonCap) and (x>=xFeature-21) and (x<xFeature-21+12) then
+        if (code[i] < mcFirstNonCap) and (x >= xFeature - 21) and
+          (x < xFeature - 21 + 12) then
         begin
-        IncCap:=code[i];
-        Dump(offscreen,HGrSystem,xFeature-21,yFeature+2+LinePitch*i,12,12,182,172);
-        SmartInvalidate;
+          IncCap := code[i];
+          Dump(offscreen, HGrSystem, xFeature - 21, yFeature + 2 + LinePitch *
+            i, 12, 12, 182, 172);
+          SmartInvalidate;
         end
-      else if (x>=xFeature-9) and (x<xFeature-9+12) then
+        else if (x >= xFeature - 9) and (x < xFeature - 9 + 12) then
         begin
-        DecCap:=code[i];
-        if code[i]<mcFirstNonCap then
-          Dump(offscreen,HGrSystem,xFeature-9,yFeature+2+LinePitch*i,12,12,182,159)
-        else Dump(offscreen,HGrSystem,xFeature-9,yFeature+2+LinePitch*i,
-          12,12,182,185+13*MyRO.DevModel.Cap[code[i]]);
-        SmartInvalidate;
+          DecCap := code[i];
+          if code[i] < mcFirstNonCap then
+            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              i, 12, 12, 182, 159)
+          else
+            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              i, 12, 12, 182, 185 + 13 * MyRO.DevModel.Cap[code[i]]);
+          SmartInvalidate;
         end;
       end
@@ -488 +559 @@
   Shift: TShiftState; x, y: integer);
 var
-NewValue: integer;
-begin
-if IncCap>=0 then
-  begin
-  NewValue:=MyRO.DevModel.Cap[IncCap]+1;
-  Server(sSetDevModelCap+NewValue shl 4,me,IncCap,nil^);
-  MyModel[MyRO.nModel]:=MyRO.DevModel;
-  InitMyModel(MyRO.nModel,false);
-  SmartUpdateContent;
-  IncCap:=-1;
+  NewValue: integer;
+begin
+  if IncCap >= 0 then
+  begin
+    NewValue := MyRO.DevModel.Cap[IncCap] + 1;
+    Server(sSetDevModelCap + NewValue shl 4, me, IncCap, nil^);
+    MyModel[MyRO.nModel] := MyRO.DevModel;
+    InitMyModel(MyRO.nModel, false);
+    SmartUpdateContent;
+    IncCap := -1;
   end
-else if DecCap>=0 then
-  begin
-  if (DecCap>=mcFirstNonCap) or (MyRO.DevModel.Cap[DecCap]>0) then
-    begin
-    NewValue:=MyRO.DevModel.Cap[DecCap]-1;
-    if DecCap>=mcFirstNonCap then NewValue:=-NewValue;
-    Server(sSetDevModelCap+NewValue shl 4,me,DecCap,nil^);
-    MyModel[MyRO.nModel]:=MyRO.DevModel;
-    InitMyModel(MyRO.nModel,false);
-    end;
-  SmartUpdateContent;
-  DecCap:=-1;
+  else if DecCap >= 0 then
+  begin
+    if (DecCap >= mcFirstNonCap) or (MyRO.DevModel.Cap[DecCap] > 0) then
+    begin
+      NewValue := MyRO.DevModel.Cap[DecCap] - 1;
+      if DecCap >= mcFirstNonCap then
+        NewValue := -NewValue;
+      Server(sSetDevModelCap + NewValue shl 4, me, DecCap, nil^);
+      MyModel[MyRO.nModel] := MyRO.DevModel;
+      InitMyModel(MyRO.nModel, false);
+    end;
+    SmartUpdateContent;
+    DecCap := -1;
   end;
 end;
@@ -516 +588 @@
 procedure TDraftDlg.OKBtnClick(Sender: TObject);
 begin
-ModalResult:=mrOK;
+  ModalResult := mrOK;
 end;
 
 end.
-

trunk/LocalPlayer/Enhance.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Enhance;
 
@@ -6 +5 @@
 
 uses
-  ScreenTools,BaseWin,Protocol,ClientTools,Term,
+  ScreenTools, BaseWin, Protocol, ClientTools, Term,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
@@ -31 +30 @@
     procedure TerrClick(Sender: TObject);
     procedure JobClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   public
     procedure ShowNewContent(NewMode: integer; TerrType: integer = -1);
@@ -51 +49 @@
 procedure TEnhanceDlg.FormCreate(Sender: TObject);
 var
-TerrType: integer;
-m: TMenuItem;
-begin
-inherited;
-CaptionRight:=CloseBtn.Left;
-CaptionLeft:=ToggleBtn.Left+ToggleBtn.Width;
-InitButtons();
-HelpContext:='MACRO';
-Caption:=Phrases.Lookup('TITLE_ENHANCE');
-ToggleBtn.Hint:=Phrases.Lookup('BTN_SELECT');
-
-for TerrType:=fGrass to fMountains do if TerrType<>fJungle then
+  TerrType: integer;
+  m: TMenuItem;
+begin
+  inherited;
+  CaptionRight := CloseBtn.Left;
+  CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
+  InitButtons();
+  HelpContext := 'MACRO';
+  Caption := Phrases.Lookup('TITLE_ENHANCE');
+  ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');
+
+  for TerrType := fGrass to fMountains do
+    if TerrType <> fJungle then
+    begin
+      m := TMenuItem.Create(Popup);
+      m.RadioItem := true;
+      if TerrType = fGrass then
+        m.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
+          [Phrases.Lookup('TERRAIN', fGrass), Phrases.Lookup('TERRAIN',
+          fGrass + 12)])
+      else if TerrType = fForest then
+        m.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
+          [Phrases.Lookup('TERRAIN', fForest), Phrases.Lookup('TERRAIN',
+          fJungle)])
+      else
+        m.Caption := Phrases.Lookup('TERRAIN', TerrType);
+      m.Tag := TerrType;
+      m.OnClick := TerrClick;
+      Popup.Items.Add(m);
+    end;
+end;
+
+procedure TEnhanceDlg.FormPaint(Sender: TObject);
+var
+  i: integer;
+begin
+  inherited;
+  BtnFrame(Canvas, Rect(job1.Left, job1.Top, job7.Left + job7.Width,
+    job1.Top + job1.Height), MainTexture);
+  BtnFrame(Canvas, Rect(job3.Left, job3.Top, job9.Left + job9.Width,
+    job3.Top + job3.Height), MainTexture);
+  for i := 0 to ControlCount - 1 do
+    if Controls[i] is TButtonC then
+      BitBlt(Canvas.Handle, Controls[i].Left + 2, Controls[i].Top - 11, 8, 8,
+        GrExt[HGrSystem].Data.Canvas.Handle, 121 + Controls[i].Tag mod 7 * 9,
+        1 + Controls[i].Tag div 7 * 9, SRCCOPY);
+end;
+
+procedure TEnhanceDlg.FormShow(Sender: TObject);
+begin
+  OffscreenPaint;
+end;
+
+procedure TEnhanceDlg.ShowNewContent(NewMode, TerrType: integer);
+begin
+  if (TerrType < fGrass) or (TerrType > fMountains) then
+    Page := fGrass
+  else
+    Page := TerrType;
+  inherited ShowNewContent(NewMode);
+end;
+
+procedure TEnhanceDlg.OffscreenPaint;
+var
+  i, stage, TerrType, TileImp, x, EndStage, Cost, LastJob: integer;
+  s: string;
+  Done: Set of jNone .. jTrans;
+  TypeChanged: boolean;
+begin
+  OffscreenUser := self;
+  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  FillOffscreen(0, 0, InnerWidth, InnerHeight);
+
+  EndStage := 0;
+  while (EndStage < 5) and (MyData.EnhancementJobs[Page, EndStage] <> jNone) do
+    inc(EndStage);
+  x := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
+
+  TerrType := Page;
+  TileImp := 0;
+  Done := [];
+  Cost := 0;
+  for stage := 0 to EndStage do
   begin
-  m:=TMenuItem.Create(Popup);
-  m.RadioItem:=true;
-  if TerrType=fGrass then
-    m.Caption:=Format(Phrases.Lookup('TWOTERRAINS'),
-      [Phrases.Lookup('TERRAIN',fGrass), Phrases.Lookup('TERRAIN',fGrass+12)])
-  else if TerrType=fForest then
-    m.Caption:=Format(Phrases.Lookup('TWOTERRAINS'),
-      [Phrases.Lookup('TERRAIN',fForest), Phrases.Lookup('TERRAIN',fJungle)])
-  else m.Caption:=Phrases.Lookup('TERRAIN',TerrType);
-  m.Tag:=TerrType;
-  m.OnClick:=TerrClick;
-  Popup.Items.Add(m);
-  end;
-end;
-
-procedure TEnhanceDlg.FormPaint(Sender: TObject);
-var
-i: integer;
-begin
-inherited;
-BtnFrame(Canvas,Rect(job1.Left,job1.Top,job7.Left+job7.Width,job1.Top+job1.Height),MainTexture);
-BtnFrame(Canvas,Rect(job3.Left,job3.Top,job9.Left+job9.Width,job3.Top+job3.Height),MainTexture);
-for i:=0 to ControlCount-1 do if Controls[i] is TButtonC then
-  BitBlt(Canvas.Handle,Controls[i].Left+2,Controls[i].Top-11,8,8,
-    GrExt[HGrSystem].Data.Canvas.Handle,121+Controls[i].Tag mod 7 *9,
-    1+Controls[i].Tag div 7 *9,SRCCOPY);
-end;
-
-procedure TEnhanceDlg.FormShow(Sender: TObject);
-begin
-OffscreenPaint;
-end;
-
-procedure TEnhanceDlg.ShowNewContent(NewMode,TerrType: integer);
-begin
-if (TerrType<fGrass) or (TerrType>fMountains) then Page:=fGrass
-else Page:=TerrType;
-inherited ShowNewContent(NewMode);
-end;
-
-procedure TEnhanceDlg.OffscreenPaint;
-var
-i,stage,TerrType,TileImp,x,EndStage,Cost,LastJob: integer;
-s: string;
-Done: Set of jNone..jTrans;
-TypeChanged: boolean;
-begin
-OffscreenUser:=self;
-offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-FillOffscreen(0,0,InnerWidth,InnerHeight);
-
-EndStage:=0;
-while (EndStage<5) and (MyData.EnhancementJobs[Page,EndStage]<>jNone) do
-  inc(EndStage);
-x:=InnerWidth div 2-xxt-(xxt+3)*EndStage;
-
-TerrType:=Page;
-TileImp:=0;
-Done:=[];
-Cost:=0;
-for stage:=0 to EndStage do
-  begin
-  if stage>0 then
-    begin
-    Sprite(offscreen,HGrSystem,x-10,66,14,14,80,1);
-    case MyData.EnhancementJobs[Page,stage-1] of
-      jRoad:
-        begin
-        inc(Cost,Terrain[TerrType].MoveCost*RoadWork);
-        TileImp:=TileImp or fRoad;
-        end;
-      jRR:
-        begin
-        inc(Cost,Terrain[TerrType].MoveCost*RRWork);
-        TileImp:=TileImp or fRR;
-        end;
-      jIrr:
-        begin
-        inc(Cost,Terrain[TerrType].IrrClearWork);
-        TileImp:=TileImp and not fTerImp or tiIrrigation;
-        end;
-      jFarm:
-        begin
-        inc(Cost,Terrain[TerrType].IrrClearWork*FarmWork);
-        TileImp:=TileImp and not fTerImp or tiFarm;
-        end;
-      jMine:
-        begin
-        inc(Cost,Terrain[TerrType].MineAfforestWork);
-        TileImp:=TileImp and not fTerImp or tiMine;
-        end;
-      jClear:
-        begin
-        inc(Cost,Terrain[TerrType].IrrClearWork);
-        TerrType:=Terrain[TerrType].ClearTerrain;
-        end;
-      jAfforest:
-        begin
-        inc(Cost,Terrain[TerrType].MineAfforestWork);
-        TerrType:=Terrain[TerrType].AfforestTerrain;
-        end;
-      jTrans:
-        begin
-        inc(Cost,Terrain[TerrType].TransWork);
-        TerrType:=Terrain[TerrType].TransTerrain;
-        end;
+    if stage > 0 then
+    begin
+      Sprite(offscreen, HGrSystem, x - 10, 66, 14, 14, 80, 1);
+      case MyData.EnhancementJobs[Page, stage - 1] of
+        jRoad:
+          begin
+            inc(Cost, Terrain[TerrType].MoveCost * RoadWork);
+            TileImp := TileImp or fRoad;
+          end;
+        jRR:
+          begin
+            inc(Cost, Terrain[TerrType].MoveCost * RRWork);
+            TileImp := TileImp or fRR;
+          end;
+        jIrr:
+          begin
+            inc(Cost, Terrain[TerrType].IrrClearWork);
+            TileImp := TileImp and not fTerImp or tiIrrigation;
+          end;
+        jFarm:
+          begin
+            inc(Cost, Terrain[TerrType].IrrClearWork * FarmWork);
+            TileImp := TileImp and not fTerImp or tiFarm;
+          end;
+        jMine:
+          begin
+            inc(Cost, Terrain[TerrType].MineAfforestWork);
+            TileImp := TileImp and not fTerImp or tiMine;
+          end;
+        jClear:
+          begin
+            inc(Cost, Terrain[TerrType].IrrClearWork);
+            TerrType := Terrain[TerrType].ClearTerrain;
+          end;
+        jAfforest:
+          begin
+            inc(Cost, Terrain[TerrType].MineAfforestWork);
+            TerrType := Terrain[TerrType].AfforestTerrain;
+          end;
+        jTrans:
+          begin
+            inc(Cost, Terrain[TerrType].TransWork);
+            TerrType := Terrain[TerrType].TransTerrain;
+          end;
       end;
-    include(Done,MyData.EnhancementJobs[Page,stage-1]);
-    end;
-
-  if TerrType<fForest then
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+TerrType*(xxt*2+1),1+yyt)
-  else
-    begin
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+2*(xxt*2+1),1+yyt+2*(yyt*3+1));
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+7*(xxt*2+1),1+yyt+2*(2+TerrType-fForest)*(yyt*3+1));
-    end;
-  if TileImp and fTerImp=tiFarm then
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+(xxt*2+1),1+yyt+12*(yyt*3+1))
-  else if TileImp and fTerImp=tiIrrigation then
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1,1+yyt+12*(yyt*3+1));
-  if TileImp and fRR<>0 then
-    begin
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+6*(xxt*2+1),1+yyt+10*(yyt*3+1));
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+2*(xxt*2+1),1+yyt+10*(yyt*3+1));
+      include(Done, MyData.EnhancementJobs[Page, stage - 1]);
+    end;
+
+    if TerrType < fForest then
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + TerrType * (xxt * 2 + 1), 1 + yyt)
+    else
+    begin
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) *
+        (yyt * 3 + 1));
+    end;
+    if TileImp and fTerImp = tiFarm then
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1))
+    else if TileImp and fTerImp = tiIrrigation then
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2, 1,
+        1 + yyt + 12 * (yyt * 3 + 1));
+    if TileImp and fRR <> 0 then
+    begin
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + 6 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + 2 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
     end
-  else if TileImp and fRoad<>0 then
-    begin
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+6*(xxt*2+1),1+yyt+9*(yyt*3+1));
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+2*(xxt*2+1),1+yyt+9*(yyt*3+1));
-    end;
-  if TileImp and fTerImp=tiMine then
-    Sprite(offscreen,HGrTerrain,x,64-yyt,xxt*2,yyt*2,1+2*(xxt*2+1),1+yyt+12*(yyt*3+1));
-  inc(x,xxt*2+6)
-  end;
-
-for i:=0 to Popup.Items.Count-1 do
-  if Popup.Items[i].Tag=Page then
-    s:=Popup.Items[i].Caption;
-if Cost>0 then s:=Format(Phrases.Lookup('ENHANCE'),[s,MovementToString(Cost)]);
-LoweredTextOut(offscreen.Canvas,-1,MainTexture,
-  (InnerWidth-BiColorTextWidth(Offscreen.Canvas,s)) div 2,12,s);
-
-if EndStage>0 then LastJob:=MyData.EnhancementJobs[Page,EndStage-1]
-else LastJob:=jNone;
-if jRoad in Done then job1.ButtonIndex:=3 else job1.ButtonIndex:=2;
-if jRR in Done then job2.ButtonIndex:=3 else job2.ButtonIndex:=2;
-if jIrr in Done then job4.ButtonIndex:=3 else job4.ButtonIndex:=2;
-if jFarm in Done then job5.ButtonIndex:=3 else job5.ButtonIndex:=2;
-if jMine in Done then job7.ButtonIndex:=3 else job7.ButtonIndex:=2;
-if LastJob=jClear then job3.ButtonIndex:=3 else job3.ButtonIndex:=2;
-if LastJob=jAfforest then job6.ButtonIndex:=3 else job6.ButtonIndex:=2;
-if LastJob=jTrans then job9.ButtonIndex:=3 else job9.ButtonIndex:=2;
-
-TypeChanged:= LastJob in [jClear, jAfforest, jTrans];
-job1.Visible:=(jRoad in Done) or not TypeChanged;
-job2.Visible:=(jRR in Done) or not TypeChanged;
-job4.Visible:=(jIrr in Done) or not TypeChanged and (Terrain[TerrType].IrrEff>0);
-job5.Visible:=(jFarm in Done) or not TypeChanged and (Terrain[TerrType].IrrEff>0);
-job7.Visible:=(jMine in Done) or not TypeChanged and (Terrain[TerrType].MineEff>0);
-job3.Visible:=not TypeChanged and (Terrain[TerrType].ClearTerrain>=0)
-  and ((TerrType<>fDesert) or (MyRO.Wonder[woGardens].EffectiveOwner=me))
-  or (LastJob=jClear);
-job6.Visible:=not TypeChanged and (Terrain[TerrType].AfforestTerrain>=0)
-  or (LastJob=jAfforest);
-job9.Visible:=not TypeChanged and (Terrain[TerrType].TransTerrain>=0)
-  or (LastJob=jTrans);
-
-MarkUsedOffscreen(InnerWidth,InnerHeight);
-end; {OffscreenPaint}
+    else if TileImp and fRoad <> 0 then
+    begin
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + 6 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + 2 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
+    end;
+    if TileImp and fTerImp = tiMine then
+      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
+    inc(x, xxt * 2 + 6)
+  end;
+
+  for i := 0 to Popup.Items.Count - 1 do
+    if Popup.Items[i].Tag = Page then
+      s := Popup.Items[i].Caption;
+  if Cost > 0 then
+    s := Format(Phrases.Lookup('ENHANCE'), [s, MovementToString(Cost)]);
+  LoweredTextOut(offscreen.Canvas, -1, MainTexture,
+    (InnerWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2, 12, s);
+
+  if EndStage > 0 then
+    LastJob := MyData.EnhancementJobs[Page, EndStage - 1]
+  else
+    LastJob := jNone;
+  if jRoad in Done then
+    job1.ButtonIndex := 3
+  else
+    job1.ButtonIndex := 2;
+  if jRR in Done then
+    job2.ButtonIndex := 3
+  else
+    job2.ButtonIndex := 2;
+  if jIrr in Done then
+    job4.ButtonIndex := 3
+  else
+    job4.ButtonIndex := 2;
+  if jFarm in Done then
+    job5.ButtonIndex := 3
+  else
+    job5.ButtonIndex := 2;
+  if jMine in Done then
+    job7.ButtonIndex := 3
+  else
+    job7.ButtonIndex := 2;
+  if LastJob = jClear then
+    job3.ButtonIndex := 3
+  else
+    job3.ButtonIndex := 2;
+  if LastJob = jAfforest then
+    job6.ButtonIndex := 3
+  else
+    job6.ButtonIndex := 2;
+  if LastJob = jTrans then
+    job9.ButtonIndex := 3
+  else
+    job9.ButtonIndex := 2;
+
+  TypeChanged := LastJob in [jClear, jAfforest, jTrans];
+  job1.Visible := (jRoad in Done) or not TypeChanged;
+  job2.Visible := (jRR in Done) or not TypeChanged;
+  job4.Visible := (jIrr in Done) or not TypeChanged and
+    (Terrain[TerrType].IrrEff > 0);
+  job5.Visible := (jFarm in Done) or not TypeChanged and
+    (Terrain[TerrType].IrrEff > 0);
+  job7.Visible := (jMine in Done) or not TypeChanged and
+    (Terrain[TerrType].MineEff > 0);
+  job3.Visible := not TypeChanged and (Terrain[TerrType].ClearTerrain >= 0) and
+    ((TerrType <> fDesert) or (MyRO.Wonder[woGardens].EffectiveOwner = me)) or
+    (LastJob = jClear);
+  job6.Visible := not TypeChanged and (Terrain[TerrType].AfforestTerrain >= 0)
+    or (LastJob = jAfforest);
+  job9.Visible := not TypeChanged and (Terrain[TerrType].TransTerrain >= 0) or
+    (LastJob = jTrans);
+
+  MarkUsedOffscreen(InnerWidth, InnerHeight);
+end; { OffscreenPaint }
 
 procedure TEnhanceDlg.CloseBtnClick(Sender: TObject);
 begin
-Close
+  Close
 end;
 
 procedure TEnhanceDlg.ToggleBtnClick(Sender: TObject);
 var
-i: integer;
-begin
-for i:=0 to Popup.Items.Count-1 do
-  Popup.Items[i].Checked:= Popup.Items[i].Tag=Page;
-Popup.Popup(Left+ToggleBtn.Left, Top+ToggleBtn.Top+ToggleBtn.Height);
+  i: integer;
+begin
+  for i := 0 to Popup.Items.Count - 1 do
+    Popup.Items[i].Checked := Popup.Items[i].Tag = Page;
+  Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + ToggleBtn.Height);
 end;
 
 procedure TEnhanceDlg.TerrClick(Sender: TObject);
 begin
-Page:=TComponent(Sender).Tag;
-SmartUpdateContent
+  Page := TComponent(Sender).Tag;
+  SmartUpdateContent
 end;
 
 procedure TEnhanceDlg.JobClick(Sender: TObject);
 var
-stage, NewJob: integer;
-Done: Set of jNone..jTrans;
+  stage, NewJob: integer;
+  Done: Set of jNone .. jTrans;
 
   procedure RemoveJob(j: integer);
   begin // remove job
-  stage:=0;
-  while (stage<5) and (MyData.EnhancementJobs[Page,stage]<>jNone) do
-    begin
-    if (MyData.EnhancementJobs[Page,stage]=j) or (j=jRoad)
-      and (MyData.EnhancementJobs[Page,stage]=jRR)
-      or (j=jIrr) and (MyData.EnhancementJobs[Page,stage]=jFarm) then
+    stage := 0;
+    while (stage < 5) and (MyData.EnhancementJobs[Page, stage] <> jNone) do
+    begin
+      if (MyData.EnhancementJobs[Page, stage] = j) or (j = jRoad) and
+        (MyData.EnhancementJobs[Page, stage] = jRR) or (j = jIrr) and
+        (MyData.EnhancementJobs[Page, stage] = jFarm) then
       begin
-      if stage<4 then
-        move(MyData.EnhancementJobs[Page,stage+1],
-          MyData.EnhancementJobs[Page,stage],4-stage);
-      MyData.EnhancementJobs[Page,4]:=jNone
+        if stage < 4 then
+          move(MyData.EnhancementJobs[Page, stage + 1],
+            MyData.EnhancementJobs[Page, stage], 4 - stage);
+        MyData.EnhancementJobs[Page, 4] := jNone
       end
-    else inc(stage);
-    end;
-  end;
-
-begin
-NewJob:=TButtonC(Sender).Tag;
-Done:=[];
-stage:=0;
-while (stage<5) and (MyData.EnhancementJobs[Page,stage]<>jNone) do
+      else
+        inc(stage);
+    end;
+  end;
+
+begin
+  NewJob := TButtonC(Sender).Tag;
+  Done := [];
+  stage := 0;
+  while (stage < 5) and (MyData.EnhancementJobs[Page, stage] <> jNone) do
   begin
-  include(Done, MyData.EnhancementJobs[Page,stage]);
-  inc(stage);
-  end;
-if NewJob in Done then RemoveJob(NewJob)
-else
+    include(Done, MyData.EnhancementJobs[Page, stage]);
+    inc(stage);
+  end;
+  if NewJob in Done then
+    RemoveJob(NewJob)
+  else
   begin // add job
-  if NewJob in [jMine,jAfforest] then RemoveJob(jIrr);
-  if NewJob in [jIrr,jFarm,jTrans] then RemoveJob(jMine);
-  if (NewJob=jRR) and not (jRoad in Done) then
-    begin MyData.EnhancementJobs[Page,stage]:=jRoad; inc(stage) end;
-  if (NewJob=jFarm) and not (jIrr in Done) then
-    begin MyData.EnhancementJobs[Page,stage]:=jIrr; inc(stage) end;
-  MyData.EnhancementJobs[Page,stage]:=NewJob
-  end;
-SmartUpdateContent
+    if NewJob in [jMine, jAfforest] then
+      RemoveJob(jIrr);
+    if NewJob in [jIrr, jFarm, jTrans] then
+      RemoveJob(jMine);
+    if (NewJob = jRR) and not(jRoad in Done) then
+    begin
+      MyData.EnhancementJobs[Page, stage] := jRoad;
+      inc(stage)
+    end;
+    if (NewJob = jFarm) and not(jIrr in Done) then
+    begin
+      MyData.EnhancementJobs[Page, stage] := jIrr;
+      inc(stage)
+    end;
+    MyData.EnhancementJobs[Page, stage] := NewJob
+  end;
+  SmartUpdateContent
 end;
 
@@ -304 +362 @@
   Shift: TShiftState);
 begin
-if Key=VK_ESCAPE then Close
-else if Key=VK_F1 then
-  HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText, HelpDlg.TextIndex('MACRO'))
+  if Key = VK_ESCAPE then
+    Close
+  else if Key = VK_F1 then
+    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+      HelpDlg.TextIndex('MACRO'))
 end;
 
 end.
-

trunk/LocalPlayer/Help.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Help;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ScreenTools,BaseWin,StringTables,
+  Protocol, ScreenTools, BaseWin, StringTables,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
@@ -12 +11 @@
 
 const
-MaxHist=16;
-
-{link categories}
-hkNoLink=0;hkAdv=1;hkImp=2;hkTer=3;hkFeature=4;hkInternet=5;hkModel=6;hkMisc=7;
-hkCrossLink=$40;
-hkText=$80;
-
-liInvalid=$3FFF; // link index indicates invalid link
-
-{link indices for category hkMisc}
-miscMain=0; miscCredits=1; miscGovList=2; miscJobList=3; miscSearchResult=7;
-
-fJungle=8; // pseudo terrain
-
+  MaxHist = 16;
+
+  { link categories }
+  hkNoLink = 0;
+  hkAdv = 1;
+  hkImp = 2;
+  hkTer = 3;
+  hkFeature = 4;
+  hkInternet = 5;
+  hkModel = 6;
+  hkMisc = 7;
+  hkCrossLink = $40;
+  hkText = $80;
+
+  liInvalid = $3FFF; // link index indicates invalid link
+
+  { link indices for category hkMisc }
+  miscMain = 0;
+  miscCredits = 1;
+  miscGovList = 2;
+  miscJobList = 3;
+  miscSearchResult = 7;
+
+  fJungle = 8; // pseudo terrain
 
 type
-  THyperText=class(TStringList)
-    procedure AddLine(s: String =''; Format: integer =0; Picpix: integer =0;
-      LinkCategory: integer =0; LinkIndex: integer =0);
+  THyperText = class(TStringList)
+    procedure AddLine(s: String = ''; Format: integer = 0; Picpix: integer = 0;
+      LinkCategory: integer = 0; LinkIndex: integer = 0);
     procedure LF;
-    end;
+  end;
 
   THelpDlg = class(TFramedDlg)
@@ -39 +48 @@
     TopBtn: TButtonB;
     SearchBtn: TButtonB;
-    procedure FormCreate(Sender:TObject);
-    procedure FormDestroy(Sender:TObject);
-    procedure FormPaint(Sender:TObject);
-    procedure CloseBtnClick(Sender:TObject);
-    procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState; x,
-      y: integer);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure FormPaint(Sender: TObject);
+    procedure CloseBtnClick(Sender: TObject);
+    procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
+      x, y: integer);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; x, y: integer);
@@ -50 +59 @@
     procedure TopBtnClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure SearchBtnClick(Sender: TObject);
   public
     Difficulty: integer;
-    procedure ShowNewContent(NewMode,Category,Index: integer);
+    procedure ShowNewContent(NewMode, Category, Index: integer);
     procedure ClearHistory;
     function TextIndex(Item: string): integer;
@@ -61 +69 @@
     procedure OffscreenPaint; override;
   private
-    Kind,no,Sel,nHist,CaptionColor: integer;
-    hADVHELP, hIMPHELP, hFEATUREHELP, hGOVHELP, hSPECIALMODEL, hJOBHELP: integer;
+    Kind, no, Sel, nHist, CaptionColor: integer;
+    hADVHELP, hIMPHELP, hFEATUREHELP, hGOVHELP, hSPECIALMODEL,
+      hJOBHELP: integer;
     SearchContent, NewSearchContent: string;
     CaptionFont: TFont;
     MainText, SearchResult: THyperText;
     HelpText: TStringTable;
-    ExtPic,TerrIcon: TBitmap;
-    sb:TPVScrollbar;
-    x0: array[-2..18] of integer;
-    HistKind: array[0..MaxHist-1] of integer;
-    HistNo: array[0..MaxHist-1] of integer;
-    HistPos: array[0..MaxHist-1] of integer;
-    HistSearchContent: array[0..MaxHist-1] of shortstring;
+    ExtPic, TerrIcon: TBitmap;
+    sb: TPVScrollbar;
+    x0: array [-2 .. 18] of integer;
+    HistKind: array [0 .. MaxHist - 1] of integer;
+    HistNo: array [0 .. MaxHist - 1] of integer;
+    HistPos: array [0 .. MaxHist - 1] of integer;
+    HistSearchContent: array [0 .. MaxHist - 1] of shortstring;
     procedure line(ca: TCanvas; i: integer; lit: boolean);
     procedure Prepare(sbPos: integer = 0);
-    procedure WaterSign(x0,y0,iix: integer);
+    procedure WaterSign(x0, y0, iix: integer);
     procedure Search(SearchString: string);
-    procedure OnScroll(var m:TMessage); message WM_VSCROLL;
-    procedure OnMouseWheel(var m:TMessage); message WM_MOUSEWHEEL;
-    procedure OnMouseLeave(var Msg:TMessage); message CM_MOUSELEAVE;
+    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
+    procedure OnMouseWheel(var m: TMessage); message WM_MOUSEWHEEL;
+    procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   end;
 
@@ -89 +98 @@
 
 uses
-Directories,ClientTools,Term,Tribes,ShellAPI, Inp,Messg;
+  Directories, ClientTools, Term, Tribes, ShellAPI, Inp, Messg;
 
 {$R *.DFM}
 
 type
-THelpLineInfo=packed record
-  Format, Picpix: Byte;
-  Link: Word;
+  THelpLineInfo = packed record
+    Format, Picpix: Byte;
+    Link: Word;
   end;
 
@@ -102 +111 @@
   LinkCategory: integer; LinkIndex: integer);
 var
-HelpLineInfo: THelpLineInfo;
+  HelpLineInfo: THelpLineInfo;
 begin
-if LinkIndex<0 then LinkIndex:=liInvalid;
-HelpLineInfo.Format:=Format;
-HelpLineInfo.Picpix:=Picpix;
-HelpLineInfo.Link:=LinkCategory shl 8+LinkIndex;
-AddObject(s,TObject(HelpLineInfo));
+  if LinkIndex < 0 then
+    LinkIndex := liInvalid;
+  HelpLineInfo.Format := Format;
+  HelpLineInfo.Picpix := Picpix;
+  HelpLineInfo.Link := LinkCategory shl 8 + LinkIndex;
+  AddObject(s, TObject(HelpLineInfo));
 end;
 
 procedure THyperText.LF;
 begin
-AddLine;
+  AddLine;
 end;
 
-
 const
-{text formats}
-pkNormal=0;pkCaption=1;pkSmallIcon=2;pkBigIcon=3;pkAdvIcon=4;pkTer=5;
-pkBigTer=6;pkFeature=7;pkDot=8;pkNormal_Dot=9;pkDomain=10;pkSection=11;
-pkBigFeature=12;pkExp=13;pkAITStat=14;pkExternal=15;pkModel=16;pkNormal_64=17;
-pkIllu=18;pkLogo=19;pkTerImp=20;pkRightIcon=21;pkAdvIcon_AsPreq=22;
-pkSmallIcon_AsPreq=23;pkSpecialIcon=24;pkGov=25;
-
-nSeeAlso=14;
-SeeAlso: array[0..nSeeAlso-1] of record Kind,no,SeeKind,SeeNo: integer end=
-((Kind:hkImp;no:imWalls;SeeKind:hkFeature;SeeNo:mcArtillery),
-(Kind:hkImp;no:imHydro;SeeKind:hkImp;SeeNo:woHoover),
-(Kind:hkImp;no:imWalls;SeeKind:hkImp;SeeNo:imGrWall),
-(Kind:hkImp;no:imHighways;SeeKind:hkAdv;SeeNo:adWheel),
-(Kind:hkImp;no:imCathedral;SeeKind:hkImp;SeeNo:woBach),
-(Kind:hkImp;no:imBank;SeeKind:hkImp;SeeNo:imStockEx),
-(Kind:hkImp;no:imShipComp;SeeKind:hkImp;SeeNo:imSpacePort),
-(Kind:hkImp;no:imShipPow;SeeKind:hkImp;SeeNo:imSpacePort),
-(Kind:hkImp;no:imShipHab;SeeKind:hkImp;SeeNo:imSpacePort),
-(Kind:hkFeature;no:mcSub;SeeKind:hkFeature;SeeNo:mcRadar),
-(Kind:hkFeature;no:mcDefense;SeeKind:hkAdv;SeeNo:adSteel),
-(Kind:hkFeature;no:mcSE;SeeKind:hkFeature;SeeNo:mcNP),
-(Kind:hkAdv;no:adWheel;SeeKind:hkImp;SeeNo:imHighways),
-(Kind:hkAdv;no:adSteel;SeeKind:hkFeature;SeeNo:mcDefense));
-
-nTerrainHelp=14;
-TerrainHelp: array[0..nTerrainHelp-1] of integer=
-(fGrass,fGrass+12,fPrairie,fForest,fJungle,fHills,fMountains,fSwamp,fTundra,fArctic,
-fDesert,3*12{DeadLands},fShore,fOcean);
-
-nJobHelp=8;
-JobHelp: array[0..nJobHelp-1] of integer=
-  (jRoad,jRR,jCanal,jIrr,jFarm,jMine,jFort,jBase);
-
-
-procedure THelpDlg.FormCreate(Sender:TObject);
+  { text formats }
+  pkNormal = 0;
+  pkCaption = 1;
+  pkSmallIcon = 2;
+  pkBigIcon = 3;
+  pkAdvIcon = 4;
+  pkTer = 5;
+  pkBigTer = 6;
+  pkFeature = 7;
+  pkDot = 8;
+  pkNormal_Dot = 9;
+  pkDomain = 10;
+  pkSection = 11;
+  pkBigFeature = 12;
+  pkExp = 13;
+  pkAITStat = 14;
+  pkExternal = 15;
+  pkModel = 16;
+  pkNormal_64 = 17;
+  pkIllu = 18;
+  pkLogo = 19;
+  pkTerImp = 20;
+  pkRightIcon = 21;
+  pkAdvIcon_AsPreq = 22;
+  pkSmallIcon_AsPreq = 23;
+  pkSpecialIcon = 24;
+  pkGov = 25;
+
+  nSeeAlso = 14;
+  SeeAlso: array [0 .. nSeeAlso - 1] of record Kind, no, SeeKind,
+    SeeNo: integer end = ((Kind: hkImp; no: imWalls; SeeKind: hkFeature;
+    SeeNo: mcArtillery), (Kind: hkImp; no: imHydro; SeeKind: hkImp;
+    SeeNo: woHoover), (Kind: hkImp; no: imWalls; SeeKind: hkImp;
+    SeeNo: imGrWall), (Kind: hkImp; no: imHighways; SeeKind: hkAdv;
+    SeeNo: adWheel), (Kind: hkImp; no: imCathedral; SeeKind: hkImp;
+    SeeNo: woBach), (Kind: hkImp; no: imBank; SeeKind: hkImp; SeeNo: imStockEx),
+    (Kind: hkImp; no: imShipComp; SeeKind: hkImp; SeeNo: imSpacePort),
+    (Kind: hkImp; no: imShipPow; SeeKind: hkImp; SeeNo: imSpacePort),
+    (Kind: hkImp; no: imShipHab; SeeKind: hkImp; SeeNo: imSpacePort),
+    (Kind: hkFeature; no: mcSub; SeeKind: hkFeature; SeeNo: mcRadar),
+    (Kind: hkFeature; no: mcDefense; SeeKind: hkAdv; SeeNo: adSteel),
+    (Kind: hkFeature; no: mcSE; SeeKind: hkFeature; SeeNo: mcNP), (Kind: hkAdv;
+    no: adWheel; SeeKind: hkImp; SeeNo: imHighways), (Kind: hkAdv; no: adSteel;
+    SeeKind: hkFeature; SeeNo: mcDefense));
+
+  nTerrainHelp = 14;
+  TerrainHelp: array [0 .. nTerrainHelp - 1] of integer = (fGrass, fGrass + 12,
+    fPrairie, fForest, fJungle, fHills, fMountains, fSwamp, fTundra, fArctic,
+    fDesert, 3 * 12 { DeadLands } , fShore, fOcean);
+
+  nJobHelp = 8;
+  JobHelp: array [0 .. nJobHelp - 1] of integer = (jRoad, jRR, jCanal, jIrr,
+    jFarm, jMine, jFort, jBase);
+
+procedure THelpDlg.FormCreate(Sender: TObject);
 begin
-inherited;
-CaptionLeft:=BackBtn.Left+BackBtn.Width;
-CaptionRight:=SearchBtn.Left;
-inc(ModalFrameIndent,29);
-MainText:=THyperText.Create;
-SearchResult:=THyperText.Create;
-CreatePVSB(sb,Handle,36,551,36+432);
-
-HelpText:=TStringTable.Create;
-HelpText.LoadFromFile(LocalizedFilePath('Help\help.txt'));
-hADVHELP:=HelpText.Gethandle('ADVHELP');
-hIMPHELP:=HelpText.Gethandle('IMPHELP');
-hFEATUREHELP:=HelpText.Gethandle('FEATUREHELP');
-hGOVHELP:=HelpText.Gethandle('GOVHELP');
-hSPECIALMODEL:=HelpText.Gethandle('SPECIALMODEL');
-hJOBHELP:=HelpText.Gethandle('JOBHELP');
-
-CaptionFont:=Font.Create;
-CaptionFont.Assign(UniFont[ftNormal]);
-CaptionFont.Style:=CaptionFont.Style+[fsItalic,fsBold];
-InitButtons();
-
-TopBtn.Hint:=Phrases.Lookup('BTN_CONTENTS');
-BackBtn.Hint:=Phrases.Lookup('BTN_BACK');
-SearchBtn.Hint:=Phrases.Lookup('BTN_SEARCH');
-
-ExtPic:=TBitmap.Create;
-TerrIcon:=TBitmap.Create;
-TerrIcon.PixelFormat:=pf24bit;
-TerrIcon.Width:=xSizeBig; TerrIcon.Height:=ySizeBig;
-SearchContent:='';
-nHist:=-1;
+  inherited;
+  CaptionLeft := BackBtn.Left + BackBtn.Width;
+  CaptionRight := SearchBtn.Left;
+  inc(ModalFrameIndent, 29);
+  MainText := THyperText.Create;
+  SearchResult := THyperText.Create;
+  CreatePVSB(sb, Handle, 36, 551, 36 + 432);
+
+  HelpText := TStringTable.Create;
+  HelpText.LoadFromFile(LocalizedFilePath('Help\help.txt'));
+  hADVHELP := HelpText.Gethandle('ADVHELP');
+  hIMPHELP := HelpText.Gethandle('IMPHELP');
+  hFEATUREHELP := HelpText.Gethandle('FEATUREHELP');
+  hGOVHELP := HelpText.Gethandle('GOVHELP');
+  hSPECIALMODEL := HelpText.Gethandle('SPECIALMODEL');
+  hJOBHELP := HelpText.Gethandle('JOBHELP');
+
+  CaptionFont := Font.Create;
+  CaptionFont.Assign(UniFont[ftNormal]);
+  CaptionFont.Style := CaptionFont.Style + [fsItalic, fsBold];
+  InitButtons();
+
+  TopBtn.Hint := Phrases.Lookup('BTN_CONTENTS');
+  BackBtn.Hint := Phrases.Lookup('BTN_BACK');
+  SearchBtn.Hint := Phrases.Lookup('BTN_SEARCH');
+
+  ExtPic := TBitmap.Create;
+  TerrIcon := TBitmap.Create;
+  TerrIcon.PixelFormat := pf24bit;
+  TerrIcon.Width := xSizeBig;
+  TerrIcon.Height := ySizeBig;
+  SearchContent := '';
+  nHist := -1;
 end;
 
 procedure THelpDlg.ClearHistory;
 begin
-nHist:=-1;
+  nHist := -1;
 end;
 
-procedure THelpDlg.FormDestroy(Sender:TObject);
+procedure THelpDlg.FormDestroy(Sender: TObject);
 begin
-MainText.Free;
-SearchResult.Free;
-ExtPic.Free;
-TerrIcon.Free;
-HelpText.Free;
-//CaptionFont.Free;
+  MainText.Free;
+  SearchResult.Free;
+  ExtPic.Free;
+  TerrIcon.Free;
+  HelpText.Free;
+  // CaptionFont.Free;
 end;
 
-procedure THelpDlg.CloseBtnClick(Sender:TObject);
+procedure THelpDlg.CloseBtnClick(Sender: TObject);
 begin
-Close
+  Close
 end;
 
-procedure THelpDlg.OnScroll(var m:TMessage);
+procedure THelpDlg.OnScroll(var m: TMessage);
 begin
-if ProcessPVSB(sb,m) then
-  begin Sel:=-1; SmartUpdateContent(true) end
-end;
-
-procedure THelpDlg.OnMouseWheel(var m:TMessage);
-begin
-if ProcessMouseWheel(sb,m) then
-  begin
-  Sel:=-1;
-  SmartUpdateContent(true);
-  PaintBox1MouseMove(nil, [], m.lParam and $FFFF-Left, m.lParam shr 16-Top);
+  if ProcessPVSB(sb, m) then
+  begin
+    Sel := -1;
+    SmartUpdateContent(true)
   end
 end;
 
-procedure THelpDlg.OnMouseLeave(var Msg:TMessage);
+procedure THelpDlg.OnMouseWheel(var m: TMessage);
 begin
-if Sel<>-1 then
-  begin
-  line(Canvas,Sel,false);
-  Sel:=-1
+  if ProcessMouseWheel(sb, m) then
+  begin
+    Sel := -1;
+    SmartUpdateContent(true);
+    PaintBox1MouseMove(nil, [], m.lParam and $FFFF - Left,
+      m.lParam shr 16 - Top);
   end
 end;
 
-procedure THelpDlg.FormPaint(Sender:TObject);
+procedure THelpDlg.OnMouseLeave(var Msg: TMessage);
 begin
-inherited;
-Canvas.Font.Assign(UniFont[ftNormal]);
+  if Sel <> -1 then
+  begin
+    line(Canvas, Sel, false);
+    Sel := -1
+  end
+end;
+
+procedure THelpDlg.FormPaint(Sender: TObject);
+begin
+  inherited;
+  Canvas.Font.Assign(UniFont[ftNormal]);
 end;
 
 procedure THelpDlg.line(ca: TCanvas; i: integer; lit: boolean);
 var
-TextColor,x,y: integer;
-TextSize: TSize;
-s: string;
+  TextColor, x, y: integer;
+  TextSize: TSize;
+  s: string;
 begin
-s:=MainText[sb.si.npos+i];
-if s='' then exit;
-x:=x0[i]; y:=2+i*24;
-if ca=Canvas then
-  begin x:=x+SideFrame; y:=y+WideFrame end;
-if THelpLineInfo(MainText.Objects[sb.si.npos+i]).Format
-  in [pkCaption,pkBigTer,pkRightIcon,pkBigFeature] then
-  begin
-  ca.Font.Assign(CaptionFont);
-{  ca.brush.color:=CaptionColor;
-  ca.FillRect(rect(x,i*24,x+24,i*24+24));
-  ca.brush.color:=$FFFFFF;
-  ca.FrameRect(rect(x+1,i*24+1,x+24-1,i*24+24-1));
-  ca.Brush.Style:=bsClear;}
-  BitBlt(ca.handle,x,y-4,24,24,GrExt[HGrSystem].Data.Canvas.Handle,1,146,SRCCOPY);
-  BiColorTextOut(ca,$FFFFFF,$7F007F,x+10-ca.Textwidth(s[1]) div 2,y-3,s[1]);
-  BiColorTextOut(ca,CaptionColor,$7F007F,x+24,y-3,copy(s,2,255));
-  ca.Font.Assign(UniFont[ftNormal]);
-  end
-else if THelpLineInfo(MainText.Objects[sb.si.npos+i]).Format=pkSection then
-  begin
-  ca.Font.Assign(CaptionFont);
-  BiColorTextOut(ca,CaptionColor,$7F007F,x,y-3,s);
-  ca.Font.Assign(UniFont[ftNormal]);
-  end
-else
-  begin
-  if (Kind=hkMisc) and (no=miscMain) then
+  s := MainText[sb.si.npos + i];
+  if s = '' then
+    exit;
+  x := x0[i];
+  y := 2 + i * 24;
+  if ca = Canvas then
+  begin
+    x := x + SideFrame;
+    y := y + WideFrame
+  end;
+  if THelpLineInfo(MainText.Objects[sb.si.npos + i]).Format
+    in [pkCaption, pkBigTer, pkRightIcon, pkBigFeature] then
+  begin
     ca.Font.Assign(CaptionFont);
-  TextColor:=Colors.Canvas.Pixels[clkMisc,cliPaperText];
-  if ca=Canvas then
-    begin
-    TextSize.cx:=BiColorTextWidth(ca,s);
-    TextSize.cy:=ca.TextHeight(s);
-    if y+TextSize.cy>=WideFrame+InnerHeight then
-      TextSize.cy:=WideFrame+InnerHeight-y;
-    FillSeamless(ca,x,y,TextSize.cx,TextSize.cy,-SideFrame,sb.si.npos*24-WideFrame,
-      Paper);
-    end;
-  BiColorTextOut(ca,TextColor,$7F007F,x,y,s);
-  if lit then with ca do
-    begin
-    assert(ca=Canvas);
-    pen.color:=TextColor;
-    moveto(x+1,y+TextSize.cy-2);
-    lineto(x+TextSize.cx,y+TextSize.cy-2);
-    end;
-  if (Kind=hkMisc) and (no=miscMain) then
+    { ca.brush.color:=CaptionColor;
+      ca.FillRect(rect(x,i*24,x+24,i*24+24));
+      ca.brush.color:=$FFFFFF;
+      ca.FrameRect(rect(x+1,i*24+1,x+24-1,i*24+24-1));
+      ca.Brush.Style:=bsClear; }
+    BitBlt(ca.Handle, x, y - 4, 24, 24, GrExt[HGrSystem].Data.Canvas.Handle, 1,
+      146, SRCCOPY);
+    BiColorTextOut(ca, $FFFFFF, $7F007F, x + 10 - ca.Textwidth(s[1]) div 2,
+      y - 3, s[1]);
+    BiColorTextOut(ca, CaptionColor, $7F007F, x + 24, y - 3, copy(s, 2, 255));
     ca.Font.Assign(UniFont[ftNormal]);
   end
+  else if THelpLineInfo(MainText.Objects[sb.si.npos + i]).Format = pkSection
+  then
+  begin
+    ca.Font.Assign(CaptionFont);
+    BiColorTextOut(ca, CaptionColor, $7F007F, x, y - 3, s);
+    ca.Font.Assign(UniFont[ftNormal]);
+  end
+  else
+  begin
+    if (Kind = hkMisc) and (no = miscMain) then
+      ca.Font.Assign(CaptionFont);
+    TextColor := Colors.Canvas.Pixels[clkMisc, cliPaperText];
+    if ca = Canvas then
+    begin
+      TextSize.cx := BiColorTextWidth(ca, s);
+      TextSize.cy := ca.TextHeight(s);
+      if y + TextSize.cy >= WideFrame + InnerHeight then
+        TextSize.cy := WideFrame + InnerHeight - y;
+      FillSeamless(ca, x, y, TextSize.cx, TextSize.cy, -SideFrame,
+        sb.si.npos * 24 - WideFrame, Paper);
+    end;
+    BiColorTextOut(ca, TextColor, $7F007F, x, y, s);
+    if lit then
+      with ca do
+      begin
+        assert(ca = Canvas);
+        pen.color := TextColor;
+        moveto(x + 1, y + TextSize.cy - 2);
+        lineto(x + TextSize.cx, y + TextSize.cy - 2);
+      end;
+    if (Kind = hkMisc) and (no = miscMain) then
+      ca.Font.Assign(UniFont[ftNormal]);
+  end
 end;
 
-procedure THelpDlg.WaterSign(x0,y0,iix: integer);
+procedure THelpDlg.WaterSign(x0, y0, iix: integer);
 const
-nHeaven=28;
-maxsum=9*9*255 *75 div 100;
+  nHeaven = 28;
+  maxsum = 9 * 9 * 255 * 75 div 100;
 type
-TLine=array[0..649,0..2] of Byte;
+  TLine = array [0 .. 649, 0 .. 2] of Byte;
 var
-x,y,dx,dy,xSrc,ySrc,sum,xx: integer;
-Heaven: array[0..nHeaven] of integer;
-PaintLine,CoalLine: ^TLine;
-ImpLine: array[-1..1] of ^TLine;
+  x, y, dx, dy, xSrc, ySrc, sum, xx: integer;
+  Heaven: array [0 .. nHeaven] of integer;
+  PaintLine, CoalLine: ^TLine;
+  ImpLine: array [-1 .. 1] of ^TLine;
 begin
-// assume eiffel tower has free common heaven
-for dy:=0 to nHeaven-1 do
-  Heaven[dy]:=BigImp.Canvas.Pixels[woEiffel mod 7 *xSizeBig,
-    (SystemIconLines+woEiffel div 7)*ySizeBig+dy];
-
-xSrc:=iix mod 7 *xSizeBig;
-ySrc:=(iix div 7+1) *ySizeBig;
-for y:=0 to ySizeBig*2-1 do if (y0+y>=0) and (y0+y<InnerHeight) then
-  begin
-  PaintLine:=OffScreen.ScanLine[y0+y];
-  CoalLine:=Templates.ScanLine[yCoal+y];
-  for dy:=-1 to 1 do
-    if ((y+dy) shr 1>=0) and ((y+dy) shr 1<ySizeBig) then
-      ImpLine[dy]:=BigImp.ScanLine[ySrc+(y+dy) shr 1];
-  for x:=0 to xSizeBig*2-1 do
-    begin
-    sum:=0;
-    for dx:=-1 to 1 do
+  // assume eiffel tower has free common heaven
+  for dy := 0 to nHeaven - 1 do
+    Heaven[dy] := BigImp.Canvas.Pixels[woEiffel mod 7 * xSizeBig,
+      (SystemIconLines + woEiffel div 7) * ySizeBig + dy];
+
+  xSrc := iix mod 7 * xSizeBig;
+  ySrc := (iix div 7 + 1) * ySizeBig;
+  for y := 0 to ySizeBig * 2 - 1 do
+    if (y0 + y >= 0) and (y0 + y < InnerHeight) then
+    begin
+      PaintLine := OffScreen.ScanLine[y0 + y];
+      CoalLine := Templates.ScanLine[yCoal + y];
+      for dy := -1 to 1 do
+        if ((y + dy) shr 1 >= 0) and ((y + dy) shr 1 < ySizeBig) then
+          ImpLine[dy] := BigImp.ScanLine[ySrc + (y + dy) shr 1];
+      for x := 0 to xSizeBig * 2 - 1 do
       begin
-      xx:=xSrc+(x+dx) shr 1;
-      for dy:=-1 to 1 do
-        if ((y+dy) shr 1<0) or ((y+dy) shr 1>=ySizeBig)
-          or ((x+dx) shr 1<0) or ((x+dx) shr 1>=xSizeBig)
-          or ((y+dy) shr 1<nHeaven)
-          and (ImpLine[dy,xx,0] shl 16+ImpLine[dy,xx,1] shl 8+ImpLine[dy,xx,2]=Heaven[(y+dy) shr 1]) then
-          sum:=sum+9*255
-        else sum:=sum+ImpLine[dy,xx,0]+5*ImpLine[dy,xx,1]+3*ImpLine[dy,xx,2];
+        sum := 0;
+        for dx := -1 to 1 do
+        begin
+          xx := xSrc + (x + dx) shr 1;
+          for dy := -1 to 1 do
+            if ((y + dy) shr 1 < 0) or ((y + dy) shr 1 >= ySizeBig) or
+              ((x + dx) shr 1 < 0) or ((x + dx) shr 1 >= xSizeBig) or
+              ((y + dy) shr 1 < nHeaven) and
+              (ImpLine[dy, xx, 0] shl 16 + ImpLine[dy, xx, 1] shl 8 +
+              ImpLine[dy, xx, 2] = Heaven[(y + dy) shr 1]) then
+              sum := sum + 9 * 255
+            else
+              sum := sum + ImpLine[dy, xx, 0] + 5 * ImpLine[dy, xx, 1] + 3 *
+                ImpLine[dy, xx, 2];
+        end;
+        if sum < maxsum then
+        begin // no saturation
+          sum := 1 shl 22 - (maxsum - sum) * (256 - CoalLine[xCoal + x, 0] * 2);
+          PaintLine[x0 + x, 0] := PaintLine[x0 + x, 0] * sum shr 22;
+          PaintLine[x0 + x, 1] := PaintLine[x0 + x, 1] * sum shr 22;
+          PaintLine[x0 + x, 2] := PaintLine[x0 + x, 2] * sum shr 22;
+        end
+      end
+    end;
+end;
+
+procedure THelpDlg.OffscreenPaint;
+
+  procedure PaintTerrIcon(x, y, xSrc, ySrc: integer);
+  begin
+    Frame(OffScreen.Canvas, x - 1, y - 1, x + xSizeBig, y + ySizeBig,
+      $000000, $000000);
+    if 2 * yyt < 40 then
+    begin
+      Sprite(OffScreen, HGrTerrain, x, y, 56, 2 * yyt, xSrc, ySrc);
+      Sprite(OffScreen, HGrTerrain, x, y + 2 * yyt, 56, 40 - 2 * yyt,
+        xSrc, ySrc);
+    end
+    else
+      Sprite(OffScreen, HGrTerrain, x, y, 56, 40, xSrc, ySrc);
+    Sprite(OffScreen, HGrTerrain, x, y, xxt, yyt, xSrc + xxt, ySrc + yyt);
+    Sprite(OffScreen, HGrTerrain, x, y + yyt, xxt, 40 - yyt, xSrc + xxt, ySrc);
+    Sprite(OffScreen, HGrTerrain, x + xxt, y, 56 - xxt, yyt, xSrc, ySrc + yyt);
+    Sprite(OffScreen, HGrTerrain, x + xxt, y + yyt, 56 - xxt, 40 - yyt,
+      xSrc, ySrc);
+  end;
+
+var
+  i, j, yl, srcno, ofs, cnt, y: integer;
+  s: string;
+  HelpLineInfo: THelpLineInfo;
+begin
+  inherited;
+  CaptionColor := Colors.Canvas.Pixels[clkMisc, cliPaperCaption];
+  FillSeamless(OffScreen.Canvas, 0, 0, InnerWidth, InnerHeight, 0,
+    sb.si.npos * 24, Paper);
+  with OffScreen.Canvas do
+  begin
+    Font.Assign(UniFont[ftNormal]);
+    for i := -sb.si.npos to InnerHeight div 24 do
+      if sb.si.npos + i < MainText.Count then
+      begin
+        HelpLineInfo := THelpLineInfo(MainText.Objects[sb.si.npos + i]);
+        if HelpLineInfo.Format = pkExternal then
+        begin
+          yl := ExtPic.Height;
+          if 4 + i * 24 + yl > InnerHeight then
+            yl := InnerHeight - (4 + i * 24);
+          BitBlt(Handle, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas.Handle,
+            0, 0, SRCCOPY);
+        end
       end;
-    if sum<maxsum then
-      begin // no saturation
-      sum:=1 shl 22 - (maxsum-sum)*(256-CoalLine[xCoal+x,0]*2);
-      PaintLine[x0+x,0]:=PaintLine[x0+x,0]*sum shr 22;
-      PaintLine[x0+x,1]:=PaintLine[x0+x,1]*sum shr 22;
-      PaintLine[x0+x,2]:=PaintLine[x0+x,2]*sum shr 22;
+    for i := -2 to InnerHeight div 24 do
+      if (sb.si.npos + i >= 0) and (sb.si.npos + i < MainText.Count) then
+      begin
+        HelpLineInfo := THelpLineInfo(MainText.Objects[sb.si.npos + i]);
+        if HelpLineInfo.Link <> 0 then
+        begin
+          if (Kind = hkMisc) and (no = miscSearchResult) then
+            Sprite(OffScreen, HGrSystem, 18, 9 + i * 24, 8, 8, 90, 16)
+          else if HelpLineInfo.Format in [pkSmallIcon_AsPreq, pkAdvIcon_AsPreq]
+          then
+            Sprite(OffScreen, HGrSystem, 12, i * 24 + 5, 14, 14, 65, 20)
+          else if HelpLineInfo.Link and (hkCrossLink shl 8) <> 0 then
+            Sprite(OffScreen, HGrSystem, 12, i * 24 + 5, 14, 14, 80, 1)
+          else if not((Kind = hkMisc) and (no = miscMain)) then
+            Sprite(OffScreen, HGrSystem, 10, i * 24 + 6, 14, 14, 65, 1);
+          x0[i] := 24;
+        end
+        else
+          x0[i] := 0;
+        case HelpLineInfo.Format of
+          pkLogo:
+            begin
+              Server(sGetVersion, 0, 0, j);
+              s := Format('%d.%d.%d', [j shr 16 and $FF, j shr 8 and $FF,
+                j and $FF]);
+              PaintLogo(OffScreen.Canvas, (InnerWidth - 122) div 2, i * 24 + 1,
+                GrExt[HGrSystem].Data.Canvas.Pixels[95, 1], $000000);
+              Font.Assign(UniFont[ftSmall]);
+              BiColorTextOut(OffScreen.Canvas, $000000, $7F007F,
+                (InnerWidth - Textwidth(s)) div 2, i * 24 + 26, s);
+              Font.Assign(UniFont[ftNormal]);
+            end;
+          pkSmallIcon, pkSmallIcon_AsPreq:
+            begin
+              Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
+                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
+              if HelpLineInfo.Picpix = imPalace then
+                BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+                  0 * xSizeSmall, 1 * ySizeSmall, SRCCOPY)
+              else
+                BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+                  HelpLineInfo.Picpix mod 7 * xSizeSmall,
+                  (HelpLineInfo.Picpix + SystemIconLines * 7) div 7 *
+                  ySizeSmall, SRCCOPY);
+              x0[i] := x0[i] + (8 + 8 + 36);
+            end;
+          pkBigIcon:
+            begin
+              FrameImage(OffScreen.Canvas, BigImp, x0[i] + 12, i * 24 - 7, 56,
+                40, HelpLineInfo.Picpix mod 7 * xSizeBig,
+                HelpLineInfo.Picpix div 7 * ySizeBig);
+              x0[i] := 64 + 8 + 8 + x0[i];
+            end;
+          pkSpecialIcon:
+            begin
+              case HelpLineInfo.Picpix of
+                0:
+                  FrameImage(OffScreen.Canvas, GrExt[HGrSystem2].Data,
+                    12 + x0[i], -7 + i * 24, 56, 40, 137, 127);
+                1:
+                  begin
+                    PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                      1 + 3 * (xxt * 2 + 1), 1 + yyt);
+                    if 2 * yyt < 40 then
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                        56, 2 * yyt, 1 + 3 * (xxt * 2 + 1) + xxt - 28,
+                        1 + yyt + 1 * (yyt * 3 + 1))
+                    else
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[i],
+                        -7 + 4 + i * 24 - 4, 56, 40, 1 + 3 * (xxt * 2 + 1) + xxt
+                        - 28, 1 + yyt + 1 * (yyt * 3 + 1) + yyt - 20);
+                  end;
+                2:
+                  begin
+                    PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                      1 + 7 * (xxt * 2 + 1), 1 + yyt + 4 * (yyt * 3 + 1));
+                    if 2 * yyt < 40 then
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                        56, 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
+                        1 + yyt + 12 * (yyt * 3 + 1) + yyt - 16)
+                    else
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                        56, 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
+                        1 + yyt + 12 * (yyt * 3 + 1) + yyt - 16)
+                  end;
+              end;
+              x0[i] := 64 + 8 + 8 + x0[i];
+            end;
+          pkDomain:
+            begin
+              Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
+                8 + 36 + x0[i], 2 + 20 + i * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
+                75 + HelpLineInfo.Picpix * 37, 295);
+              x0[i] := x0[i] + (8 + 8 + 36);
+            end;
+          pkAdvIcon, pkAdvIcon_AsPreq:
+            begin
+              Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
+                8 + xSizeSmall + x0[i], 2 + ySizeSmall + i * 24,
+                $000000, $000000);
+              if AdvIcon[HelpLineInfo.Picpix] < 84 then
+                BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+                  (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines * 7) mod 7 *
+                  xSizeSmall, (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines *
+                  7) div 7 * ySizeSmall, SRCCOPY)
+              else
+                Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
+                  1 + (AdvIcon[HelpLineInfo.Picpix] - 84) mod 8 * 37,
+                  295 + (AdvIcon[HelpLineInfo.Picpix] - 84) div 8 * 21);
+              j := AdvValue[HelpLineInfo.Picpix] div 1000;
+              BitBlt(Handle, x0[i] + 4, 4 + i * 24, 14, 14,
+                GrExt[HGrSystem].Mask.Canvas.Handle, 127 + j * 15, 85, SRCAND);
+              Sprite(OffScreen, HGrSystem, x0[i] + 3, 3 + i * 24, 14, 14,
+                127 + j * 15, 85);
+              x0[i] := x0[i] + (8 + 8 + 36);
+            end;
+          pkRightIcon:
+            begin
+              if Imp[HelpLineInfo.Picpix].Kind <> ikWonder then
+                ImpImage(OffScreen.Canvas, InnerWidth - (40 + xSizeBig), i * 24,
+                  HelpLineInfo.Picpix, gDespotism)
+              else
+                WaterSign(InnerWidth - (40 + 2 * xSizeBig), i * 24 - 8,
+                  HelpLineInfo.Picpix + 7);
+              x0[i] := x0[i] + 8;
+            end;
+          pkIllu:
+            WaterSign(8, i * 24 - 8, HelpLineInfo.Picpix);
+          pkBigFeature:
+            begin
+              cnt := 0;
+              for j := nDomains - 1 downto 0 do
+                if 1 shl j and Feature[HelpLineInfo.Picpix].Domains <> 0 then
+                begin
+                  inc(cnt);
+                  Dump(OffScreen, HGrSystem, InnerWidth - 38 - 38 * cnt,
+                    i * 24 + 1, 36, 20, 75 + j * 37, 295);
+                  Frame(OffScreen.Canvas, InnerWidth - 39 - 38 * cnt, i * 24,
+                    InnerWidth - 2 - 38 * cnt, i * 24 + 21, $000000, $000000);
+                end;
+              DarkGradient(OffScreen.Canvas, InnerWidth - 38 - 38 * cnt,
+                i * 24 + 23, cnt * 38 - 2, 1);
+              ofs := InnerWidth - (39 + 7) - 19 * cnt;
+              with OffScreen.Canvas do
+              begin
+                Brush.color := $C0C0C0;
+                FrameRect(Rect(ofs, 1 + 23 + i * 24, ofs + 14,
+                  15 + 23 + i * 24));
+                Brush.Style := bsClear;
+                Sprite(OffScreen, HGrSystem, ofs + 2, 3 + 23 + i * 24, 10, 10,
+                  66 + HelpLineInfo.Picpix mod 11 * 11,
+                  137 + HelpLineInfo.Picpix div 11 * 11);
+              end;
+              x0[i] := x0[i] + 8;
+            end;
+          pkTer, pkBigTer:
+            begin
+              if HelpLineInfo.Format = pkBigTer then
+                y := i * 24 - 3 + yyt
+              else
+                y := i * 24 + 13;
+              if HelpLineInfo.Picpix >= 3 * 12 then
+                srcno := 2 * 9 + 6
+              else if HelpLineInfo.Picpix mod 12 = fJungle then
+                srcno := 18 * 9
+              else if HelpLineInfo.Picpix mod 12 < fJungle then
+                srcno := HelpLineInfo.Picpix mod 12
+              else
+                srcno := 27 + (HelpLineInfo.Picpix mod 12 - 9) * 18;
+              if HelpLineInfo.Format = pkTer then
+              begin
+                ofs := x0[i] + 8;
+                x0[i] := 2 * xxt + 8 + ofs;
+              end
+              else
+              begin
+                ofs := InnerWidth - (2 * xxt + 38);
+                x0[i] := x0[i] + 8;
+              end;
+              if srcno >= fJungle then
+              begin
+                Sprite(OffScreen, HGrTerrain, ofs + 4, y - yyt + 2, xxt * 2 - 8,
+                  yyt * 2 - 4, 5 + 2 * (xxt * 2 + 1),
+                  3 + yyt + 2 * (yyt * 3 + 1));
+                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                  yyt * 3 - 2, 1 + srcno mod 9 * (xxt * 2 + 1),
+                  1 + srcno div 9 * (yyt * 3 + 1));
+              end
+              else
+                Sprite(OffScreen, HGrTerrain, ofs + 4, y - yyt + 2, xxt * 2 - 8,
+                  yyt * 2 - 4, 5 + srcno mod 9 * (xxt * 2 + 1),
+                  3 + yyt + srcno div 9 * (yyt * 3 + 1));
+              if HelpLineInfo.Picpix >= 3 * 12 then { rare resource }
+                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                  yyt * 3, 1 + 8 * (xxt * 2 + 1),
+                  1 + (HelpLineInfo.Picpix - 2 * 12) * (yyt * 3 + 1))
+              else if HelpLineInfo.Picpix >= 12 then { special tile }
+              begin
+                if HelpLineInfo.Picpix mod 12 = fJungle then
+                  srcno := 17 * 9 + 8
+                else if HelpLineInfo.Picpix mod 12 < fJungle then
+                  srcno := HelpLineInfo.Picpix mod 12
+                else
+                  srcno := 18 + 8 + (HelpLineInfo.Picpix mod 12 - 9) * 18;
+                srcno := srcno + HelpLineInfo.Picpix div 12 * 9;
+                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                  yyt * 3, 1 + srcno mod 9 * (xxt * 2 + 1),
+                  1 + srcno div 9 * (yyt * 3 + 1));
+              end;
+            end;
+          pkTerImp:
+            begin
+              ofs := 8;
+              if HelpLineInfo.Picpix = 5 then
+              begin // display mine on hills
+                Sprite(OffScreen, HGrTerrain, ofs + 4, i * 24 + 13 - yyt,
+                  xxt * 2 - 8, yyt * 2 - 4, 5 + 2 * (xxt * 2 + 1),
+                  3 + yyt + 2 * (yyt * 3 + 1));
+                srcno := 45
+              end
+              else
+                srcno := fPrairie; // display on prairie
+              Sprite(OffScreen, HGrTerrain, ofs + 4, i * 24 + 13 - yyt,
+                xxt * 2 - 8, yyt * 2 - 4, 5 + srcno mod 9 * (xxt * 2 + 1),
+                3 + yyt + srcno div 9 * (yyt * 3 + 1));
+              if HelpLineInfo.Picpix = 12 then { river }
+                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - yyt, xxt * 2,
+                  yyt * 2, 1 + 5 * (xxt * 2 + 1), 1 + yyt + 13 * (yyt * 3 + 1))
+              else if HelpLineInfo.Picpix >= 3 then { improvement 2 }
+              begin
+                if HelpLineInfo.Picpix = 6 then
+                  Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                    xxt * 2, yyt * 3, 1 + 7 * (xxt * 2 + 1),
+                    1 + 12 * (yyt * 3 + 1));
+                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                  xxt * 2, yyt * 3, 1 + (HelpLineInfo.Picpix - 3) *
+                  (xxt * 2 + 1), 1 + 12 * (yyt * 3 + 1))
+              end
+              else { improvement 1 }
+              begin
+                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                  xxt * 2, yyt * 3, 1 + 2 * (xxt * 2 + 1),
+                  1 + (9 + HelpLineInfo.Picpix) * (yyt * 3 + 1));
+                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                  xxt * 2, yyt * 3, 1 + 5 * (xxt * 2 + 1),
+                  1 + (9 + HelpLineInfo.Picpix) * (yyt * 3 + 1))
+              end;
+              x0[i] := x0[i] + 8;
+            end;
+          pkModel:
+            begin
+              FrameImage(OffScreen.Canvas, BigImp, x0[i] + 12, i * 24 - 7,
+                56, 40, 0, 0);
+              Sprite(OffScreen, HGrStdUnits, x0[i] + 8, i * 24 - 11, 64, 44,
+                1 + HelpLineInfo.Picpix mod 10 * 65,
+                1 + HelpLineInfo.Picpix div 10 * 49);
+              x0[i] := 64 + 8 + 8 + x0[i];
+            end;
+          pkFeature:
+            begin
+              DarkGradient(OffScreen.Canvas, x0[i] + 8 - 1,
+                7 + i * 24 - 3, 16, 1);
+              Frame(OffScreen.Canvas, x0[i] + 8, 7 + i * 24 - 2, x0[i] + 8 + 13,
+                7 + i * 24 - 2 + 13, $C0C0C0, $C0C0C0);
+              Sprite(OffScreen, HGrSystem, x0[i] + 8 + 2, 7 + i * 24, 10, 10,
+                66 + HelpLineInfo.Picpix mod 11 * 11,
+                137 + HelpLineInfo.Picpix div 11 * 11);
+              x0[i] := x0[i] + 8 + 8 + 2 + 13;
+            end;
+          pkExp:
+            begin
+              Frame(OffScreen.Canvas, 20 - 1, 8 - 4 + i * 24, 20 + 12,
+                8 + 11 + i * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 20, 8 - 3 + i * 24, 12, 14,
+                121 + HelpLineInfo.Picpix * 13, 28);
+              x0[i] := 20 + 8 + 11;
+            end;
+          pkAITStat:
+            begin
+              Sprite(OffScreen, HGrSystem, 20, 6 + i * 24, 14, 14,
+                1 + HelpLineInfo.Picpix * 15, 316);
+              x0[i] := 20 + 8 + 11;
+            end;
+          pkGov:
+            begin
+              Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
+                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
+              BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24, xSizeSmall,
+                ySizeSmall, SmallImp.Canvas.Handle, (HelpLineInfo.Picpix - 1) *
+                xSizeSmall, ySizeSmall, SRCCOPY);
+              x0[i] := x0[i] + (8 + 8 + 36);
+            end;
+          pkDot:
+            begin
+              Sprite(OffScreen, HGrSystem, x0[i] + 18, 9 + i * 24, 8,
+                8, 81, 16);
+              x0[i] := 20 + 8 + 4;
+            end;
+          pkNormal_Dot:
+            x0[i] := 20 + 8 + 4;
+          pkNormal_64:
+            x0[i] := 64 + 8 + 8;
+        else
+          x0[i] := x0[i] + 8
+        end;
+        line(OffScreen.Canvas, i, false)
+      end
+  end;
+  MarkUsedOffscreen(InnerWidth, InnerHeight + 13 + 48);
+end; { OffscreenPaint }
+
+procedure THelpDlg.Prepare(sbPos: integer = 0);
+var
+  i, j, special, Domain, Headline, TerrType, TerrSubType: integer;
+  s: string;
+  ps: pchar;
+  List: THyperText;
+  CheckSeeAlso: boolean;
+
+  procedure AddAdv(i: integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon, i,
+      hkAdv + hkCrossLink, i);
+  end;
+
+  procedure AddPreqAdv(i: integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon_AsPreq, i,
+      hkAdv + hkCrossLink, i);
+  end;
+
+  procedure AddImp(i: integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
+      hkImp + hkCrossLink, i);
+  end;
+
+  procedure AddPreqImp(i: integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon_AsPreq, i,
+      hkImp + hkCrossLink, i);
+  end;
+
+  procedure AddTer(i: integer);
+  begin
+    if MainText.Count > 1 then
+    begin
+      MainText.LF;
+    end;
+    MainText.AddLine(Phrases.Lookup('TERRAIN', i), pkTer, i, hkTer, i);
+  end;
+
+  procedure AddFeature(i: integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('FEATURES', i), pkFeature, i,
+      hkFeature + hkCrossLink, i);
+  end;
+
+  procedure AddModel(i: integer);
+  var
+    pix: integer;
+    Name: string;
+  begin
+    if MainText.Count > 1 then
+      MainText.LF;
+    FindStdModelPicture(SpecialModelPictureCode[i], pix, Name);
+    MainText.AddLine(Name, pkModel, pix, hkModel + hkCrossLink, i)
+  end;
+
+  procedure AddStandardBlock(Item: string);
+  var
+    i: integer;
+  begin
+    with MainText do
+    begin
+      if Item = 'LOGO' then
+      begin
+        AddLine('', pkLogo);
+        LF;
+      end
+      else if Item = 'TECHFORMULA' then
+      begin
+        i := Difficulty;
+        if i = 0 then
+          i := 2;
+        AddLine(Format(HelpText.Lookup('TECHFORMULA'), [TechFormula_M[i],
+          TechFormula_D[i]]))
+      end
+      else if Item = 'EXPERIENCE' then
+        for i := 0 to nExp - 1 do
+          AddLine(Phrases.Lookup('EXPERIENCE', i), pkExp, i)
+      else if Item = 'MODERN' then
+        for i := 1 to 3 do
+        begin
+          LF;
+          AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + i), pkTer, 3 * 12 + i);
+        end
+      else if Item = 'SAVED' then
+        AddLine(DataDir + 'Saved', pkNormal)
+      else if Item = 'AITSTAT' then
+        for i := 0 to 3 do
+          AddLine(Phrases2.Lookup('AITSTAT', i), pkAITStat, i)
+    end
+  end;
+
+  procedure DecodeItem(s: string; var Category, Index: integer);
+  var
+    i: integer;
+  begin
+    if (length(s) > 0) and (s[1] = ':') then
+    begin
+      Category := hkMisc;
+      Index := 0;
+      for i := 3 to length(s) do
+        Index := Index * 10 + ord(s[i]) - 48;
+      case s[2] of
+        'A':
+          Category := hkAdv;
+        'B':
+          Category := hkImp;
+        'T':
+          Category := hkTer;
+        'F':
+          Category := hkFeature;
+        'E':
+          Category := hkInternet;
+        'S':
+          Category := hkModel;
+        'C':
+          Index := miscCredits;
+        'J':
+          Index := miscJobList;
+        'G':
+          Index := miscGovList;
+      end;
+      if (Category <> hkMisc) and (Index = 0) then
+        Index := 200;
+    end
+    else
+    begin
+      Category := hkText;
+      Index := HelpText.Gethandle(copy(s, 1, 255));
+    end;
+  end;
+
+  procedure AddText(s: string);
+  var
+    i, p, l, ofs, CurrentFormat, FollowFormat, Picpix, LinkCategory, LinkIndex,
+      RightMargin: integer;
+    Name: string;
+  begin
+    RightMargin := InnerWidth - 16 - GetSystemMetrics(SM_CXVSCROLL);
+    FollowFormat := pkNormal;
+    while s <> '' do
+    begin
+      Picpix := 0;
+      LinkCategory := 0;
+      LinkIndex := 0;
+      if s[1] = '$' then
+      begin // window caption
+        p := 1;
+        repeat
+          inc(p)
+        until (p > length(s)) or (s[p] = '\');
+        Caption := copy(s, 2, p - 2);
+        Delete(s, 1, p);
+      end
+      else if s[1] = '&' then
+      begin // standard block
+        p := 1;
+        repeat
+          inc(p)
+        until (p > length(s)) or (s[p] = '\');
+        AddStandardBlock(copy(s, 2, p - 2));
+        Delete(s, 1, p);
+      end
+      else if s[1] = '@' then
+      begin // image
+        if (length(s) >= 2) and (s[2] = '@') then
+        begin // generate from icon
+          Picpix := 0;
+          p := 3;
+          while (p <= length(s)) and (s[p] <> '\') do
+          begin
+            Picpix := Picpix * 10 + ord(s[p]) - 48;
+            inc(p)
+          end;
+          if (Picpix < 0) or (Picpix >= nImp) then
+            Picpix := 0;
+          MainText.AddLine('', pkIllu, Picpix);
+          MainText.LF;
+          MainText.LF;
+        end
+        else
+        begin // external image
+          p := 1;
+          repeat
+            inc(p)
+          until (p > length(s)) or (s[p] = '\');
+          if LoadLocalizedGraphicFile(ExtPic, 'Help\' + copy(s, 2, p - 2)) then
+          begin
+            MainText.AddLine('', pkExternal);
+            for i := 0 to (ExtPic.Height - 12) div 24 do
+              MainText.LF;
+          end;
+        end;
+        Delete(s, 1, p);
+      end
+      else
+      begin
+        case s[1] of
+          ':', ';':
+            begin // link
+              p := 1;
+              repeat
+                inc(p)
+              until (p > length(s)) or (s[p] = '\') or (s[p] = ' ');
+              DecodeItem(copy(s, 2, p - 2), LinkCategory, LinkIndex);
+              CurrentFormat := 0;
+              if (LinkCategory <> hkText) and (LinkIndex < 200) then
+              // show icon
+                case LinkCategory of
+                  hkAdv:
+                    begin
+                      CurrentFormat := pkAdvIcon;
+                      Picpix := LinkIndex
+                    end;
+                  hkImp:
+                    begin
+                      CurrentFormat := pkSmallIcon;
+                      Picpix := LinkIndex
+                    end;
+                  hkTer:
+                    begin
+                      CurrentFormat := pkTer;
+                      Picpix := LinkIndex
+                    end;
+                  hkFeature:
+                    begin
+                      CurrentFormat := pkFeature;
+                      Picpix := LinkIndex
+                    end;
+                  hkModel:
+                    begin
+                      CurrentFormat := pkModel;
+                      FindStdModelPicture(SpecialModelPictureCode[LinkIndex],
+                        Picpix, Name);
+                    end;
+                end;
+              if s[1] = ':' then
+                LinkCategory := LinkCategory + hkCrossLink;
+              if (p > length(s)) or (s[p] = ' ') then
+                Delete(s, 1, p)
+              else
+                Delete(s, 1, p - 1)
+            end;
+          '!': // highlited
+            if (length(s) >= 2) and (s[2] = '!') then
+            begin
+              if MainText.Count > 1 then
+                MainText.LF;
+              FollowFormat := pkCaption;
+              CurrentFormat := pkCaption;
+              Delete(s, 1, 2);
+            end
+            else
+            begin
+              FollowFormat := pkSection;
+              CurrentFormat := pkSection;
+              Delete(s, 1, 1);
+            end;
+          '-':
+            begin // list
+              FollowFormat := pkNormal_Dot;
+              CurrentFormat := pkDot;
+              Delete(s, 1, 1);
+            end;
+        else
+          CurrentFormat := FollowFormat;
+        end;
+        if FollowFormat = pkNormal_Dot then
+          ofs := 20 + 4 + 8
+        else
+          ofs := 8;
+        p := 0;
+        repeat
+          repeat
+            inc(p)
+          until (p > length(s)) or (s[p] = ' ') or (s[p] = '\');
+          if (BiColorTextWidth(OffScreen.Canvas, copy(s, 1, p - 1)) <=
+            RightMargin - ofs) then
+            l := p - 1
+          else
+            Break;
+        until (p >= length(s)) or (s[l + 1] = '\');
+        MainText.AddLine(copy(s, 1, l), CurrentFormat, Picpix, LinkCategory,
+          LinkIndex);
+        if (l < length(s)) and (s[l + 1] = '\') then
+          FollowFormat := pkNormal;
+        Delete(s, 1, l + 1);
       end
     end
   end;
-end;
-
-procedure THelpDlg.OffscreenPaint;
-
-  procedure PaintTerrIcon(x,y,xSrc,ySrc: integer);
-  begin
-  Frame(offscreen.canvas,x-1,y-1,x+xSizeBig,y+ySizeBig,$000000,$000000);
-  if 2*yyt<40 then
-    begin
-    Sprite(Offscreen, HGrTerrain, x, y, 56, 2*yyt, xSrc, ySrc);
-    Sprite(Offscreen, HGrTerrain, x, y+2*yyt, 56, 40-2*yyt, xSrc, ySrc);
-    end
-  else Sprite(Offscreen, HGrTerrain, x, y, 56, 40, xSrc, ySrc);
-  Sprite(Offscreen, HGrTerrain, x, y, xxt, yyt, xSrc+xxt, ySrc+yyt);
-  Sprite(Offscreen, HGrTerrain, x, y+yyt, xxt, 40-yyt, xSrc+xxt, ySrc);
-  Sprite(Offscreen, HGrTerrain, x+xxt, y, 56-xxt, yyt, xSrc, ySrc+yyt);
-  Sprite(Offscreen, HGrTerrain, x+xxt, y+yyt, 56-xxt, 40-yyt, xSrc, ySrc);
-  end;
-
-var
-i,j,yl,srcno,ofs,cnt,y: integer;
-s: string;
-HelpLineInfo: THelpLineInfo;
-begin
-inherited;
-CaptionColor:=Colors.Canvas.Pixels[clkMisc,cliPaperCaption];
-FillSeamless(offscreen.Canvas,0,0,InnerWidth,InnerHeight,0,sb.si.npos*24,
-  Paper);
-with offscreen.Canvas do
-  begin
-  Font.Assign(UniFont[ftNormal]);
-  for i:=-sb.si.npos to InnerHeight div 24 do
-    if sb.si.npos+i<MainText.Count then
-      begin
-      HelpLineInfo:=THelpLineInfo(MainText.Objects[sb.si.npos+i]);
-      if HelpLineInfo.Format=pkExternal then
-        begin
-        yl:=ExtPic.Height;
-        if 4+i*24+yl>InnerHeight then yl:=InnerHeight-(4+i*24);
-        BitBlt(Handle,8,4+i*24,ExtPic.Width,yl,
-          ExtPic.Canvas.Handle,0,0,SRCCOPY);
-        end
-      end;
-  for i:=-2 to InnerHeight div 24 do
-    if (sb.si.npos+i>=0) and (sb.si.npos+i<MainText.Count) then
-      begin
-      HelpLineInfo:=THelpLineInfo(MainText.Objects[sb.si.npos+i]);
-      if HelpLineInfo.Link<>0 then
-        begin
-        if (Kind=hkMisc) and (no=miscSearchResult) then
-          Sprite(offscreen,HGrSystem,18,9+i*24,8,8,90,16)
-        else if HelpLineInfo.Format in [pkSmallIcon_AsPreq,pkAdvIcon_AsPreq] then
-          Sprite(offscreen,HGrSystem,12,i*24+5,14,14,65,20)
-        else if HelpLineInfo.Link and (hkCrossLink shl 8)<>0 then
-          Sprite(offscreen,HGrSystem,12,i*24+5,14,14,80,1)
-        else if not ((Kind=hkMisc) and (no=miscMain)) then
-          Sprite(offscreen,HGrSystem,10,i*24+6,14,14,65,1);
-        x0[i]:=24;
-        end
-      else x0[i]:=0;
-      case HelpLineInfo.Format of
-        pkLogo:
-          begin
-          Server(sGetVersion,0,0,j);
-          s:=Format('%d.%d.%d',[j shr 16 and $FF, j shr 8 and $FF, j and $FF]);
-          PaintLogo(offscreen.canvas,(InnerWidth-122) div 2,i*24+1,
-            GrExt[HGrSystem].Data.Canvas.Pixels[95,1],$000000);
-          Font.Assign(UniFont[ftSmall]);
-          BiColorTextout(offscreen.Canvas,$000000,$7F007F,
-            (InnerWidth-TextWidth(s)) div 2,i*24+26,s);
-          Font.Assign(UniFont[ftNormal]);
-          end;
-        pkSmallIcon,pkSmallIcon_AsPreq:
-          begin
-          Frame(offscreen.Canvas,8-1+x0[i],2-1+i*24,8+xSizeSmall+x0[i],2+20+i*24,
-            $000000,$000000);
-          if HelpLineInfo.Picpix=imPalace then
-            BitBlt(offscreen.Canvas.Handle,8+x0[i],2+i*24,xSizeSmall,ySizeSmall,SmallImp.Canvas.Handle,
-              0*xSizeSmall,1*ySizeSmall,SRCCOPY)
-          else BitBlt(offscreen.Canvas.Handle,8+x0[i],2+i*24,xSizeSmall,ySizeSmall,SmallImp.Canvas.Handle,
-            HelpLineInfo.Picpix mod 7*xSizeSmall,(HelpLineInfo.Picpix+SystemIconLines*7) div 7*ySizeSmall,SRCCOPY);
-          x0[i]:=x0[i]+(8+8+36);
-          end;
-        pkBigIcon:
-          begin
-          FrameImage(offscreen.canvas,BigImp,x0[i]+12,i*24-7,56,40,
-            HelpLineInfo.Picpix mod 7*xSizeBig,
-            HelpLineInfo.Picpix div 7*ySizeBig);
-          x0[i]:=64+8+8+x0[i];
-          end;
-        pkSpecialIcon:
-          begin
-          case HelpLineInfo.Picpix of
-            0:
-              FrameImage(Offscreen.Canvas, GrExt[HGrSystem2].Data, 12+x0[i],-7+i*24, 56, 40, 137, 127);
-            1:
-              begin
-              PaintTerrIcon(12+x0[i],-7+i*24, 1+3*(xxt*2+1), 1+yyt);
-              if 2*yyt<40 then
-                Sprite(Offscreen, HGrTerrain, 12+x0[i],-7+4+i*24, 56, 2*yyt, 1+3*(xxt*2+1)+xxt-28, 1+yyt+1*(yyt*3+1))
-              else Sprite(Offscreen, HGrTerrain, 12+x0[i],-7+4+i*24-4, 56, 40, 1+3*(xxt*2+1)+xxt-28, 1+yyt+1*(yyt*3+1)+yyt-20);
-              end;
-            2:
-              begin
-              PaintTerrIcon(12+x0[i],-7+i*24, 1+7*(xxt*2+1), 1+yyt+4*(yyt*3+1));
-              if 2*yyt<40 then
-                Sprite(Offscreen, HGrTerrain, 12+x0[i],-7+4+i*24, 56, 32, 1+4*(xxt*2+1)+xxt-28, 1+yyt+12*(yyt*3+1)+yyt-16)
-              else Sprite(Offscreen, HGrTerrain, 12+x0[i],-7+4+i*24, 56, 32, 1+4*(xxt*2+1)+xxt-28, 1+yyt+12*(yyt*3+1)+yyt-16)
-              end;
-            end;
-          x0[i]:=64+8+8+x0[i];
-          end;
-        pkDomain:
-          begin
-          Frame(offscreen.Canvas,8-1+x0[i],2-1+i*24,8+36+x0[i],2+20+i*24,
-            $000000,$000000);
-          Dump(offscreen,HGrSystem,8+x0[i],2+i*24,36,20,
-            75+HelpLineInfo.Picpix*37,295);
-          x0[i]:=x0[i]+(8+8+36);
-          end;
-        pkAdvIcon,pkAdvIcon_AsPreq:
-          begin
-          Frame(offscreen.Canvas,8-1+x0[i],2-1+i*24,8+xSizeSmall+x0[i],2+ySizeSmall+i*24,
-            $000000,$000000);
-          if AdvIcon[HelpLineInfo.Picpix]<84 then
-            BitBlt(offscreen.Canvas.Handle,8+x0[i],2+i*24,xSizeSmall,ySizeSmall,
-              SmallImp.Canvas.Handle, (AdvIcon[HelpLineInfo.Picpix]+SystemIconLines*7) mod 7*xSizeSmall,
-              (AdvIcon[HelpLineInfo.Picpix]+SystemIconLines*7) div 7*ySizeSmall,SRCCOPY)
-          else
-            Dump(offscreen,HGrSystem,8+x0[i],2+i*24,36,20,
-              1+(AdvIcon[HelpLineInfo.Picpix]-84) mod 8*37,
-              295+(AdvIcon[HelpLineInfo.Picpix]-84) div 8*21);
-          j:=AdvValue[HelpLineInfo.Picpix] div 1000;
-          BitBlt(Handle,x0[i]+4,4+i*24,14,14,
-            GrExt[HGrSystem].Mask.Canvas.Handle,127+j*15,85,SRCAND);
-          Sprite(offscreen,HGrSystem,x0[i]+3,3+i*24,14,14,127+j*15,85);
-          x0[i]:=x0[i]+(8+8+36);
-          end;
-        pkRightIcon:
-          begin
-          if Imp[HelpLineInfo.Picpix].Kind<>ikWonder then
-            ImpImage(Offscreen.Canvas,InnerWidth-(40+xSizeBig),i*24,
-              HelpLineInfo.Picpix, gDespotism)
-          else WaterSign(InnerWidth-(40+2*xSizeBig),i*24-8,HelpLineInfo.Picpix+7);
-          x0[i]:=x0[i]+8;
-          end;
-        pkIllu:
-          WaterSign(8,i*24-8,HelpLineInfo.Picpix);
-        pkBigFeature:
-          begin
-          cnt:=0;
-          for j:=nDomains-1 downto 0 do
-            if 1 shl j and Feature[HelpLineInfo.Picpix].Domains<>0 then
-              begin
-              inc(cnt);
-              Dump(offscreen,HGrSystem,InnerWidth-38-38*cnt,i*24+1,36,20,75+j*37,295);
-              Frame(offscreen.canvas,InnerWidth-39-38*cnt,i*24,
-                InnerWidth-2-38*cnt,i*24+21,
-                $000000,$000000);
-              end;
-          DarkGradient(offscreen.Canvas,InnerWidth-38-38*cnt,i*24+23,cnt*38-2,1);
-          ofs:=InnerWidth-(39+7)-19*cnt;
-          with offscreen.Canvas do
-            begin
-            Brush.Color:=$C0C0C0;
-            FrameRect(Rect(ofs,1+23+i*24,ofs+14,15+23+i*24));
-            Brush.Style:=bsClear;
-            Sprite(offscreen,HGrSystem,ofs+2,3+23+i*24,10,10,
-              66+HelpLineInfo.Picpix mod 11 *11,
-              137+HelpLineInfo.Picpix div 11 *11);
-            end;
-          x0[i]:=x0[i]+8;
-          end;
-        pkTer,pkBigTer:
-          begin
-          if HelpLineInfo.Format=pkBigTer then
-            y:=i*24-3+yyt
-          else y:=i*24+13;
-          if HelpLineInfo.Picpix>=3*12 then srcno:=2*9+6
-          else if HelpLineInfo.Picpix mod 12=fJungle then srcno:=18*9
-          else if HelpLineInfo.Picpix mod 12<fJungle then
-            srcno:=HelpLineInfo.Picpix mod 12
-          else srcno:=27+(HelpLineInfo.Picpix mod 12-9)*18;
-          if HelpLineInfo.Format=pkTer then
-            begin ofs:=x0[i]+8; x0[i]:=2*xxt+8+ofs; end
-          else begin ofs:=InnerWidth-(2*xxt+38); x0[i]:=x0[i]+8; end;
-          if srcno>=fJungle then
-            begin
-            Sprite(offscreen,HGrTerrain,ofs+4,y-yyt+2,xxt*2-8,yyt*2-4,
-              5+2*(xxt*2+1),3+yyt+2*(yyt*3+1));
-            Sprite(offscreen,HGrTerrain,ofs,y-2*yyt,xxt*2,yyt*3-2,
-              1+srcno mod 9 *(xxt*2+1),1+srcno div 9 *(yyt*3+1));
-            end
-          else Sprite(offscreen,HGrTerrain,ofs+4,y-yyt+2,xxt*2-8,yyt*2-4,
-            5+srcno mod 9 *(xxt*2+1),3+yyt+srcno div 9 *(yyt*3+1));
-          if HelpLineInfo.Picpix>=3*12 then {rare resource}
-            Sprite(offscreen,HGrTerrain,ofs,y-2*yyt,xxt*2,yyt*3,
-              1+8*(xxt*2+1), 1+(HelpLineInfo.Picpix-2*12)*(yyt*3+1))
-          else if HelpLineInfo.Picpix>=12 then {special tile}
-            begin
-            if HelpLineInfo.Picpix mod 12=fJungle then srcno:=17*9+8
-            else if HelpLineInfo.Picpix mod 12<fJungle then
-              srcno:=HelpLineInfo.Picpix mod 12
-            else srcno:=18+8+(HelpLineInfo.Picpix mod 12-9)*18;
-            srcno:=srcno+HelpLineInfo.Picpix div 12*9;
-            Sprite(offscreen,HGrTerrain,ofs,y-2*yyt,xxt*2,yyt*3,
-              1+srcno mod 9 *(xxt*2+1),1+srcno div 9 *(yyt*3+1));
-            end;
-          end;
-        pkTerImp:
-          begin
-          ofs:=8;
-          if HelpLineInfo.Picpix=5 then
-            begin // display mine on hills
-            Sprite(offscreen,HGrTerrain,ofs+4,i*24+13-yyt,xxt*2-8,yyt*2-4,
-              5+2*(xxt*2+1),3+yyt+2*(yyt*3+1));
-            srcno:=45
-            end
-          else srcno:=fPrairie; // display on prairie
-          Sprite(offscreen,HGrTerrain,ofs+4,i*24+13-yyt,xxt*2-8,yyt*2-4,
-            5+srcno mod 9 *(xxt*2+1),3+yyt+srcno div 9 *(yyt*3+1));
-          if HelpLineInfo.Picpix=12 then {river}
-            Sprite(offscreen,HGrTerrain,ofs,i*24+11-yyt,xxt*2,yyt*2,1+5*(xxt*2+1),
-              1+yyt+13*(yyt*3+1))
-          else if HelpLineInfo.Picpix>=3 then {improvement 2}
-            begin
-            if HelpLineInfo.Picpix=6 then
-              Sprite(offscreen,HGrTerrain,ofs,i*24+11-2*yyt,xxt*2,yyt*3,
-                1+7 *(xxt*2+1),1+12 *(yyt*3+1));
-            Sprite(offscreen,HGrTerrain,ofs,i*24+11-2*yyt,xxt*2,yyt*3,
-              1+(HelpLineInfo.Picpix-3)*(xxt*2+1), 1+12*(yyt*3+1))
-            end
-          else {improvement 1}
-            begin
-            Sprite(offscreen,HGrTerrain,ofs,i*24+11-2*yyt,xxt*2,yyt*3,
-              1+2*(xxt*2+1),1+(9+HelpLineInfo.Picpix)*(yyt*3+1));
-            Sprite(offscreen,HGrTerrain,ofs,i*24+11-2*yyt,xxt*2,yyt*3,
-              1+5*(xxt*2+1),1+(9+HelpLineInfo.Picpix)*(yyt*3+1))
-            end;
-          x0[i]:=x0[i]+8;
-          end;
-        pkModel:
-          begin
-          FrameImage(offscreen.canvas,BigImp,x0[i]+12,i*24-7,56,40,0,0);
-          Sprite(offscreen,HGrStdUnits,x0[i]+8,i*24-11,64,44,
-            1+HelpLineInfo.Picpix mod 10 *65,1+HelpLineInfo.Picpix div 10 *49);
-          x0[i]:=64+8+8+x0[i];
-          end;
-        pkFeature:
-          begin
-          DarkGradient(offscreen.Canvas,x0[i]+8-1,7+i*24-3,16,1);
-          Frame(offscreen.canvas,x0[i]+8,7+i*24-2,x0[i]+8+13,7+i*24-2+13,
-            $C0C0C0,$C0C0C0);
-          Sprite(offscreen,HGrSystem,x0[i]+8+2,7+i*24,10,10,
-            66+HelpLineInfo.Picpix mod 11*11,137+HelpLineInfo.Picpix div 11*11);
-          x0[i]:=x0[i]+8+8+2+13;
-          end;
-        pkExp:
-          begin
-          Frame(offscreen.Canvas,20-1,8-4+i*24,20+12,8+11+i*24,$000000,$000000);
-          Dump(offscreen,HGrSystem,20,8-3+i*24,12,14,121+HelpLineInfo.Picpix*13,28);
-          x0[i]:=20+8+11;
-          end;
-        pkAITStat:
-          begin
-          Sprite(offscreen,HGrSystem,20,6+i*24,14,14,1+HelpLineInfo.Picpix*15,316);
-          x0[i]:=20+8+11;
-          end;
-        pkGov:
-          begin
-          Frame(offscreen.Canvas,8-1+x0[i],2-1+i*24,8+xSizeSmall+x0[i],2+20+i*24,
-            $000000,$000000);
-          BitBlt(offscreen.Canvas.Handle,8+x0[i],2+i*24,xSizeSmall,ySizeSmall,SmallImp.Canvas.Handle,
-            (HelpLineInfo.Picpix-1)*xSizeSmall,ySizeSmall,SRCCOPY);
-          x0[i]:=x0[i]+(8+8+36);
-          end;
-        pkDot:
-          begin
-          Sprite(offscreen,HGrSystem,x0[i]+18,9+i*24,8,8,81,16);
-          x0[i]:=20+8+4;
-          end;
-        pkNormal_Dot:
-          x0[i]:=20+8+4;
-        pkNormal_64:
-          x0[i]:=64+8+8;
-        else x0[i]:=x0[i]+8
-        end;
-      line(offscreen.Canvas,i,false)
-      end
-  end;
-MarkUsedOffscreen(InnerWidth,InnerHeight+13+48);
-end; {OffscreenPaint}
-
-procedure THelpDlg.Prepare(sbPos: integer = 0);
-var
-i,j,special,Domain,Headline,TerrType,TerrSubType: integer;
-s: string;
-ps: pchar;
-List: THyperText;
-CheckSeeAlso: boolean;
-
-  procedure AddAdv(i: integer);
-  begin
-  MainText.AddLine(Phrases.Lookup('ADVANCES',i),pkAdvIcon,i,hkAdv+hkCrossLink,i);
-  end;
-
-  procedure AddPreqAdv(i: integer);
-  begin
-  MainText.AddLine(Phrases.Lookup('ADVANCES',i),pkAdvIcon_AsPreq,i,hkAdv+hkCrossLink,i);
-  end;
-
-  procedure AddImp(i: integer);
-  begin
-  MainText.AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp+hkCrossLink,i);
-  end;
-
-  procedure AddPreqImp(i: integer);
-  begin
-  MainText.AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon_AsPreq,i,hkImp+hkCrossLink,i);
-  end;
-
-  procedure AddTer(i: integer);
-  begin
-  if MainText.Count>1 then begin MainText.LF; end;
-  MainText.AddLine(Phrases.Lookup('TERRAIN',i),pkTer,i,hkTer,i);
-  end;
-
-  procedure AddFeature(i: integer);
-  begin
-  MainText.AddLine(Phrases.Lookup('FEATURES',i),pkFeature,i,hkFeature+hkCrossLink,i);
-  end;
-
-  procedure AddModel(i: integer);
-  var
-  pix: integer;
-  Name: string;
-  begin
-  if MainText.Count>1 then MainText.LF;
-  FindStdModelPicture(SpecialModelPictureCode[i],pix,Name);
-  MainText.AddLine(Name,pkModel,pix,hkModel+hkCrossLink,i)
-  end;
-
-  procedure AddStandardBlock(Item: string);
-  var
-  i: integer;
-  begin
-  with MainText do
-    begin
-    if Item='LOGO' then
-      begin AddLine('',pkLogo); LF; end
-    else if Item='TECHFORMULA' then
-      begin
-      i:=Difficulty;
-      if i=0 then i:=2;
-      AddLine(Format(HelpText.Lookup('TECHFORMULA'),[TechFormula_M[i],TechFormula_D[i]]))
-      end
-    else if Item='EXPERIENCE' then
-      for i:=0 to nExp-1 do AddLine(Phrases.Lookup('EXPERIENCE',i),pkExp,i)
-    else if Item='MODERN' then
-      for i:=1 to 3 do
-        begin
-        LF;
-        AddLine(Phrases.Lookup('TERRAIN',3*12+i),pkTer,3*12+i);
-        end
-    else if Item='SAVED' then
-      AddLine(DataDir+'Saved',pkNormal)
-    else if Item='AITSTAT' then
-      for i:=0 to 3 do AddLine(Phrases2.Lookup('AITSTAT',i),pkAITStat,i)
-    end
-  end;
-
-  procedure DecodeItem(s: string; var Category, Index: integer);
-  var
-  i: integer;
-  begin
-  if (length(s)>0) and (s[1]=':') then
-    begin
-    Category:=hkMisc;
-    Index:=0;
-    for i:=3 to Length(s) do Index:=Index*10+ord(s[i])-48;
-    case s[2] of
-      'A': Category:=hkAdv;
-      'B': Category:=hkImp;
-      'T': Category:=hkTer;
-      'F': Category:=hkFeature;
-      'E': Category:=hkInternet;
-      'S': Category:=hkModel;
-      'C': Index:=miscCredits;
-      'J': Index:=miscJobList;
-      'G': Index:=miscGovList;
-      end;
-    if (Category<>hkMisc) and (Index=0) then
-      Index:=200;
-    end
-  else
-    begin
-    Category:=hkText;
-    Index:=HelpText.GetHandle(copy(s,1,255));
-    end;
-  end;
-
-  procedure AddText(s: string);
-  var
-  i,p,l,ofs,CurrentFormat,FollowFormat,Picpix,LinkCategory,LinkIndex,RightMargin: integer;
-  Name: string;
-  begin
-  RightMargin:=InnerWidth-16-GetSystemMetrics(SM_CXVSCROLL);
-  FollowFormat:=pkNormal;
-  while s<>'' do
-    begin
-    Picpix:=0;
-    LinkCategory:=0;
-    LinkIndex:=0;
-    if s[1]='$' then
-      begin // window caption
-      p:=1;
-      repeat inc(p) until (p>Length(s)) or (s[p]='\');
-      Caption:=Copy(s,2,p-2);
-      Delete(s,1,p);
-      end
-    else if s[1]='&' then
-      begin // standard block
-      p:=1;
-      repeat inc(p) until (p>Length(s)) or (s[p]='\');
-      AddStandardBlock(Copy(s,2,p-2));
-      Delete(s,1,p);
-      end
-    else if s[1]='@' then
-      begin // image
-      if (Length(s)>=2) and (s[2]='@') then
-        begin // generate from icon
-        Picpix:=0;
-        p:=3;
-        while (p<=Length(s)) and (s[p]<>'\') do
-          begin Picpix:=Picpix*10+ord(s[p])-48; inc(p) end;
-        if (Picpix<0) or (Picpix>=nImp) then Picpix:=0;
-        MainText.AddLine('',pkIllu,Picpix);
-        MainText.LF;
-        MainText.LF;
-        end
-      else
-        begin // external image
-        p:=1;
-        repeat inc(p) until (p>Length(s)) or (s[p]='\');
-        if LoadLocalizedGraphicFile(ExtPic, 'Help\'+Copy(s,2,p-2)) then
-          begin
-          MainText.AddLine('',pkExternal);
-          for i:=0 to (ExtPic.Height-12) div 24 do MainText.LF;
-          end;
-        end;
-      Delete(s,1,p);
-      end
-    else
-      begin
-      case s[1] of
-        ':',';':
-          begin // link
-          p:=1;
-          repeat inc(p) until (p>Length(s)) or (s[p]='\') or (s[p]=' ');
-          DecodeItem(copy(s,2,p-2), LinkCategory, LinkIndex);
-          CurrentFormat:=0;
-          if (LinkCategory<>hkText) and (LinkIndex<200) then // show icon
-            case LinkCategory of
-              hkAdv:
-                begin CurrentFormat:=pkAdvIcon; Picpix:=LinkIndex end;
-              hkImp:
-                begin CurrentFormat:=pkSmallIcon; Picpix:=LinkIndex end;
-              hkTer:
-                begin CurrentFormat:=pkTer; Picpix:=LinkIndex end;
-              hkFeature:
-                begin CurrentFormat:=pkFeature; Picpix:=LinkIndex end;
-              hkModel:
-                begin
-                CurrentFormat:=pkModel;
-                FindStdModelPicture(SpecialModelPictureCode[LinkIndex],Picpix,Name);
-                end;
-              end;
-          if s[1]=':' then LinkCategory:=LinkCategory+hkCrossLink;
-          if (p>Length(s)) or (s[p]=' ') then Delete(s,1,p)
-          else Delete(s,1,p-1)
-          end;
-        '!': // highlited
-          if (length(s)>=2) and (s[2]='!') then
-            begin
-            if MainText.Count>1 then MainText.LF;
-            FollowFormat:=pkCaption;
-            CurrentFormat:=pkCaption;
-            Delete(s,1,2);
-            end
-          else
-            begin
-            FollowFormat:=pkSection;
-            CurrentFormat:=pkSection;
-            Delete(s,1,1);
-            end;
-        '-':
-          begin // list
-          FollowFormat:=pkNormal_Dot;
-          CurrentFormat:=pkDot;
-          Delete(s,1,1);
-          end;
-        else CurrentFormat:=FollowFormat;
-        end;
-      if FollowFormat=pkNormal_Dot then ofs:=20+4+8
-      else ofs:=8;
-      p:=0;
-      repeat
-        repeat inc(p) until (p>Length(s)) or (s[p]=' ') or (s[p]='\');
-        if (BiColorTextWidth(Offscreen.Canvas,Copy(s,1,p-1))<=RightMargin-ofs) then
-          l:=p-1
-        else Break;
-      until (p>=Length(s)) or (s[l+1]='\');
-      MainText.AddLine(Copy(s,1,l),CurrentFormat,Picpix,LinkCategory,LinkIndex);
-      if (l<Length(s)) and (s[l+1]='\') then FollowFormat:=pkNormal;
-      Delete(s,1,l+1);
-      end
-    end
-  end;
 
   procedure AddItem(Item: string);
   begin
-  AddText(HelpText.Lookup(Item));
+    AddText(HelpText.Lookup(Item));
   end;
 
   procedure AddModelText(i: integer);
   var
-  pix: integer;
-  s: string;
-  begin
-  with MainText do
-    begin
-    if Count>1 then begin LF; LF; end;
-    FindStdModelPicture(SpecialModelPictureCode[i],pix,s);
-    AddLine(s,pkSection);
-    AddLine(Format(HelpText.Lookup('STRENGTH'),
-      [SpecialModel[i].Attack,SpecialModel[i].Defense]),pkNormal_64);
-    AddLine(Format(HelpText.Lookup('SPEED'),
-      [MovementToString(SpecialModel[i].Speed)]),pkModel,pix);
-    if Difficulty=0 then
-      AddLine(Format(HelpText.Lookup('BUILDCOST'),
-        [SpecialModel[i].Cost]),pkNormal_64)
-    else AddLine(Format(HelpText.Lookup('BUILDCOST'),
-      [SpecialModel[i].Cost*BuildCostMod[Difficulty] div 12]),pkNormal_64);
-    s:=HelpText.LookupByHandle(hSPECIALMODEL,i);
-    if (s<>'') and (s<>'*') then AddText(s);
-    if SpecialModelPreq[i]>=0 then AddPreqAdv(SpecialModelPreq[i])
-    else if SpecialModelPreq[i]=preLighthouse then AddPreqImp(woLighthouse)
-    else if SpecialModelPreq[i]=preBuilder then AddPreqImp(woPyramids)
-    else if SpecialModelPreq[i]=preLeo then AddPreqImp(woLeo);
-    if SpecialModelPreq[i]<>preNone then
-      MainText[Count-1]:=Format(HelpText.Lookup('REQUIRED'),[MainText[Count-1]]);
+    pix: integer;
+    s: string;
+  begin
+    with MainText do
+    begin
+      if Count > 1 then
+      begin
+        LF;
+        LF;
+      end;
+      FindStdModelPicture(SpecialModelPictureCode[i], pix, s);
+      AddLine(s, pkSection);
+      AddLine(Format(HelpText.Lookup('STRENGTH'), [SpecialModel[i].Attack,
+        SpecialModel[i].Defense]), pkNormal_64);
+      AddLine(Format(HelpText.Lookup('SPEED'),
+        [MovementToString(SpecialModel[i].Speed)]), pkModel, pix);
+      if Difficulty = 0 then
+        AddLine(Format(HelpText.Lookup('BUILDCOST'), [SpecialModel[i].Cost]),
+          pkNormal_64)
+      else
+        AddLine(Format(HelpText.Lookup('BUILDCOST'),
+          [SpecialModel[i].Cost * BuildCostMod[Difficulty] div 12]),
+          pkNormal_64);
+      s := HelpText.LookupByHandle(hSPECIALMODEL, i);
+      if (s <> '') and (s <> '*') then
+        AddText(s);
+      if SpecialModelPreq[i] >= 0 then
+        AddPreqAdv(SpecialModelPreq[i])
+      else if SpecialModelPreq[i] = preLighthouse then
+        AddPreqImp(woLighthouse)
+      else if SpecialModelPreq[i] = preBuilder then
+        AddPreqImp(woPyramids)
+      else if SpecialModelPreq[i] = preLeo then
+        AddPreqImp(woLeo);
+      if SpecialModelPreq[i] <> preNone then
+        MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
+          [MainText[Count - 1]]);
     end
   end;
@@ -902 +1098 @@
   procedure AddJobList;
   var
-  i,JobCost: integer;
-  begin
-  with MainText do
-    begin
-    for i:=0 to nJobHelp-1 do
+    i, JobCost: integer;
+  begin
+    with MainText do
+    begin
+      for i := 0 to nJobHelp - 1 do
       begin
-      if i>0 then begin LF; LF end;
-      AddLine(Phrases.Lookup('JOBRESULT',JobHelp[i]),pkSection);
-      AddLine;
-      AddLine('',pkTerImp,i);
-      AddLine;
-      AddText(HelpText.LookupByHandle(hJOBHELP,i));
-      JobCost:=-1;
-      case JobHelp[i] of
-        jCanal: JobCost:=CanalWork;
-        jFort: JobCost:=FortWork;
-        jBase: JobCost:=BaseWork;
+        if i > 0 then
+        begin
+          LF;
+          LF
         end;
-      if JobCost>=0 then
-        AddText(Format(HelpText.Lookup('JOBCOST'),[MovementToString(JobCost)]))
-      else AddText(HelpText.Lookup('JOBCOSTVAR'));
-      if JobPreq[JobHelp[i]]<>preNone then
+        AddLine(Phrases.Lookup('JOBRESULT', JobHelp[i]), pkSection);
+        AddLine;
+        AddLine('', pkTerImp, i);
+        AddLine;
+        AddText(HelpText.LookupByHandle(hJOBHELP, i));
+        JobCost := -1;
+        case JobHelp[i] of
+          jCanal:
+            JobCost := CanalWork;
+          jFort:
+            JobCost := FortWork;
+          jBase:
+            JobCost := BaseWork;
+        end;
+        if JobCost >= 0 then
+          AddText(Format(HelpText.Lookup('JOBCOST'),
+            [MovementToString(JobCost)]))
+        else
+          AddText(HelpText.Lookup('JOBCOSTVAR'));
+        if JobPreq[JobHelp[i]] <> preNone then
         begin
-        AddPreqAdv(JobPreq[JobHelp[i]]);
-        MainText[Count-1]:=Format(HelpText.Lookup('REQUIRED'),[MainText[Count-1]]);
+          AddPreqAdv(JobPreq[JobHelp[i]]);
+          MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
+            [MainText[Count - 1]]);
         end
       end;
@@ -934 +1140 @@
   procedure AddGraphicCredits;
   var
-  i: integer;
-  s: string;
-  sr: TSearchRec;
-  List, plus: tstringlist;
-  begin
-  List:=tstringlist.Create;
-  plus:=tstringlist.Create;
-  if FindFirst(HomeDir+'Graphics\*.credits.txt',$27,sr)=0 then
-    repeat
-      plus.LoadFromFile(HomeDir+'Graphics\'+sr.Name);
-      List.AddStrings(plus);
-    until FindNext(sr)<>0;
-  FindClose(sr);
-  plus.Free;
-
-  List.Sort;
-  i:=1;
-  while i<List.Count do
-    if List[i]=List[i-1] then List.Delete(i)
-    else inc(i);
-
-  for i:=0 to List.Count-1 do
-    begin
-    s:=List[i];
-    while BiColorTextWidth(Offscreen.Canvas,s)>InnerWidth-16
-      -GetSystemMetrics(SM_CXVSCROLL) do
-      Delete(s,Length(s),1);
-    MainText.AddLine(s);
+    i: integer;
+    s: string;
+    sr: TSearchRec;
+    List, plus: TStringList;
+  begin
+    List := TStringList.Create;
+    plus := TStringList.Create;
+    if FindFirst(HomeDir + 'Graphics\*.credits.txt', $27, sr) = 0 then
+      repeat
+        plus.LoadFromFile(HomeDir + 'Graphics\' + sr.Name);
+        List.AddStrings(plus);
+      until FindNext(sr) <> 0;
+    FindClose(sr);
+    plus.Free;
+
+    List.Sort;
+    i := 1;
+    while i < List.Count do
+      if List[i] = List[i - 1] then
+        List.Delete(i)
+      else
+        inc(i);
+
+    for i := 0 to List.Count - 1 do
+    begin
+      s := List[i];
+      while BiColorTextWidth(OffScreen.Canvas, s) > InnerWidth - 16 -
+        GetSystemMetrics(SM_CXVSCROLL) do
+        Delete(s, length(s), 1);
+      MainText.AddLine(s);
     end;
-  List.Free;
+    List.Free;
   end;
 
   procedure AddSoundCredits;
   var
-  i: integer;
-  s: string;
-  List: tstringlist;
-  begin
-  List:=tstringlist.Create;
-  List.LoadFromFile(HomeDir+'Sounds\sound.credits.txt');
-  for i:=0 to List.Count-1 do
-    begin
-    s:=List[i];
-    while BiColorTextWidth(Offscreen.Canvas,s)>InnerWidth-16
-      -GetSystemMetrics(SM_CXVSCROLL) do
-      Delete(s,Length(s),1);
-    MainText.AddLine(s);
+    i: integer;
+    s: string;
+    List: TStringList;
+  begin
+    List := TStringList.Create;
+    List.LoadFromFile(HomeDir + 'Sounds\sound.credits.txt');
+    for i := 0 to List.Count - 1 do
+    begin
+      s := List[i];
+      while BiColorTextWidth(OffScreen.Canvas, s) > InnerWidth - 16 -
+        GetSystemMetrics(SM_CXVSCROLL) do
+        Delete(s, length(s), 1);
+      MainText.AddLine(s);
     end;
-  List.Free;
+    List.Free;
   end;
 
   procedure NextSection(Item: string);
   begin
-  if MainText.Count>1 then
-    if MainText.Count=Headline+1 then MainText.Delete(Headline)
-    else MainText.LF;
-  MainText.AddLine(HelpText.Lookup(Item),pkSection);
-  Headline:=MainText.Count-1;
-  end;
-
-begin {Prepare}
-with MainText do
-  begin
-  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-  CheckSeeAlso:=false;
-  Clear;
-  Headline:=-1;
-  if (no>=200) or not (Kind in [hkAdv,hkImp,hkTer,hkFeature]) then
-    LF;
-  case Kind of
-    hkText: AddText(HelpText.LookupByHandle(no));
-    hkMisc:
-      begin
-      case no of
-        miscMain:
+    if MainText.Count > 1 then
+      if MainText.Count = Headline + 1 then
+        MainText.Delete(Headline)
+      else
+        MainText.LF;
+    MainText.AddLine(HelpText.Lookup(Item), pkSection);
+    Headline := MainText.Count - 1;
+  end;
+
+begin { Prepare }
+  with MainText do
+  begin
+    OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
+    CheckSeeAlso := false;
+    Clear;
+    Headline := -1;
+    if (no >= 200) or not(Kind in [hkAdv, hkImp, hkTer, hkFeature]) then
+      LF;
+    case Kind of
+      hkText:
+        AddText(HelpText.LookupByHandle(no));
+      hkMisc:
+        begin
+          case no of
+            miscMain:
+              begin
+                Caption := HelpText.Lookup('HELPTITLE_MAIN');
+                AddLine(HelpText.Lookup('HELPTITLE_QUICKSTART'), pkSpecialIcon,
+                  0, { pkBigIcon,22, } hkText, HelpText.Gethandle('QUICK'));
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_CONCEPTS'), pkBigIcon, 6,
+                  hkText, HelpText.Gethandle('CONCEPTS'));
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_TERLIST'), pkSpecialIcon, 1,
+                  hkTer, 200);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkSpecialIcon, 2,
+                  hkMisc, miscJobList);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_TECHLIST'), pkBigIcon, 39,
+                  hkAdv, 200);
+                LF;
+                FindStdModelPicture(SpecialModelPictureCode[6], i, s);
+                AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkModel, i,
+                  hkModel, 0);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_FEATURELIST'), pkBigIcon, 28,
+                  hkFeature, 200);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_IMPLIST'), pkBigIcon,
+                  7 * SystemIconLines + imCourt, hkImp, 200);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'), pkBigIcon,
+                  7 * SystemIconLines + imStockEx, hkImp, 201);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'), pkBigIcon,
+                  7 * SystemIconLines, hkImp, 202);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkBigIcon,
+                  gDemocracy + 6, hkMisc, miscGovList);
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_KEYS'), pkBigIcon, 2, hkText,
+                  HelpText.Gethandle('HOTKEYS'));
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_ABOUT'), pkBigIcon, 1,
+                  hkText, HelpText.Gethandle('ABOUT'));
+                LF;
+                AddLine(HelpText.Lookup('HELPTITLE_CREDITS'), pkBigIcon, 22,
+                  hkMisc, miscCredits);
+              end;
+            miscCredits:
+              begin
+                AddItem('CREDITS');
+                LF;
+                AddGraphicCredits;
+                NextSection('CRED_CAPSOUND');
+                AddSoundCredits;
+                NextSection('CRED_CAPAI');
+                Server(sGetAICredits, 0, 0, ps);
+                AddText(ps);
+                NextSection('CRED_CAPLANG');
+                AddItem('AUTHOR');
+              end;
+            miscJobList:
+              begin
+                Caption := HelpText.Lookup('HELPTITLE_JOBLIST');
+                AddJobList;
+                LF;
+                AddItem('TERIMPEXCLUDE');
+                LF;
+                AddItem('TERIMPCITY');
+              end;
+            miscGovList:
+              begin
+                Caption := HelpText.Lookup('HELPTITLE_GOVLIST');
+                for i := 1 to nGov do
+                begin
+                  AddLine(Phrases.Lookup('GOVERNMENT', i mod nGov), pkSection);
+                  LF;
+                  if i = nGov then
+                    AddLine('', pkBigIcon, 7 * SystemIconLines + imPalace)
+                  else
+                    AddLine('', pkBigIcon, i + 6);
+                  LF;
+                  AddText(HelpText.LookupByHandle(hGOVHELP, i mod nGov));
+                  if i mod nGov >= 2 then
+                  begin
+                    AddPreqAdv(GovPreq[i mod nGov]);
+                    MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
+                      [MainText[Count - 1]]);
+                  end;
+                  if i < nGov then
+                  begin
+                    LF;
+                    LF;
+                  end
+                end
+              end;
+            miscSearchResult:
+              begin
+                Caption := HelpText.Lookup('HELPTITLE_SEARCHRESULTS');
+                AddText(Format(HelpText.Lookup('MATCHES'), [SearchContent]));
+                MainText.AddStrings(SearchResult);
+              end
+          end; // case no
+        end;
+
+      hkAdv:
+        if no = 200 then
+        begin // complete advance list
+          Caption := HelpText.Lookup('HELPTITLE_TECHLIST');
+          List := THyperText.Create;
+          for j := 0 to 3 do
           begin
-          Caption:=HelpText.Lookup('HELPTITLE_MAIN');
-          AddLine(HelpText.Lookup('HELPTITLE_QUICKSTART'),pkSpecialIcon,0,{pkBigIcon,22,}hkText,HelpText.GetHandle('QUICK')); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_CONCEPTS'),pkBigIcon,6,hkText,HelpText.GetHandle('CONCEPTS')); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_TERLIST'),pkSpecialIcon,1,hkTer,200); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'),pkSpecialIcon,2,hkMisc,miscJobList); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_TECHLIST'),pkBigIcon,39,hkAdv,200); LF;
-          FindStdModelPicture(SpecialModelPictureCode[6],i,s);
-          AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'),pkModel,i,hkModel,0); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_FEATURELIST'),pkBigIcon,28,hkFeature,200); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_IMPLIST'),pkBigIcon,7*SystemIconLines+imCourt,hkImp,200); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'),pkBigIcon,7*SystemIconLines+imStockEx,hkImp,201); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'),pkBigIcon,7*SystemIconLines,hkImp,202); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'),pkBigIcon,gDemocracy+6,hkMisc,miscGovList); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_KEYS'),pkBigIcon,2,hkText,HelpText.GetHandle('HOTKEYS')); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_ABOUT'),pkBigIcon,1,hkText,HelpText.GetHandle('ABOUT')); LF;
-          AddLine(HelpText.Lookup('HELPTITLE_CREDITS'),pkBigIcon,22,hkMisc,miscCredits);
+            if j > 0 then
+            begin
+              LF;
+              LF;
+            end;
+            AddLine(HelpText.Lookup('TECHAGE', j), pkSection);
+            if j = 1 then
+              AddLine(Phrases.Lookup('ADVANCES', adScience) + ' ' +
+                HelpText.Lookup('BASETECH'), pkAdvIcon, adScience, hkAdv,
+                adScience);
+            if j = 2 then
+              AddLine(Phrases.Lookup('ADVANCES', adMassProduction) + ' ' +
+                HelpText.Lookup('BASETECH'), pkAdvIcon, adMassProduction, hkAdv,
+                adMassProduction);
+            List.Clear;
+            for i := 0 to nAdv - 1 do
+              if (i <> adScience) and (i <> adMassProduction) and
+                (AdvValue[i] div 1000 = j) then
+                List.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon, i,
+                  hkAdv, i);
+            List.Sort;
+            AddStrings(List);
           end;
-        miscCredits:
+          List.Free
+        end
+        else // single advance
+        begin
+          Caption := Phrases.Lookup('ADVANCES', no);
+          LF;
+          AddLine(Phrases.Lookup('ADVANCES', no), pkCaption);
+          if no in FutureTech then
           begin
-          AddItem('CREDITS');
-          LF;
-          AddGraphicCredits;
-          NextSection('CRED_CAPSOUND');
-          AddSoundCredits;
-          NextSection('CRED_CAPAI');
-          Server(sGetAICredits,0,0,ps);
-          AddText(ps);
-          NextSection('CRED_CAPLANG');
-          AddItem('AUTHOR');
-          end;
-        miscJobList:
-          begin
-          Caption:=HelpText.Lookup('HELPTITLE_JOBLIST');
-          AddJobList;
-          LF;
-          AddItem('TERIMPEXCLUDE');
-          LF;
-          AddItem('TERIMPCITY');
-          end;
-        miscGovList:
-          begin
-          Caption:=HelpText.Lookup('HELPTITLE_GOVLIST');
-          for i:=1 to nGov do
-            begin
-            AddLine(Phrases.Lookup('GOVERNMENT',i mod nGov),pkSection);
+            AddLine(HelpText.Lookup('HELPSPEC_FUTURE'));
             LF;
-            if i=nGov then
-              AddLine('',pkBigIcon,7*SystemIconLines+imPalace)
-            else AddLine('',pkBigIcon,i+6);
-            LF;
-            AddText(HelpText.LookupByHandle(hGOVHELP,i mod nGov));
-            if i mod nGov>=2 then
+            if no = futResearchTechnology then
+              AddItem('FUTURETECHHELP100')
+            else
+              AddItem('FUTURETECHHELP25');
+          end
+          else
+            AddLine(HelpText.Lookup('HELPSPEC_ADV'));
+          if AdvPreq[no, 2] <> preNone then
+            NextSection('PREREQALT')
+          else
+            NextSection('PREREQ');
+          for i := 0 to 2 do
+            if AdvPreq[no, i] <> preNone then
+              AddPreqAdv(AdvPreq[no, i]);
+          NextSection('GOVALLOW');
+          for i := 2 to nGov - 1 do
+            if GovPreq[i] = no then
+              AddLine(Phrases.Lookup('GOVERNMENT', i), pkGov, i,
+                hkMisc + hkCrossLink, miscGovList);
+          NextSection('BUILDALLOW');
+          for i := 0 to 27 do
+            if Imp[i].Preq = no then
+              AddImp(i);
+          for i := 28 to nImp - 1 do
+            if (Imp[i].Preq = no) and (Imp[i].Kind <> ikCommon) then
+              AddImp(i);
+          for i := 28 to nImp - 1 do
+            if (Imp[i].Preq = no) and (Imp[i].Kind = ikCommon) then
+              AddImp(i);
+          NextSection('MODELALLOW');
+          for i := 0 to nSpecialModel - 1 do
+            if SpecialModelPreq[i] = no then
+              AddModel(i);
+          NextSection('FEATALLOW');
+          for i := 0 to nFeature - 1 do
+            if Feature[i].Preq = no then
+              AddFeature(i);
+          NextSection('FOLLOWADV');
+          for i := 0 to nAdv - 1 do
+            if (AdvPreq[i, 0] = no) or (AdvPreq[i, 1] = no) or
+              (AdvPreq[i, 2] = no) then
+              AddAdv(i);
+          NextSection('UPGRADEALLOW');
+          for Domain := 0 to nDomains - 1 do
+            for i := 1 to nUpgrade - 1 do
+              if upgrade[Domain, i].Preq = no then
               begin
-              AddPreqAdv(GovPreq[i mod nGov]);
-              MainText[Count-1]:=Format(HelpText.Lookup('REQUIRED'),[MainText[Count-1]]);
+                if upgrade[Domain, i].Strength > 0 then
+                  AddLine(Format(HelpText.Lookup('STRENGTHUP'),
+                    [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain,
+                    i].Strength]), pkDomain, Domain);
+                if upgrade[Domain, i].Trans > 0 then
+                  AddLine(Format(HelpText.Lookup('TRANSUP'),
+                    [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain, i].Trans]
+                    ), pkDomain, Domain);
+                if no in FutureTech then
+                  AddLine(Format(HelpText.Lookup('COSTUP'),
+                    [upgrade[Domain, i].Cost]), pkNormal_Dot)
+                else
+                  AddLine(Format(HelpText.Lookup('COSTMIN'),
+                    [upgrade[Domain, i].Cost]), pkNormal_Dot)
               end;
-            if i<nGov then begin LF; LF; end
-            end
-          end;
-        miscSearchResult:
-          begin
-          Caption:=HelpText.Lookup('HELPTITLE_SEARCHRESULTS');
-          AddText(Format(HelpText.Lookup('MATCHES'), [SearchContent]));
-          MainText.AddStrings(SearchResult);
-          end
-        end; // case no
-      end;
-
-    hkAdv:
-      if no=200 then
-        begin // complete advance list
-        Caption:=HelpText.Lookup('HELPTITLE_TECHLIST');
-        List:=THyperText.Create;
-        for j:=0 to 3 do
-          begin
-          if j>0 then begin LF; LF; end;
-          AddLine(HelpText.Lookup('TECHAGE',j),pkSection);
-          if j=1 then
-            AddLine(Phrases.Lookup('ADVANCES',adScience)+' '
-              +HelpText.Lookup('BASETECH'),
-              pkAdvIcon,adScience,hkAdv,adScience);
-          if j=2 then
-            AddLine(Phrases.Lookup('ADVANCES',adMassProduction)+' '
-              +HelpText.Lookup('BASETECH'),
-              pkAdvIcon,adMassProduction,hkAdv,adMassProduction);
-          List.Clear;
-          for i:=0 to nAdv-1 do
-            if (i<>adScience) and (i<>adMassProduction) and (AdvValue[i] div 1000=j) then
-              List.AddLine(Phrases.Lookup('ADVANCES',i),pkAdvIcon,i,hkAdv,i);
+          NextSection('EXPIRATION');
+          for i := 0 to 27 do
+            if (Imp[i].Preq <> preNA) and (Imp[i].Expiration = no) then
+              AddImp(i);
+          NextSection('ADVEFFECT');
+          s := HelpText.LookupByHandle(hADVHELP, no);
+          if s <> '*' then
+            AddText(s);
+          NextSection('SEEALSO');
+          CheckSeeAlso := true
+        end;
+
+      hkImp:
+        if no = 200 then
+        begin // complete city improvement list
+          Caption := HelpText.Lookup('HELPTITLE_IMPLIST');
+          // AddLine(HelpText.Lookup('HELPTITLE_IMPLIST'),pkSection);
+          List := THyperText.Create;
+          for i := 28 to nImp - 1 do
+            if (i <> imTrGoods) and (Imp[i].Preq <> preNA) and
+              (Imp[i].Kind = ikCommon) then
+              List.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon,
+                i, hkImp, i);
           List.Sort;
           AddStrings(List);
+          List.Free
+        end
+        else if no = 201 then
+        begin // complete nat. project list
+          Caption := HelpText.Lookup('HELPTITLE_UNIQUELIST');
+          // AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'),pkSection);
+          for i := 28 to nImp - 1 do
+            if (Imp[i].Preq <> preNA) and
+              ((Imp[i].Kind = ikNatLocal) or (Imp[i].Kind = ikNatGlobal)) then
+              AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
+                hkImp, i);
+          { LF;
+            LF;
+            AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'),pkSection);
+            for i:=28 to nImp-1 do
+            if (Imp[i].Preq<>preNA) and (Imp[i].Kind=ikShipPart) then
+            AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i); }
+        end
+        else if no = 202 then
+        begin // complete wonder list
+          Caption := HelpText.Lookup('HELPTITLE_WONDERLIST');
+          // AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'),pkSection);
+          for i := 0 to 27 do
+            if Imp[i].Preq <> preNA then
+              AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
+                hkImp, i);
+        end
+        else
+        begin // single building
+          Caption := Phrases.Lookup('IMPROVEMENTS', no);
+          LF;
+          AddLine(Phrases.Lookup('IMPROVEMENTS', no), pkRightIcon, no);
+          case Imp[no].Kind of
+            ikWonder:
+              AddLine(HelpText.Lookup('HELPSPEC_WONDER'));
+            ikCommon:
+              AddLine(HelpText.Lookup('HELPSPEC_IMP'));
+            ikShipPart:
+              AddLine(HelpText.Lookup('HELPSPEC_SHIPPART'));
+          else
+            AddLine(HelpText.Lookup('HELPSPEC_NAT'))
           end;
-        List.Free
+          if Imp[no].Kind <> ikShipPart then
+          begin
+            NextSection('EFFECT');
+            AddText(HelpText.LookupByHandle(hIMPHELP, no));
+          end;
+          if no = woSun then
+          begin
+            AddFeature(mcFirst);
+            AddFeature(mcWill);
+            AddFeature(mcAcademy);
+          end;
+          if (no < 28) and not Phrases2FallenBackToEnglish then
+          begin
+            LF;
+            if Imp[no].Expiration >= 0 then
+              AddText(Phrases2.Lookup('HELP_WONDERMORALE1'))
+            else
+              AddText(Phrases2.Lookup('HELP_WONDERMORALE2'));
+          end;
+          if Imp[no].Preq <> preNone then
+          begin
+            NextSection('PREREQ');
+            AddPreqAdv(Imp[no].Preq);
+          end;
+          NextSection('COSTS');
+          if Difficulty = 0 then
+            s := Format(HelpText.Lookup('BUILDCOST'), [Imp[no].Cost])
+          else
+            s := Format(HelpText.Lookup('BUILDCOST'),
+              [Imp[no].Cost * BuildCostMod[Difficulty] div 12]);
+          AddLine(s);
+          if Imp[no].Maint > 0 then
+            AddLine(Format(HelpText.Lookup('MAINTCOST'), [Imp[no].Maint]));
+          j := 0;
+          for i := 0 to nImpReplacement - 1 do
+            if ImpReplacement[i].NewImp = no then
+            begin
+              if j = 0 then
+              begin
+                NextSection('REPLACE');
+                AddItem('REPLACETEXT');
+                j := 1
+              end;
+              AddImp(ImpReplacement[i].OldImp);
+            end;
+          if Imp[no].Kind = ikShipPart then
+          begin
+            LF;
+            if no = imShipComp then
+              i := 1
+            else if no = imShipPow then
+              i := 2
+            else { if no=imShipHab then }
+              i := 3;
+            AddLine(Format(HelpText.Lookup('RAREREQUIRED'),
+              [Phrases.Lookup('TERRAIN', 3 * 12 + i)]), pkTer, 3 * 12 + i);
+          end;
+          if (no < 28) and (Imp[no].Expiration >= 0) then
+          begin
+            NextSection('EXPIRATION');
+            s := Format(HelpText.Lookup('EXPWITH'),
+              [Phrases.Lookup('ADVANCES', Imp[no].Expiration)]);
+            if no = woPyramids then
+              s := s + ' ' + HelpText.Lookup('EXPSLAVE');
+            AddText(s);
+          end;
+          NextSection('SEEALSO');
+          if (no < 28) and (Imp[no].Expiration >= 0) then
+            AddImp(woEiffel);
+          for i := 0 to nImpReplacement - 1 do
+            if ImpReplacement[i].OldImp = no then
+              AddImp(ImpReplacement[i].NewImp);
+          if no = imSupermarket then
+            AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
+              hkMisc + hkCrossLink, miscJobList);
+          CheckSeeAlso := true
+        end;
+
+      hkTer:
+        if no = 200 then
+        begin // complete terrain type list
+          Caption := HelpText.Lookup('HELPTITLE_TERLIST');
+          // AddLine(HelpText.Lookup('HELPTITLE_TERLIST'),pkSection);
+          for i := 0 to nTerrainHelp - 1 do
+            AddTer(TerrainHelp[i]);
         end
-      else // single advance
-        begin
-        Caption:=Phrases.Lookup('ADVANCES',no);
-        LF;
-        AddLine(Phrases.Lookup('ADVANCES',no),pkCaption);
-        if no in FutureTech then
+        else
+        begin // sigle terrain type
+          TerrType := no mod 12;
+          if TerrType = fJungle then
+            TerrType := fForest;
+          TerrSubType := no div 12;
+          if no = 3 * 12 then
           begin
-          AddLine(HelpText.Lookup('HELPSPEC_FUTURE'));
-          LF;
-          if no=futResearchTechnology then
-            AddItem('FUTURETECHHELP100')
-          else AddItem('FUTURETECHHELP25');
-          end
-        else AddLine(HelpText.Lookup('HELPSPEC_ADV'));
-        if AdvPreq[no,2]<>preNone then NextSection('PREREQALT')
-        else NextSection('PREREQ');
-        for i:=0 to 2 do
-          if AdvPreq[no,i]<>preNone then AddPreqAdv(AdvPreq[no,i]);
-        NextSection('GOVALLOW');
-        for i:=2 to nGov-1 do
-          if GovPreq[i]=no then
-            AddLine(Phrases.Lookup('GOVERNMENT',i),pkGov,i,
-              hkMisc+hkCrossLink,miscGovList);
-        NextSection('BUILDALLOW');
-        for i:=0 to 27 do
-          if Imp[i].Preq=no then AddImp(i);
-        for i:=28 to nImp-1 do
-          if (Imp[i].Preq=no) and (Imp[i].Kind<>ikCommon) then AddImp(i);
-        for i:=28 to nImp-1 do
-          if (Imp[i].Preq=no) and (Imp[i].Kind=ikCommon) then AddImp(i);
-        NextSection('MODELALLOW');
-        for i:=0 to nSpecialModel-1 do
-          if SpecialModelPreq[i]=no then AddModel(i);
-        NextSection('FEATALLOW');
-        for i:=0 to nFeature-1 do if Feature[i].Preq=no then AddFeature(i);
-        NextSection('FOLLOWADV');
-        for i:=0 to nAdv-1 do
-          if (AdvPreq[i,0]=no) or (AdvPreq[i,1]=no) or (AdvPreq[i,2]=no) then
-            AddAdv(i);
-        NextSection('UPGRADEALLOW');
-        for Domain:=0 to nDomains-1 do for i:=1 to nUpgrade-1 do
-          if upgrade[Domain,i].Preq=no then
-            begin
-            if upgrade[Domain,i].Strength>0 then
-              AddLine(Format(HelpText.Lookup('STRENGTHUP'),
-                [Phrases.Lookup('DOMAIN',Domain),upgrade[Domain,i].Strength]),
-                pkDomain,Domain);
-            if upgrade[Domain,i].Trans>0 then
-              AddLine(Format(HelpText.Lookup('TRANSUP'),
-                [Phrases.Lookup('DOMAIN',Domain),upgrade[Domain,i].Trans]),
-                pkDomain,Domain);
-            if no in FutureTech then
-              AddLine(Format(HelpText.Lookup('COSTUP'),
-                [upgrade[Domain,i].Cost]),pkNormal_Dot)
-            else
-              AddLine(Format(HelpText.Lookup('COSTMIN'),
-                [upgrade[Domain,i].Cost]),pkNormal_Dot)
-            end;
-        NextSection('EXPIRATION');
-        for i:=0 to 27 do
-          if (Imp[i].Preq<>preNA) and (Imp[i].Expiration=no) then AddImp(i);
-        NextSection('ADVEFFECT');
-        s:=HelpText.LookupByHandle(hADVHELP,no);
-        if s<>'*' then AddText(s);
-        NextSection('SEEALSO');
-        CheckSeeAlso:=true
-        end;
-
-    hkImp:
-      if no=200 then
-        begin // complete city improvement list
-        Caption:=HelpText.Lookup('HELPTITLE_IMPLIST');
-//        AddLine(HelpText.Lookup('HELPTITLE_IMPLIST'),pkSection);
-        List:=THyperText.Create;
-        for i:=28 to nImp-1 do
-          if (i<>imTrGoods) and (Imp[i].Preq<>preNA) and (Imp[i].Kind=ikCommon) then
-            List.AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i);
-        List.Sort;
-        AddStrings(List);
-        List.Free
-        end
-      else if no=201 then
-        begin // complete nat. project list
-        Caption:=HelpText.Lookup('HELPTITLE_UNIQUELIST');
-//        AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'),pkSection);
-        for i:=28 to nImp-1 do
-          if (Imp[i].Preq<>preNA)
-            and ((Imp[i].Kind=ikNatLocal) or (Imp[i].Kind=ikNatGlobal)) then
-            AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i);
-{        LF;
-        LF;
-        AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'),pkSection);
-        for i:=28 to nImp-1 do
-          if (Imp[i].Preq<>preNA) and (Imp[i].Kind=ikShipPart) then
-            AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i);}
-        end
-      else if no=202 then
-        begin // complete wonder list
-        Caption:=HelpText.Lookup('HELPTITLE_WONDERLIST');
-//        AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'),pkSection);
-        for i:=0 to 27 do if Imp[i].Preq<>preNA then
-          AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i);
-        end
-      else
-        begin // single building
-        Caption:=Phrases.Lookup('IMPROVEMENTS',no);
-        LF;
-        AddLine(Phrases.Lookup('IMPROVEMENTS',no),pkRightIcon,no);
-        case Imp[no].Kind of
-          ikWonder: AddLine(HelpText.Lookup('HELPSPEC_WONDER'));
-          ikCommon: AddLine(HelpText.Lookup('HELPSPEC_IMP'));
-          ikShipPart: AddLine(HelpText.Lookup('HELPSPEC_SHIPPART'));
-          else AddLine(HelpText.Lookup('HELPSPEC_NAT'))
+            TerrType := fDesert;
+            TerrSubType := 0
           end;
-        if Imp[no].Kind<>ikShipPart then
+          with Terrain[TerrType] do
           begin
-          NextSection('EFFECT');
-          AddText(HelpText.LookupByHandle(hIMPHELP,no));
-          end;
-        if no=woSun then
-          begin
-          AddFeature(mcFirst);
-          AddFeature(mcWill);
-          AddFeature(mcAcademy);
-          end;
-        if (no<28) and not Phrases2FallenBackToEnglish then
-          begin
-          LF;
-          if Imp[no].Expiration>=0 then
-            AddText(Phrases2.Lookup('HELP_WONDERMORALE1'))
-          else AddText(Phrases2.Lookup('HELP_WONDERMORALE2'));
-          end;
-        if Imp[no].Preq<>preNone then
-          begin
-          NextSection('PREREQ');
-          AddPreqAdv(Imp[no].Preq);
-          end;
-        NextSection('COSTS');
-        if Difficulty=0 then
-          s:=Format(HelpText.Lookup('BUILDCOST'),[Imp[no].Cost])
-        else s:=Format(HelpText.Lookup('BUILDCOST'),
-          [Imp[no].Cost*BuildCostMod[Difficulty] div 12]);
-        AddLine(s);
-        if Imp[no].Maint>0 then
-          AddLine(Format(HelpText.Lookup('MAINTCOST'),[Imp[no].Maint]));
-        j:=0;
-        for i:=0 to nImpReplacement-1 do if ImpReplacement[i].NewImp=no then
-          begin
-          if j=0 then
-            begin NextSection('REPLACE'); AddItem('REPLACETEXT'); j:=1 end;
-          AddImp(ImpReplacement[i].OldImp);
-          end;
-        if Imp[no].Kind=ikShipPart then
-          begin
-          LF;
-          if no=imShipComp then i:=1
-          else if no=imShipPow then i:=2
-          else {if no=imShipHab then} i:=3;
-          AddLine(Format(HelpText.Lookup('RAREREQUIRED'),
-            [Phrases.Lookup('TERRAIN',3*12+i)]),pkTer,3*12+i);
-          end;
-        if (no<28) and (Imp[no].Expiration>=0) then
-          begin
-          NextSection('EXPIRATION');
-          s:=Format(HelpText.Lookup('EXPWITH'),[Phrases.Lookup('ADVANCES',Imp[no].Expiration)]);
-          if no=woPyramids then s:=s+' '+HelpText.Lookup('EXPSLAVE');
-          AddText(s);
-          end;
-        NextSection('SEEALSO');
-        if (no<28) and (Imp[no].Expiration>=0) then AddImp(woEiffel);
-        for i:=0 to nImpReplacement-1 do if ImpReplacement[i].OldImp=no then
-          AddImp(ImpReplacement[i].NewImp);
-        if no=imSupermarket then
-          AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'),pkNormal,0,hkMisc+hkCrossLink,miscJobList);
-        CheckSeeAlso:=true
-        end;
-
-    hkTer:
-      if no=200 then
-        begin // complete terrain type list
-        Caption:=HelpText.Lookup('HELPTITLE_TERLIST');
-//        AddLine(HelpText.Lookup('HELPTITLE_TERLIST'),pkSection);
-        for i:=0 to nTerrainHelp-1 do AddTer(TerrainHelp[i]);
-        end
-      else
-        begin // sigle terrain type
-        TerrType:=no mod 12;
-        if TerrType=fJungle then TerrType:=fForest;
-        TerrSubType:=no div 12;
-        if no=3*12 then
-          begin TerrType:=fDesert; TerrSubType:=0 end;
-        with Terrain[TerrType] do
-          begin
-          Caption:=Phrases.Lookup('TERRAIN',no);
-          LF;
-          AddLine(Phrases.Lookup('TERRAIN',no), pkBigTer, no);
-          AddLine(HelpText.Lookup('HELPSPEC_TER'));
-          LF;
-          if (ProdRes[TerrSubType]>0) or (MineEff>0) then
-            AddLine(Format(HelpText.Lookup('RESPROD'),[ProdRes[TerrSubType]]));
-          if (no<3*12) and (MineEff>0) then
-            MainText[Count-1]:=MainText[Count-1]+' '
-              +Format(HelpText.Lookup('MOREMINE'),[MineEff]);
-          if (FoodRes[TerrSubType]>0) or (IrrEff>0) then
-            AddLine(Format(HelpText.Lookup('RESFOOD'),[FoodRes[TerrSubType]]));
-          if (no<3*12) and (IrrEff>0) then
-            MainText[Count-1]:=MainText[Count-1]+' '
-              +Format(HelpText.Lookup('MOREIRR'),[IrrEff]);
-          if TradeRes[TerrSubType]>0 then
-            AddLine(Format(HelpText.Lookup('RESTRADE'),[TradeRes[TerrSubType]]));
-          if Defense>4 then
-            AddLine(Format(HelpText.Lookup('DEFBONUS'),[(Defense-4)*25]));
-          if (TerrType>=fGrass) and (TerrType<>fMountains) then
-            if MoveCost=2 then
-              AddLine(HelpText.Lookup('MOVEHEAVY'))
-            else AddLine(HelpText.Lookup('MOVEPLAIN'));
-          if no=3*12 then
-            begin
+            Caption := Phrases.Lookup('TERRAIN', no);
             LF;
-            AddText(HelpText.Lookup('DEADLANDS'));
-            end;
-          if (TerrType=fDesert) and (no<>fDesert+12) then
-            begin
+            AddLine(Phrases.Lookup('TERRAIN', no), pkBigTer, no);
+            AddLine(HelpText.Lookup('HELPSPEC_TER'));
             LF;
-            AddText(Format(HelpText.Lookup('HOSTILE'),[DesertThurst]));
-            end;
-          if TerrType=fArctic then
-            begin
-            LF;
-            AddText(Format(HelpText.Lookup('HOSTILE'),[ArcticThurst]));
-            end;
-          if (no<3*12) and (TransTerrain>=0) then
-            begin
-            LF;
-            i:=TransTerrain;
-            if (TerrType<>fGrass) and (i<>fGrass) then
-              i:=i+TerrSubType*12; // trafo to same special resource group
-            AddLine(Format(HelpText.Lookup('TRAFO'),
-              [Phrases.Lookup('TERRAIN',i)]),pkTer,i,hkTer+hkCrossLink,i);
-            if no=fSwamp+12 then
+            if (ProdRes[TerrSubType] > 0) or (MineEff > 0) then
+              AddLine(Format(HelpText.Lookup('RESPROD'),
+                [ProdRes[TerrSubType]]));
+            if (no < 3 * 12) and (MineEff > 0) then
+              MainText[Count - 1] := MainText[Count - 1] + ' ' +
+                Format(HelpText.Lookup('MOREMINE'), [MineEff]);
+            if (FoodRes[TerrSubType] > 0) or (IrrEff > 0) then
+              AddLine(Format(HelpText.Lookup('RESFOOD'),
+                [FoodRes[TerrSubType]]));
+            if (no < 3 * 12) and (IrrEff > 0) then
+              MainText[Count - 1] := MainText[Count - 1] + ' ' +
+                Format(HelpText.Lookup('MOREIRR'), [IrrEff]);
+            if TradeRes[TerrSubType] > 0 then
+              AddLine(Format(HelpText.Lookup('RESTRADE'),
+                [TradeRes[TerrSubType]]));
+            if Defense > 4 then
+              AddLine(Format(HelpText.Lookup('DEFBONUS'),
+                [(Defense - 4) * 25]));
+            if (TerrType >= fGrass) and (TerrType <> fMountains) then
+              if MoveCost = 2 then
+                AddLine(HelpText.Lookup('MOVEHEAVY'))
+              else
+                AddLine(HelpText.Lookup('MOVEPLAIN'));
+            if no = 3 * 12 then
+            begin
+              LF;
+              AddText(HelpText.Lookup('DEADLANDS'));
+            end;
+            if (TerrType = fDesert) and (no <> fDesert + 12) then
+            begin
+              LF;
+              AddText(Format(HelpText.Lookup('HOSTILE'), [DesertThurst]));
+            end;
+            if TerrType = fArctic then
+            begin
+              LF;
+              AddText(Format(HelpText.Lookup('HOSTILE'), [ArcticThurst]));
+            end;
+            if (no < 3 * 12) and (TransTerrain >= 0) then
+            begin
+              LF;
+              i := TransTerrain;
+              if (TerrType <> fGrass) and (i <> fGrass) then
+                i := i + TerrSubType * 12;
+              // trafo to same special resource group
+              AddLine(Format(HelpText.Lookup('TRAFO'),
+                [Phrases.Lookup('TERRAIN', i)]), pkTer, i,
+                hkTer + hkCrossLink, i);
+              if no = fSwamp + 12 then
               begin
+                LF;
+                AddLine(Format(HelpText.Lookup('TRAFO'),
+                  [Phrases.Lookup('TERRAIN', TransTerrain + 24)]), pkTer,
+                  TransTerrain + 24, hkTer + hkCrossLink, TransTerrain + 24);
+              end
+              else if i = fGrass then
+              begin
+                LF;
+                AddLine(Format(HelpText.Lookup('TRAFO'),
+                  [Phrases.Lookup('TERRAIN', fGrass + 12)]), pkTer, fGrass + 12,
+                  hkTer + hkCrossLink, fGrass + 12);
+              end
+            end;
+            NextSection('SPECIAL');
+            if no = 3 * 12 then
+            begin
               LF;
-              AddLine(Format(HelpText.Lookup('TRAFO'),
-                [Phrases.Lookup('TERRAIN',TransTerrain+24)]),pkTer,TransTerrain+24,
-                hkTer+hkCrossLink,TransTerrain+24);
-              end
-            else if i=fGrass then
+              for special := 1 to 3 do
               begin
-              LF;
-              AddLine(Format(HelpText.Lookup('TRAFO'),
-                [Phrases.Lookup('TERRAIN',fGrass+12)]),pkTer,fGrass+12,
-                hkTer+hkCrossLink,fGrass+12);
-              end
-            end;
-          NextSection('SPECIAL');
-          if no=3*12 then
-            begin
-            LF;
-            for special:=1 to 3 do
-              begin
-              if special>1 then LF;
-              AddLine(Phrases.Lookup('TERRAIN',3*12+special),pkTer,3*12+special);
+                if special > 1 then
+                  LF;
+                AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + special), pkTer,
+                  3 * 12 + special);
               end
             end
-          else if (no<12) and (no<>fGrass) and (no<>fOcean) then
-            begin
-            LF;
-            for special:=1 to 2 do
-              if (no<>fArctic) and (no<>fSwamp) or (special<2) then
+            else if (no < 12) and (no <> fGrass) and (no <> fOcean) then
+            begin
+              LF;
+              for special := 1 to 2 do
+                if (no <> fArctic) and (no <> fSwamp) or (special < 2) then
                 begin
-                if special>1 then LF;
-                AddLine(Phrases.Lookup('TERRAIN',no+special*12),pkTer,no+special*12);
-                i:=FoodRes[special]-FoodRes[0];
-                if i<>0 then
-                  MainText[Count-1]:=MainText[Count-1]+Format(HelpText.Lookup('SPECIALFOOD'),[i]);
-                i:=ProdRes[special]-ProdRes[0];
-                if i<>0 then
-                  MainText[Count-1]:=MainText[Count-1]+Format(HelpText.Lookup('SPECIALPROD'),[i]);
-                i:=TradeRes[special]-TradeRes[0];
-                if i<>0 then
-                  MainText[Count-1]:=MainText[Count-1]+Format(HelpText.Lookup('SPECIALTRADE'),[i]);
+                  if special > 1 then
+                    LF;
+                  AddLine(Phrases.Lookup('TERRAIN', no + special * 12), pkTer,
+                    no + special * 12);
+                  i := FoodRes[special] - FoodRes[0];
+                  if i <> 0 then
+                    MainText[Count - 1] := MainText[Count - 1] +
+                      Format(HelpText.Lookup('SPECIALFOOD'), [i]);
+                  i := ProdRes[special] - ProdRes[0];
+                  if i <> 0 then
+                    MainText[Count - 1] := MainText[Count - 1] +
+                      Format(HelpText.Lookup('SPECIALPROD'), [i]);
+                  i := TradeRes[special] - TradeRes[0];
+                  if i <> 0 then
+                    MainText[Count - 1] := MainText[Count - 1] +
+                      Format(HelpText.Lookup('SPECIALTRADE'), [i]);
                 end;
             end;
-          if no=3*12 then
-            begin
-            LF;
-            AddText(HelpText.Lookup('RARE'));
-            end;
-          if (no<3*12) and (TerrType in [fDesert,fArctic]) then
-            begin
-            NextSection('SEEALSO');
-            AddImp(woGardens);
-            CheckSeeAlso:=true
+            if no = 3 * 12 then
+            begin
+              LF;
+              AddText(HelpText.Lookup('RARE'));
+            end;
+            if (no < 3 * 12) and (TerrType in [fDesert, fArctic]) then
+            begin
+              NextSection('SEEALSO');
+              AddImp(woGardens);
+              CheckSeeAlso := true
             end
           end
         end;
 
-    hkFeature:
-      if no=200 then
+      hkFeature:
+        if no = 200 then
         begin // complete feature list
-        Caption:=HelpText.Lookup('HELPTITLE_FEATURELIST');
-        List:=THyperText.Create;
-        for special:=0 to 2 do
+          Caption := HelpText.Lookup('HELPTITLE_FEATURELIST');
+          List := THyperText.Create;
+          for special := 0 to 2 do
           begin
-          if special>0 then begin LF; LF end;
-          case special of
-            0: AddLine(HelpText.Lookup('HELPTITLE_FEATURE1LIST'),pkSection);
-            1: AddLine(HelpText.Lookup('HELPTITLE_FEATURE2LIST'),pkSection);
-            2: AddLine(HelpText.Lookup('HELPTITLE_FEATURE3LIST'),pkSection);
-            end;
-          List.Clear;
-          for i:=0 to nFeature-1 do if Feature[i].Preq<>preNA then
-            begin
-            if i<mcFirstNonCap then j:=0
-            else if i in AutoFeature then j:=2
-            else j:=1;
-            if j=special then
-              List.AddLine(Phrases.Lookup('FEATURES',i),pkFeature,i,hkFeature,i);
-            end;
-          List.Sort;
-          AddStrings(List);
+            if special > 0 then
+            begin
+              LF;
+              LF
+            end;
+            case special of
+              0:
+                AddLine(HelpText.Lookup('HELPTITLE_FEATURE1LIST'), pkSection);
+              1:
+                AddLine(HelpText.Lookup('HELPTITLE_FEATURE2LIST'), pkSection);
+              2:
+                AddLine(HelpText.Lookup('HELPTITLE_FEATURE3LIST'), pkSection);
+            end;
+            List.Clear;
+            for i := 0 to nFeature - 1 do
+              if Feature[i].Preq <> preNA then
+              begin
+                if i < mcFirstNonCap then
+                  j := 0
+                else if i in AutoFeature then
+                  j := 2
+                else
+                  j := 1;
+                if j = special then
+                  List.AddLine(Phrases.Lookup('FEATURES', i), pkFeature, i,
+                    hkFeature, i);
+              end;
+            List.Sort;
+            AddStrings(List);
           end;
-        List.Free
+          List.Free
         end
-      else
+        else
         begin // single feature
-        Caption:=Phrases.Lookup('FEATURES',no);
-        LF;
-        AddLine(Phrases.Lookup('FEATURES',no),pkBigFeature,no);
-        if no<mcFirstNonCap then
-          AddLine(HelpText.Lookup('HELPSPEC_CAP'))
-        else if no in AutoFeature then
-          AddLine(HelpText.Lookup('HELPSPEC_STANDARD'))
-        else AddLine(HelpText.Lookup('HELPSPEC_FEATURE'));
-        NextSection('EFFECT');
-        AddText(HelpText.LookupByHandle(hFEATUREHELP,no));
-        if (Feature[no].Weight<>0) or (Feature[no].Cost<>0) then
+          Caption := Phrases.Lookup('FEATURES', no);
+          LF;
+          AddLine(Phrases.Lookup('FEATURES', no), pkBigFeature, no);
+          if no < mcFirstNonCap then
+            AddLine(HelpText.Lookup('HELPSPEC_CAP'))
+          else if no in AutoFeature then
+            AddLine(HelpText.Lookup('HELPSPEC_STANDARD'))
+          else
+            AddLine(HelpText.Lookup('HELPSPEC_FEATURE'));
+          NextSection('EFFECT');
+          AddText(HelpText.LookupByHandle(hFEATUREHELP, no));
+          if (Feature[no].Weight <> 0) or (Feature[no].Cost <> 0) then
           begin
-          NextSection('COSTS');
-          s:=IntToStr(Feature[no].Cost);
-          if Feature[no].Cost>=0 then s:='+'+s;
-          AddLine(Format(HelpText.Lookup('COSTBASE'),[s]));
-          if Feature[no].Weight>0 then
-            begin
-            AddLine(Format(HelpText.Lookup('WEIGHT'),
-              ['+'+IntToStr(Feature[no].Weight)]));
-            if no=mcDefense then
-              AddLine(Format(HelpText.Lookup('WEIGHT'),['+2']),pkDomain,dGround);
+            NextSection('COSTS');
+            s := IntToStr(Feature[no].Cost);
+            if Feature[no].Cost >= 0 then
+              s := '+' + s;
+            AddLine(Format(HelpText.Lookup('COSTBASE'), [s]));
+            if Feature[no].Weight > 0 then
+            begin
+              AddLine(Format(HelpText.Lookup('WEIGHT'),
+                ['+' + IntToStr(Feature[no].Weight)]));
+              if no = mcDefense then
+                AddLine(Format(HelpText.Lookup('WEIGHT'), ['+2']),
+                  pkDomain, dGround);
             end
           end;
-        if Feature[no].Preq<>preNone then
+          if Feature[no].Preq <> preNone then
           begin
+            LF;
+            if Feature[no].Preq = preSun then
+              AddPreqImp(woSun) // sun tsu feature
+            else
+              AddPreqAdv(Feature[no].Preq);
+            MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
+              [MainText[Count - 1]]);
+          end;
+          NextSection('SEEALSO');
+          CheckSeeAlso := true
+        end;
+
+      hkModel:
+        begin
+          Caption := HelpText.Lookup('HELPTITLE_MODELLIST');
+          for i := 0 to nSpecialModel - 1 do
+            if i <> 2 then
+              AddModelText(i);
           LF;
-          if Feature[no].Preq=preSun then AddPreqImp(woSun) // sun tsu feature
-          else AddPreqAdv(Feature[no].Preq);
-          MainText[Count-1]:=Format(HelpText.Lookup('REQUIRED'),[MainText[Count-1]]);
+          AddItem('MODELNOTE');
+        end;
+
+    end;
+    if CheckSeeAlso then
+      for i := 0 to nSeeAlso - 1 do
+        if (SeeAlso[i].Kind = Kind) and (SeeAlso[i].no = no) then
+          case SeeAlso[i].SeeKind of
+            hkImp:
+              AddImp(SeeAlso[i].SeeNo);
+            hkAdv:
+              AddAdv(SeeAlso[i].SeeNo);
+            hkFeature:
+              AddFeature(SeeAlso[i].SeeNo);
           end;
-        NextSection('SEEALSO');
-        CheckSeeAlso:=true
-        end;
-
-    hkModel:
-        begin
-        Caption:=HelpText.Lookup('HELPTITLE_MODELLIST');
-        for i:=0 to nSpecialModel-1 do if i<>2 then AddModelText(i);
-        LF;
-        AddItem('MODELNOTE');
-        end;
-
+    if (Headline >= 0) and (Count = Headline + 1) then
+      Delete(Headline)
+    else
+      LF;
+
+    InitPVSB(sb, Count - 1, InnerHeight div 24);
+    if sbPos <> 0 then
+    begin
+      sb.si.npos := sbPos;
+      sb.si.FMask := SIF_POS;
+      SetScrollInfo(sb.h, SB_CTL, sb.si, true);
     end;
-  if CheckSeeAlso then
-    for i:=0 to nSeeAlso-1 do
-      if (SeeAlso[i].Kind=Kind) and (SeeAlso[i].no=no) then
-        case SeeAlso[i].SeeKind of
-          hkImp: AddImp(SeeAlso[i].SeeNo);
-          hkAdv: AddAdv(SeeAlso[i].SeeNo);
-          hkFeature: AddFeature(SeeAlso[i].SeeNo);
-          end;
-  if (Headline>=0) and (Count=Headline+1) then Delete(Headline)
-  else LF;
-
-  InitPVSB(sb,Count-1,InnerHeight div 24);
-  if sbPos<>0 then
-    begin
-    sb.si.npos:=sbPos;
-    sb.si.FMask:=SIF_POS;
-    SetScrollInfo(sb.h,SB_CTL,sb.si,true);
-    end;
-  BackBtn.Visible:= nHist>0;
-  TopBtn.Visible:= (nHist>0) or (Kind<>hkMisc) or (no<>miscMain);
-  Sel:=-1;
+    BackBtn.Visible := nHist > 0;
+    TopBtn.Visible := (nHist > 0) or (Kind <> hkMisc) or (no <> miscMain);
+    Sel := -1;
   end; // with MainText
-end; {Prepare}
+end; { Prepare }
 
 procedure THelpDlg.ShowNewContent(NewMode, Category, Index: integer);
 begin
-if (Category<>Kind) or (Index<>no)
-  or (Category=hkMisc) and (Index=miscSearchResult) then
-  begin
-  if nHist=MaxHist then
-    begin
-    move(HistKind[2],HistKind[1],4*(nHist-2));
-    move(HistNo[2],HistNo[1],4*(nHist-2));
-    move(HistPos[2],HistPos[1],4*(nHist-2));
-    move(HistSearchContent[2],HistSearchContent[1],sizeof(shortstring)*(nHist-2));
+  if (Category <> Kind) or (Index <> no) or (Category = hkMisc) and
+    (Index = miscSearchResult) then
+  begin
+    if nHist = MaxHist then
+    begin
+      move(HistKind[2], HistKind[1], 4 * (nHist - 2));
+      move(HistNo[2], HistNo[1], 4 * (nHist - 2));
+      move(HistPos[2], HistPos[1], 4 * (nHist - 2));
+      move(HistSearchContent[2], HistSearchContent[1],
+        sizeof(shortstring) * (nHist - 2));
     end
-  else inc(nHist);
-  if nHist>0 then
-    begin
-    HistKind[nHist-1]:=Kind;
-    HistNo[nHist-1]:=no;
-    HistPos[nHist-1]:=sb.si.npos;
-    HistSearchContent[nHist-1]:=SearchContent
+    else
+      inc(nHist);
+    if nHist > 0 then
+    begin
+      HistKind[nHist - 1] := Kind;
+      HistNo[nHist - 1] := no;
+      HistPos[nHist - 1] := sb.si.npos;
+      HistSearchContent[nHist - 1] := SearchContent
     end
   end;
-Kind:=Category;
-no:=Index;
-SearchContent:=NewSearchContent;
-Prepare;
-OffscreenPaint;
-inherited ShowNewContent(NewMode);
+  Kind := Category;
+  no := Index;
+  SearchContent := NewSearchContent;
+  Prepare;
+  OffscreenPaint;
+  inherited ShowNewContent(NewMode);
 end;
 
@@ -1530 +1865 @@
   x, y: integer);
 var
-i0,Sel0:integer;
+  i0, Sel0: integer;
 begin
-y:=y-WideFrame;
-i0:=sb.si.npos;
-Sel0:=Sel;
-if (x>=SideFrame) and (x<SideFrame+InnerWidth) and (y>=0) and (y<InnerHeight)
-  and (y mod 24>=8) then
-  Sel:=y div 24
-else Sel:=-1;
-if (Sel+i0>=MainText.Count) or (Sel>=0)
-  and (THelpLineInfo(MainText.Objects[Sel+i0]).Link=0) then Sel:=-1;
-if Sel<>Sel0 then
-  begin
-  if Sel0<>-1 then line(Canvas,Sel0,false);
-  if Sel<>-1 then line(Canvas,Sel,true)
+  y := y - WideFrame;
+  i0 := sb.si.npos;
+  Sel0 := Sel;
+  if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
+    (y < InnerHeight) and (y mod 24 >= 8) then
+    Sel := y div 24
+  else
+    Sel := -1;
+  if (Sel + i0 >= MainText.Count) or (Sel >= 0) and
+    (THelpLineInfo(MainText.Objects[Sel + i0]).Link = 0) then
+    Sel := -1;
+  if Sel <> Sel0 then
+  begin
+    if Sel0 <> -1 then
+      line(Canvas, Sel0, false);
+    if Sel <> -1 then
+      line(Canvas, Sel, true)
   end
 end;
 
-procedure THelpDlg.PaintBox1MouseDown(Sender: TObject;
-  Button: TMouseButton; Shift: TShiftState; x, y: integer);
+procedure THelpDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; x, y: integer);
 begin
-if Sel>=0 then with THelpLineInfo(MainText.Objects[Sel+sb.si.npos]) do
-  if Link shr 8 and $3F=hkInternet then
-    case Link and $FF of
-      1: ShellExecute(Handle,'open',pchar(HomeDir+'AI Template\AI development manual.html'),'','',
-        SW_SHOWNORMAL);
-      2: ShellExecute(Handle,'open','http://c-evo.org','','',
-        SW_SHOWNORMAL);
-      3: ShellExecute(Handle,'open','http://c-evo.org/_sg/contact','','',
-        SW_SHOWNORMAL);
+  if Sel >= 0 then
+    with THelpLineInfo(MainText.Objects[Sel + sb.si.npos]) do
+      if Link shr 8 and $3F = hkInternet then
+        case Link and $FF of
+          1:
+            ShellExecute(Handle, 'open',
+              pchar(HomeDir + 'AI Template\AI development manual.html'), '', '',
+              SW_SHOWNORMAL);
+          2:
+            ShellExecute(Handle, 'open', 'http://c-evo.org', '', '',
+              SW_SHOWNORMAL);
+          3:
+            ShellExecute(Handle, 'open', 'http://c-evo.org/_sg/contact', '', '',
+              SW_SHOWNORMAL);
+        end
+      else
+      begin
+        if (Link >= $8000) and (Link and $3FFF = liInvalid) then
+          exit; // invalid link;
+        if Link >= $8000 then
+          ShowNewContent(FWindowMode, hkText, Link and $3FFF)
+        else
+          ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
       end
-  else
-    begin
-    if (Link>=$8000) and (Link and $3FFF=liInvalid) then
-      exit; // invalid link;
-    if Link>=$8000 then
-      ShowNewContent(FWindowMode, hkText, Link and $3FFF)
-    else ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
-    end
 end;
 
 procedure THelpDlg.BackBtnClick(Sender: TObject);
 begin
-if nHist>0 then
-  begin
-  dec(nHist);
-  if (HistKind[nHist]=hkMisc) and (HistNo[nHist]=miscSearchResult)
-    and (HistSearchContent[nHist]<>SearchContent) then
-    begin
-    SearchContent:=HistSearchContent[nHist];
-    Search(SearchContent);
+  if nHist > 0 then
+  begin
+    dec(nHist);
+    if (HistKind[nHist] = hkMisc) and (HistNo[nHist] = miscSearchResult) and
+      (HistSearchContent[nHist] <> SearchContent) then
+    begin
+      SearchContent := HistSearchContent[nHist];
+      Search(SearchContent);
     end;
-  Kind:=HistKind[nHist];
-  no:=HistNo[nHist];
-  Prepare(HistPos[nHist]);
+    Kind := HistKind[nHist];
+    no := HistNo[nHist];
+    Prepare(HistPos[nHist]);
+    OffscreenPaint;
+    Invalidate;
+  end
+end;
+
+procedure THelpDlg.TopBtnClick(Sender: TObject);
+begin
+  nHist := 0;
+  Kind := hkMisc;
+  no := miscMain;
+  Prepare;
   OffscreenPaint;
   Invalidate;
-  end
-end;
-
-procedure THelpDlg.TopBtnClick(Sender: TObject);
-begin
-nHist:=0;
-Kind:=hkMisc;
-no:=miscMain;
-Prepare;
-OffscreenPaint;
-Invalidate;
 end;
 
 procedure THelpDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-ExtPic.Height:=0;
-inherited;
+  ExtPic.Height := 0;
+  inherited;
 end;
 
 function THelpDlg.TextIndex(Item: string): integer;
 begin
-result:=HelpText.GetHandle(Item)
+  result := HelpText.Gethandle(Item)
 end;
 
@@ -1614 +1959 @@
   Shift: TShiftState);
 begin
-if Key=VK_F1 then // my key
-else inherited
+  if Key = VK_F1 then // my key
+  else
+    inherited
 end;
 
 procedure THelpDlg.SearchBtnClick(Sender: TObject);
 begin
-InputDlg.Caption:=Phrases.Lookup('SEARCH');
-InputDlg.EInput.Text:=SearchContent;
-InputDlg.CenterToRect(BoundsRect);
-InputDlg.ShowModal;
-if (InputDlg.ModalResult=mrOK) and (length(InputDlg.EInput.Text)>=2) then
-  begin
-  Search(InputDlg.EInput.Text);
-  case SearchResult.Count of
-    0: SimpleMessage(Format(HelpText.Lookup('NOMATCHES'), [InputDlg.EInput.Text]));
-    1:
-      with THelpLineInfo(SearchResult.Objects[0]) do
-        if Link>=$8000 then
-          ShowNewContent(FWindowMode, hkText, Link and $3FFF)
-        else ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
+  InputDlg.Caption := Phrases.Lookup('SEARCH');
+  InputDlg.EInput.Text := SearchContent;
+  InputDlg.CenterToRect(BoundsRect);
+  InputDlg.ShowModal;
+  if (InputDlg.ModalResult = mrOK) and (length(InputDlg.EInput.Text) >= 2) then
+  begin
+    Search(InputDlg.EInput.Text);
+    case SearchResult.Count of
+      0:
+        SimpleMessage(Format(HelpText.Lookup('NOMATCHES'),
+          [InputDlg.EInput.Text]));
+      1:
+        with THelpLineInfo(SearchResult.Objects[0]) do
+          if Link >= $8000 then
+            ShowNewContent(FWindowMode, hkText, Link and $3FFF)
+          else
+            ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
     else
       begin
-      NewSearchContent:=InputDlg.EInput.Text;
-      ShowNewContent(FWindowMode, hkMisc, miscSearchResult);
+        NewSearchContent := InputDlg.EInput.Text;
+        ShowNewContent(FWindowMode, hkMisc, miscSearchResult);
       end
     end
@@ -1645 +1994 @@
 procedure THelpDlg.Search(SearchString: string);
 var
-h, i, PrevHandle, PrevIndex, p, RightMargin: integer;
-s: string;
-mADVHELP, mIMPHELP, mFEATUREHELP: set of 0..255;
-bGOVHELP, bSPECIALMODEL, bJOBHELP: boolean;
+  h, i, PrevHandle, PrevIndex, p, RightMargin: integer;
+  s: string;
+  mADVHELP, mIMPHELP, mFEATUREHELP: set of 0 .. 255;
+  bGOVHELP, bSPECIALMODEL, bJOBHELP: boolean;
 begin
-SearchResult.Clear;
-mADVHELP:=[];
-mIMPHELP:=[];
-mFEATUREHELP:=[];
-bGOVHELP:=false;
-bSPECIALMODEL:=false;
-bJOBHELP:=false;
-
-// search in generic reference
-SearchString:=UpperCase(SearchString);
-for i:=0 to 35+4 do
-  begin
-  s:=Phrases.Lookup('TERRAIN',i);
-  if pos(SearchString,UpperCase(s))>0 then
-    if i<36 then
-      SearchResult.AddLine(s+' '+HelpText.Lookup('HELPSPEC_TER'),pkNormal,0,
-        hkTer+hkCrossLink,i)
-    else
+  SearchResult.Clear;
+  mADVHELP := [];
+  mIMPHELP := [];
+  mFEATUREHELP := [];
+  bGOVHELP := false;
+  bSPECIALMODEL := false;
+  bJOBHELP := false;
+
+  // search in generic reference
+  SearchString := UpperCase(SearchString);
+  for i := 0 to 35 + 4 do
+  begin
+    s := Phrases.Lookup('TERRAIN', i);
+    if pos(SearchString, UpperCase(s)) > 0 then
+      if i < 36 then
+        SearchResult.AddLine(s + ' ' + HelpText.Lookup('HELPSPEC_TER'),
+          pkNormal, 0, hkTer + hkCrossLink, i)
+      else
       begin
-      SearchResult.AddLine(Phrases.Lookup('TERRAIN',36)+' '
-        +HelpText.Lookup('HELPSPEC_TER'),pkNormal,0,hkTer+hkCrossLink,36);
-      if i>36 then
-        SearchResult.AddLine(Phrases.Lookup('IMPROVEMENTS',imShipComp+i-37)
-          +' '+HelpText.Lookup('HELPSPEC_SHIPPART'),
-          pkNormal,0,hkImp+hkCrossLink,imShipComp+i-37);
-      break
+        SearchResult.AddLine(Phrases.Lookup('TERRAIN', 36) + ' ' +
+          HelpText.Lookup('HELPSPEC_TER'), pkNormal, 0,
+          hkTer + hkCrossLink, 36);
+        if i > 36 then
+          SearchResult.AddLine(Phrases.Lookup('IMPROVEMENTS',
+            imShipComp + i - 37) + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART'),
+            pkNormal, 0, hkImp + hkCrossLink, imShipComp + i - 37);
+        Break
       end
   end;
-for i:=0 to nJobHelp-1 do
-  if pos(SearchString,UpperCase(Phrases.Lookup('JOBRESULT',JobHelp[i])))>0 then
-    begin
-    SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'),pkNormal,0,
-      hkMisc+hkCrossLink,miscJobList);
-    bJOBHELP:=true;
-    break
+  for i := 0 to nJobHelp - 1 do
+    if pos(SearchString, UpperCase(Phrases.Lookup('JOBRESULT', JobHelp[i]))) > 0
+    then
+    begin
+      SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
+        hkMisc + hkCrossLink, miscJobList);
+      bJOBHELP := true;
+      Break
     end;
-for i:=0 to nAdv-1 do
-  begin
-  s:=Phrases.Lookup('ADVANCES',i);
-  if pos(SearchString,UpperCase(s))>0 then
-    begin
-    if i in FutureTech then s:=s+' '+HelpText.Lookup('HELPSPEC_FUTURE')
-    else s:=s+' '+HelpText.Lookup('HELPSPEC_ADV');
-    SearchResult.AddLine(s,pkNormal,0,hkAdv+hkCrossLink,i);
-    include(mADVHELP,i);
+  for i := 0 to nAdv - 1 do
+  begin
+    s := Phrases.Lookup('ADVANCES', i);
+    if pos(SearchString, UpperCase(s)) > 0 then
+    begin
+      if i in FutureTech then
+        s := s + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
+      else
+        s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
+      SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i);
+      include(mADVHELP, i);
     end
   end;
-for i:=0 to nSpecialModel-1 do
-  begin
-  FindStdModelPicture(SpecialModelPictureCode[i],h,s);
-  if pos(SearchString,UpperCase(s))>0 then
-    begin
-    SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'),pkNormal,0,
-      hkModel+hkCrossLink,0);
-    bSPECIALMODEL:=true;
-    break
+  for i := 0 to nSpecialModel - 1 do
+  begin
+    FindStdModelPicture(SpecialModelPictureCode[i], h, s);
+    if pos(SearchString, UpperCase(s)) > 0 then
+    begin
+      SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal, 0,
+        hkModel + hkCrossLink, 0);
+      bSPECIALMODEL := true;
+      Break
     end;
   end;
-for i:=0 to nFeature-1 do
-  begin
-  s:=Phrases.Lookup('FEATURES',i);
-  if pos(SearchString,UpperCase(s))>0 then
-    begin
-    if i<mcFirstNonCap then s:=s+' '+HelpText.Lookup('HELPSPEC_CAP')
-    else if i in AutoFeature then s:=s+' '+HelpText.Lookup('HELPSPEC_STANDARD')
-    else s:=s+' '+HelpText.Lookup('HELPSPEC_FEATURE');
-    SearchResult.AddLine(s,pkNormal,0,hkFeature+hkCrossLink,i);
-    include(mFEATUREHELP,i);
+  for i := 0 to nFeature - 1 do
+  begin
+    s := Phrases.Lookup('FEATURES', i);
+    if pos(SearchString, UpperCase(s)) > 0 then
+    begin
+      if i < mcFirstNonCap then
+        s := s + ' ' + HelpText.Lookup('HELPSPEC_CAP')
+      else if i in AutoFeature then
+        s := s + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
+      else
+        s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
+      SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
+      include(mFEATUREHELP, i);
     end
   end;
-for i:=0 to nImp-1 do
-  begin
-  s:=Phrases.Lookup('IMPROVEMENTS',i);
-  if pos(SearchString,UpperCase(s))>0 then
-    begin
-    case Imp[i].Kind of
-      ikWonder: s:=s+' '+HelpText.Lookup('HELPSPEC_WONDER');
-      ikCommon: s:=s+' '+HelpText.Lookup('HELPSPEC_IMP');
-      ikShipPart: s:=s+' '+HelpText.Lookup('HELPSPEC_SHIPPART');
-      else s:=s+' '+HelpText.Lookup('HELPSPEC_NAT')
+  for i := 0 to nImp - 1 do
+  begin
+    s := Phrases.Lookup('IMPROVEMENTS', i);
+    if pos(SearchString, UpperCase(s)) > 0 then
+    begin
+      case Imp[i].Kind of
+        ikWonder:
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
+        ikCommon:
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_IMP');
+        ikShipPart:
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
+      else
+        s := s + ' ' + HelpText.Lookup('HELPSPEC_NAT')
       end;
-    SearchResult.AddLine(s,pkNormal,0,hkImp+hkCrossLink,i);
-    include(mIMPHELP,i);
+      SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i);
+      include(mIMPHELP, i);
     end
   end;
-for i:=0 to nGov-1 do
-  if pos(SearchString,UpperCase(Phrases.Lookup('GOVERNMENT',i)))>0 then
-    begin
-    SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'),pkNormal,0,
-      hkMisc+hkCrossLink,miscGovList);
-    bGOVHELP:=true;
-    break
+  for i := 0 to nGov - 1 do
+    if pos(SearchString, UpperCase(Phrases.Lookup('GOVERNMENT', i))) > 0 then
+    begin
+      SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkNormal, 0,
+        hkMisc + hkCrossLink, miscGovList);
+      bGOVHELP := true;
+      Break
     end;
 
-// full text search
-h:=-1;
-repeat
-  PrevHandle:=h;
-  PrevIndex:=i;
-  if not HelpText.Search(SearchString, h, i) then
-    break;
-  if h=hADVHELP then
-    begin
-    if (i>=0) and ((i<>PrevIndex) or (h<>PrevHandle)) and not (i in mADVHELP) then
+  // full text search
+  h := -1;
+  repeat
+    PrevHandle := h;
+    PrevIndex := i;
+    if not HelpText.Search(SearchString, h, i) then
+      Break;
+    if h = hADVHELP then
+    begin
+      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
+        not(i in mADVHELP) then
       begin
-      s:=Phrases.Lookup('ADVANCES',i);
-      if i in FutureTech then s:=s+' '+HelpText.Lookup('HELPSPEC_FUTURE')
-      else s:=s+' '+HelpText.Lookup('HELPSPEC_ADV');
-      SearchResult.AddLine(s,pkNormal,0,hkAdv+hkCrossLink,i)
+        s := Phrases.Lookup('ADVANCES', i);
+        if i in FutureTech then
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
+        else
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
+        SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i)
       end
     end
-  else if h=hIMPHELP then
-    begin
-    if (i>=0) and ((i<>PrevIndex) or (h<>PrevHandle)) and not (i in mIMPHELP) then
+    else if h = hIMPHELP then
+    begin
+      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
+        not(i in mIMPHELP) then
       begin
-      s:=Phrases.Lookup('IMPROVEMENTS',i);
-      case Imp[i].Kind of
-        ikWonder: s:=s+' '+HelpText.Lookup('HELPSPEC_WONDER');
-        ikCommon: s:=s+' '+HelpText.Lookup('HELPSPEC_IMP');
-        ikShipPart: s:=s+' '+HelpText.Lookup('HELPSPEC_SHIPPART');
-        else s:=s+' '+HelpText.Lookup('HELPSPEC_NAT')
+        s := Phrases.Lookup('IMPROVEMENTS', i);
+        case Imp[i].Kind of
+          ikWonder:
+            s := s + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
+          ikCommon:
+            s := s + ' ' + HelpText.Lookup('HELPSPEC_IMP');
+          ikShipPart:
+            s := s + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
+        else
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_NAT')
         end;
-      SearchResult.AddLine(s,pkNormal,0,hkImp+hkCrossLink,i)
+        SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i)
       end
     end
-  else if h=hFEATUREHELP then
-    begin
-    if (i>=0) and ((i<>PrevIndex) or (h<>PrevHandle)) and not (i in mFEATUREHELP) then
+    else if h = hFEATUREHELP then
+    begin
+      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
+        not(i in mFEATUREHELP) then
       begin
-      s:=Phrases.Lookup('FEATURES',i);
-      if i<mcFirstNonCap then s:=s+' '+HelpText.Lookup('HELPSPEC_CAP')
-      else if i in AutoFeature then s:=s+' '+HelpText.Lookup('HELPSPEC_STANDARD')
-      else s:=s+' '+HelpText.Lookup('HELPSPEC_FEATURE');
-      SearchResult.AddLine(s,pkNormal,0,hkFeature+hkCrossLink,i);
+        s := Phrases.Lookup('FEATURES', i);
+        if i < mcFirstNonCap then
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_CAP')
+        else if i in AutoFeature then
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
+        else
+          s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
+        SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
       end
     end
-  else if h=hGOVHELP then
-    begin
-    if (i>=0) and (h<>PrevHandle) and not bGOVHELP then
-      SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'),pkNormal,0,
-        hkMisc+hkCrossLink,miscGovList)
+    else if h = hGOVHELP then
+    begin
+      if (i >= 0) and (h <> PrevHandle) and not bGOVHELP then
+        SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkNormal, 0,
+          hkMisc + hkCrossLink, miscGovList)
     end
-  else if h=hSPECIALMODEL then
-    begin
-    if (i>=0) and (h<>PrevHandle) and not bSPECIALMODEL then
-      SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'),pkNormal,0,
-        hkModel+hkCrossLink,0)
+    else if h = hSPECIALMODEL then
+    begin
+      if (i >= 0) and (h <> PrevHandle) and not bSPECIALMODEL then
+        SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal,
+          0, hkModel + hkCrossLink, 0)
     end
-  else if h=hJOBHELP then
-    begin
-    if (i>=0) and (h<>PrevHandle) and not bJOBHELP then
-      SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'),pkNormal,0,
-        hkMisc+hkCrossLink,miscJobList)
+    else if h = hJOBHELP then
+    begin
+      if (i >= 0) and (h <> PrevHandle) and not bJOBHELP then
+        SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
+          hkMisc + hkCrossLink, miscJobList)
     end
-  else if {(h<>hMAIN) and} (h<>PrevHandle) then
-    begin
-    s:=HelpText.LookupByHandle(h);
-    p:=pos('$',s);
-    if p>0 then
+    else if { (h<>hMAIN) and } (h <> PrevHandle) then
+    begin
+      s := HelpText.LookupByHandle(h);
+      p := pos('$', s);
+      if p > 0 then
       begin
-      s:=copy(s,p+1,maxint);
-      p:=pos('\',s);
-      if p>0 then
-        s:=copy(s,1,p-1);
-      SearchResult.AddLine(s, pkNormal, 0, hkText+hkCrossLink, h);
+        s := copy(s, p + 1, maxint);
+        p := pos('\', s);
+        if p > 0 then
+          s := copy(s, 1, p - 1);
+        SearchResult.AddLine(s, pkNormal, 0, hkText + hkCrossLink, h);
       end
     end
-until false;
-
-// cut lines to fit to window
-RightMargin:=InnerWidth-16-GetSystemMetrics(SM_CXVSCROLL);
-Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-for i:=0 to SearchResult.Count-1 do
-  begin
-  while BiColorTextWidth(Offscreen.Canvas, SearchResult[i])>RightMargin-32 do
-    SearchResult[i]:=copy(SearchResult[i], 1, length(SearchResult[i])-1)
-  end;
-end;
+    until false;
+
+    // cut lines to fit to window
+    RightMargin := InnerWidth - 16 - GetSystemMetrics(SM_CXVSCROLL);
+    OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
+    for i := 0 to SearchResult.Count - 1 do
+    begin
+      while BiColorTextWidth(OffScreen.Canvas, SearchResult[i]) >
+        RightMargin - 32 do
+        SearchResult[i] := copy(SearchResult[i], 1, length(SearchResult[i]) - 1)
+    end;
+  end;
 
 end.
-

trunk/LocalPlayer/IsoEngine.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit IsoEngine;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ClientTools,ScreenTools,Tribes,
-  {$IFNDEF SCR}Term,{$ENDIF}
-
-  Windows,SysUtils,Classes,Graphics;
+  Protocol, ClientTools, ScreenTools, Tribes,
+{$IFNDEF SCR}Term, {$ENDIF}
+  Windows, SysUtils, Classes, Graphics;
 
 type
-TInitEnemyModelEvent=function(emix: integer): boolean;
-
-TIsoMap = class
-  constructor Create;
-  procedure SetOutput(Output: TBitmap);
-  procedure SetPaintBounds(Left, Top, Right, Bottom: integer);
-  procedure Paint(x,y,Loc,nx,ny,CityLoc,CityOwner:integer; UseBlink: boolean = false; CityAllowClick: boolean = false);
-  procedure PaintUnit(x,y:integer;const UnitInfo:TUnitInfo;Status:integer);
-  procedure PaintCity(x,y:integer;const CityInfo:TCityInfo; accessory: boolean = true);
-  procedure BitBlt(Src: TBitmap; x,y,Width,Height,xSrc,ySrc,Rop: integer);
-
-  procedure AttackBegin(const ShowMove: TShowMove);
-  procedure AttackEffect(const ShowMove: TShowMove);
-  procedure AttackEnd;
-
-protected
-  FOutput: TBitmap;
-  FLeft, FTop, FRight, FBottom, RealTop, RealBottom, AttLoc, DefLoc, DefHealth, FAdviceLoc: integer;
-  OutDC, DataDC, MaskDC: Cardinal;
-  function Connection4(Loc,Mask,Value:integer):integer;
-  function Connection8(Loc,Mask:integer):integer;
-  function OceanConnection(Loc: integer): integer;
-  procedure PaintShore(x,y,Loc:integer);
-  procedure PaintTileExtraTerrain(x,y,Loc: integer);
-  procedure PaintTileObjects(x,y,Loc,CityLoc,CityOwner:integer; UseBlink: boolean);
-  procedure PaintGrid(x,y,nx,ny: integer);
-  procedure FillRect(x,y,Width,Height,Color: integer);
-  procedure Textout(x,y,Color: integer; const s: string);
-  procedure Sprite(HGr,xDst,yDst,Width,Height,xGr,yGr: integer);
-  procedure TSprite(xDst,yDst,grix: integer; PureBlack: boolean = false);
-
-public
-  property AdviceLoc: integer read FAdviceLoc write FAdviceLoc;
+  TInitEnemyModelEvent = function(emix: integer): boolean;
+
+  TIsoMap = class
+    constructor Create;
+    procedure SetOutput(Output: TBitmap);
+    procedure SetPaintBounds(Left, Top, Right, Bottom: integer);
+    procedure Paint(x, y, Loc, nx, ny, CityLoc, CityOwner: integer;
+      UseBlink: boolean = false; CityAllowClick: boolean = false);
+    procedure PaintUnit(x, y: integer; const UnitInfo: TUnitInfo;
+      Status: integer);
+    procedure PaintCity(x, y: integer; const CityInfo: TCityInfo;
+      accessory: boolean = true);
+    procedure BitBlt(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
+      Rop: integer);
+
+    procedure AttackBegin(const ShowMove: TShowMove);
+    procedure AttackEffect(const ShowMove: TShowMove);
+    procedure AttackEnd;
+
+  protected
+    FOutput: TBitmap;
+    FLeft, FTop, FRight, FBottom, RealTop, RealBottom, AttLoc, DefLoc,
+      DefHealth, FAdviceLoc: integer;
+    OutDC, DataDC, MaskDC: Cardinal;
+    function Connection4(Loc, Mask, Value: integer): integer;
+    function Connection8(Loc, Mask: integer): integer;
+    function OceanConnection(Loc: integer): integer;
+    procedure PaintShore(x, y, Loc: integer);
+    procedure PaintTileExtraTerrain(x, y, Loc: integer);
+    procedure PaintTileObjects(x, y, Loc, CityLoc, CityOwner: integer;
+      UseBlink: boolean);
+    procedure PaintGrid(x, y, nx, ny: integer);
+    procedure FillRect(x, y, Width, Height, Color: integer);
+    procedure Textout(x, y, Color: integer; const s: string);
+    procedure Sprite(HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
+    procedure TSprite(xDst, yDst, grix: integer; PureBlack: boolean = false);
+
+  public
+    property AdviceLoc: integer read FAdviceLoc write FAdviceLoc;
   end;
 
-
 const
-// options switched by buttons
-moPolitical=0; moCityNames=1; moGreatWall=4; moGrid=5; moBareTerrain=6;
-
-// other options
-moEditMode=16; moLocCodes=17;
-
+  // options switched by buttons
+  moPolitical = 0;
+  moCityNames = 1;
+  moGreatWall = 4;
+  moGrid = 5;
+  moBareTerrain = 6;
+
+  // other options
+  moEditMode = 16;
+  moLocCodes = 17;
 
 var
-NoMap: TIsoMap;
-Options: integer;
-pDebugMap: integer; //-1 for off
-
+  NoMap: TIsoMap;
+  Options: integer;
+  pDebugMap: integer; // -1 for off
 
 function IsJungle(y: integer): boolean;
@@ -68 +74 @@
 procedure Reset;
 
-
 implementation
 
 const
-ShoreDither=fGrass;
-TerrainIconLines=21;
+  ShoreDither = fGrass;
+  TerrainIconLines = 21;
 
 var
-BordersOK: integer;
-OnInitEnemyModel: TInitEnemyModelEvent;
-LandPatch,OceanPatch, Borders: TBitmap;
-TSpriteSize: array[0..TerrainIconLines*9-1] of TRect;
-DebugMap: ^TTileList;
-CitiesPictures: array[2..3,0..3] of TCityPicture;
-FoW, ShowLoc, ShowCityNames, ShowObjects, ShowBorder, ShowMyBorder,
-  ShowGrWall, ShowDebug: boolean;
+  BordersOK: integer;
+  OnInitEnemyModel: TInitEnemyModelEvent;
+  LandPatch, OceanPatch, Borders: TBitmap;
+  TSpriteSize: array [0 .. TerrainIconLines * 9 - 1] of TRect;
+  DebugMap: ^TTileList;
+  CitiesPictures: array [2 .. 3, 0 .. 3] of TCityPicture;
+  FoW, ShowLoc, ShowCityNames, ShowObjects, ShowBorder, ShowMyBorder,
+    ShowGrWall, ShowDebug: boolean;
 
 function IsJungle(y: integer): boolean;
 begin
-result:= (y>(G.ly-2) div 4) and (G.ly-1-y>(G.ly-2) div 4)
+  result := (y > (G.ly - 2) div 4) and (G.ly - 1 - y > (G.ly - 2) div 4)
 end;
 
 procedure Init(InitEnemyModelHandler: TInitEnemyModelEvent);
 begin
-OnInitEnemyModel:=InitEnemyModelHandler;
-if NoMap<>nil then
-  NoMap.Free;
-NoMap:=TIsoMap.Create;
+  OnInitEnemyModel := InitEnemyModelHandler;
+  if NoMap <> nil then
+    NoMap.Free;
+  NoMap := TIsoMap.Create;
 end;
 
 function ApplyTileSize(xxtNew, yytNew: integer): boolean;
 type
-TLine=array[0..INFIN,0..2] of Byte;
+  TLine = array [0 .. INFIN, 0 .. 2] of Byte;
 var
-i,x,y,xSrc,ySrc,HGrTerrainNew,HGrCitiesNew,age,size:integer;
-LandMore,OceanMore,DitherMask,Mask24: TBitmap;
-MaskLine: array[0..32*3-1] of ^TLine; // 32 = assumed maximum for yyt
-Border: boolean;
+  i, x, y, xSrc, ySrc, HGrTerrainNew, HGrCitiesNew, age, size: integer;
+  LandMore, OceanMore, DitherMask, Mask24: TBitmap;
+  MaskLine: array [0 .. 32 * 3 - 1] of ^TLine; // 32 = assumed maximum for yyt
+  Border: boolean;
 begin
-result:=false;
-HGrTerrainNew:=LoadGraphicSet(Format('Terrain%dx%d',[xxtNew*2,yytNew*2]));
-if HGrTerrainNew<0 then
-  exit;
-HGrCitiesNew:=LoadGraphicSet(Format('Cities%dx%d',[xxtNew*2,yytNew*2]));
-if HGrCitiesNew<0 then
-  exit;
-xxt:=xxtNew; yyt:=yytNew;
-HGrTerrain:=HGrTerrainNew;
-HGrCities:=HGrCitiesNew;
-result:=true;
-
-// prepare age 2+3 cities
-for age:=2 to 3 do
-  for size:=0 to 3 do with CitiesPictures[age,size] do
-    FindPosition(HGrCities,size*(xxt*2+1),(age-2)*(yyt*3+1),xxt*2-1,yyt*3-1,
-      $00FFFF,xShield,yShield);
-
-{prepare dithered ground tiles}
-if LandPatch<>nil then
-  LandPatch.Free;
-LandPatch:=TBitmap.Create;
-LandPatch.PixelFormat:=pf24bit;
-LandPatch.Canvas.Brush.Color:=0;
-LandPatch.Width:=xxt*18; LandPatch.Height:=yyt*9;
-if OceanPatch<>nil then
-  OceanPatch.Free;
-OceanPatch:=TBitmap.Create;
-OceanPatch.PixelFormat:=pf24bit;
-OceanPatch.Canvas.Brush.Color:=0;
-OceanPatch.Width:=xxt*8; OceanPatch.Height:=yyt*4;
-LandMore:=TBitmap.Create;
-LandMore.PixelFormat:=pf24bit;
-LandMore.Canvas.Brush.Color:=0;
-LandMore.Width:=xxt*18; LandMore.Height:=yyt*9;
-OceanMore:=TBitmap.Create;
-OceanMore.PixelFormat:=pf24bit;
-OceanMore.Canvas.Brush.Color:=0;
-OceanMore.Width:=xxt*8; OceanMore.Height:=yyt*4;
-DitherMask:=TBitmap.Create;
-DitherMask.PixelFormat:=pf24bit;
-DitherMask.Width:=xxt*2; DitherMask.Height:=yyt*2;
-BitBlt(DitherMask.Canvas.Handle,0,0,xxt*2,yyt*2,
-  GrExt[HGrTerrain].Mask.Canvas.Handle,1+7*(xxt*2+1),1+yyt+15*(yyt*3+1),SRCAND);
-
-for x:=-1 to 6 do
+  result := false;
+  HGrTerrainNew := LoadGraphicSet(Format('Terrain%dx%d',
+    [xxtNew * 2, yytNew * 2]));
+  if HGrTerrainNew < 0 then
+    exit;
+  HGrCitiesNew := LoadGraphicSet(Format('Cities%dx%d',
+    [xxtNew * 2, yytNew * 2]));
+  if HGrCitiesNew < 0 then
+    exit;
+  xxt := xxtNew;
+  yyt := yytNew;
+  HGrTerrain := HGrTerrainNew;
+  HGrCities := HGrCitiesNew;
+  result := true;
+
+  // prepare age 2+3 cities
+  for age := 2 to 3 do
+    for size := 0 to 3 do
+      with CitiesPictures[age, size] do
+        FindPosition(HGrCities, size * (xxt * 2 + 1), (age - 2) * (yyt * 3 + 1),
+          xxt * 2 - 1, yyt * 3 - 1, $00FFFF, xShield, yShield);
+
+  { prepare dithered ground tiles }
+  if LandPatch <> nil then
+    LandPatch.Free;
+  LandPatch := TBitmap.Create;
+  LandPatch.PixelFormat := pf24bit;
+  LandPatch.Canvas.Brush.Color := 0;
+  LandPatch.Width := xxt * 18;
+  LandPatch.Height := yyt * 9;
+  if OceanPatch <> nil then
+    OceanPatch.Free;
+  OceanPatch := TBitmap.Create;
+  OceanPatch.PixelFormat := pf24bit;
+  OceanPatch.Canvas.Brush.Color := 0;
+  OceanPatch.Width := xxt * 8;
+  OceanPatch.Height := yyt * 4;
+  LandMore := TBitmap.Create;
+  LandMore.PixelFormat := pf24bit;
+  LandMore.Canvas.Brush.Color := 0;
+  LandMore.Width := xxt * 18;
+  LandMore.Height := yyt * 9;
+  OceanMore := TBitmap.Create;
+  OceanMore.PixelFormat := pf24bit;
+  OceanMore.Canvas.Brush.Color := 0;
+  OceanMore.Width := xxt * 8;
+  OceanMore.Height := yyt * 4;
+  DitherMask := TBitmap.Create;
+  DitherMask.PixelFormat := pf24bit;
+  DitherMask.Width := xxt * 2;
+  DitherMask.Height := yyt * 2;
+  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt * 2,
+    GrExt[HGrTerrain].Mask.Canvas.Handle, 1 + 7 * (xxt * 2 + 1),
+    1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
+
+  for x := -1 to 6 do
   begin
-  if x=-1 then begin xSrc:=ShoreDither*(xxt*2+1)+1; ySrc:=1+yyt end
-  else if x=6 then begin xSrc:=1+(xxt*2+1)*2; ySrc:=1+yyt+(yyt*3+1)*2 end
-  else begin xSrc:=(x+2)*(xxt*2+1)+1; ySrc:=1+yyt end;
-  for y:=-1 to 6 do
-    BitBlt(LandPatch.Canvas.Handle,(x+2)*(xxt*2),(y+2)*yyt,xxt*2,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc,SRCCOPY);
-  for y:=-2 to 6 do
-    BitBlt(LandPatch.Canvas.Handle,(x+2)*(xxt*2),(y+2)*yyt,xxt,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc+xxt,ySrc+yyt,SRCPAINT);
-  for y:=-2 to 6 do
-    BitBlt(LandPatch.Canvas.Handle,(x+2)*(xxt*2)+xxt,(y+2)*yyt,xxt,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc+yyt,SRCPAINT);
-  for y:=-2 to 6 do
-    BitBlt(LandPatch.Canvas.Handle,(x+2)*(xxt*2),(y+2)*yyt,xxt,yyt,
-      DitherMask.Canvas.Handle,xxt,yyt,SRCAND);
-  for y:=-2 to 6 do
-    BitBlt(LandPatch.Canvas.Handle,(x+2)*(xxt*2)+xxt,(y+2)*yyt,xxt,yyt,
-      DitherMask.Canvas.Handle,0,yyt,SRCAND);
+    if x = -1 then
+    begin
+      xSrc := ShoreDither * (xxt * 2 + 1) + 1;
+      ySrc := 1 + yyt
+    end
+    else if x = 6 then
+    begin
+      xSrc := 1 + (xxt * 2 + 1) * 2;
+      ySrc := 1 + yyt + (yyt * 3 + 1) * 2
+    end
+    else
+    begin
+      xSrc := (x + 2) * (xxt * 2 + 1) + 1;
+      ySrc := 1 + yyt
+    end;
+    for y := -1 to 6 do
+      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
+        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc,
+        SRCCOPY);
+    for y := -2 to 6 do
+      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+        yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt,
+        SRCPAINT);
+    for y := -2 to 6 do
+      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+        xxt, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt,
+        SRCPAINT);
+    for y := -2 to 6 do
+      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+        yyt, DitherMask.Canvas.Handle, xxt, yyt, SRCAND);
+    for y := -2 to 6 do
+      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+        xxt, yyt, DitherMask.Canvas.Handle, 0, yyt, SRCAND);
   end;
 
-for y:=-1 to 6 do
+  for y := -1 to 6 do
   begin
-  if y=-1 then begin xSrc:=ShoreDither*(xxt*2+1)+1; ySrc:=1+yyt end
-  else if y=6 then begin xSrc:=1+2*(xxt*2+1); ySrc:=1+yyt+2*(yyt*3+1) end
-  else begin xSrc:=(y+2)*(xxt*2+1)+1; ySrc:=1+yyt end;
-  for x:=-2 to 6 do
-    BitBlt(LandMore.Canvas.Handle,(x+2)*(xxt*2),(y+2)*yyt,xxt*2,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc,SRCCOPY);
-  BitBlt(LandMore.Canvas.Handle,xxt*2,(y+2)*yyt,xxt,yyt,
-    GrExt[HGrTerrain].Data.Canvas.Handle,xSrc+xxt,ySrc+yyt,SRCPAINT);
-  for x:=0 to 7 do
-    BitBlt(LandMore.Canvas.Handle,(x+2)*(xxt*2)-xxt,(y+2)*yyt,xxt*2,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc+yyt,SRCPAINT);
-  for x:=-2 to 6 do
-    BitBlt(LandMore.Canvas.Handle,(x+2)*(xxt*2),(y+2)*yyt,xxt*2,yyt,
-      DitherMask.Canvas.Handle,0,0,SRCAND);
+    if y = -1 then
+    begin
+      xSrc := ShoreDither * (xxt * 2 + 1) + 1;
+      ySrc := 1 + yyt
+    end
+    else if y = 6 then
+    begin
+      xSrc := 1 + 2 * (xxt * 2 + 1);
+      ySrc := 1 + yyt + 2 * (yyt * 3 + 1)
+    end
+    else
+    begin
+      xSrc := (y + 2) * (xxt * 2 + 1) + 1;
+      ySrc := 1 + yyt
+    end;
+    for x := -2 to 6 do
+      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
+        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc,
+        SRCCOPY);
+    BitBlt(LandMore.Canvas.Handle, xxt * 2, (y + 2) * yyt, xxt, yyt,
+      GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt, SRCPAINT);
+    for x := 0 to 7 do
+      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
+        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt,
+        SRCPAINT);
+    for x := -2 to 6 do
+      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
+        xxt * 2, yyt, DitherMask.Canvas.Handle, 0, 0, SRCAND);
   end;
 
-for x:=0 to 3 do for y:=0 to 3 do
+  for x := 0 to 3 do
+    for y := 0 to 3 do
+    begin
+      if (x = 1) and (y = 1) then
+        xSrc := 1
+      else
+        xSrc := (x mod 2) * (xxt * 2 + 1) + 1;
+      ySrc := 1 + yyt;
+      if (x >= 1) = (y >= 2) then
+        BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc, SRCCOPY);
+      if (x >= 1) and ((y < 2) or (x >= 2)) then
+      begin
+        BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt,
+          SRCPAINT);
+        BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt, SRCPAINT);
+      end;
+      BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt, yyt,
+        DitherMask.Canvas.Handle, xxt, yyt, SRCAND);
+      BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+        DitherMask.Canvas.Handle, 0, yyt, SRCAND);
+    end;
+
+  for y := 0 to 3 do
+    for x := 0 to 3 do
+    begin
+      if (x = 1) and (y = 1) then
+        xSrc := 1
+      else
+        xSrc := (y mod 2) * (xxt * 2 + 1) + 1;
+      ySrc := 1 + yyt;
+      if (x < 1) or (y >= 2) then
+        BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc, SRCCOPY);
+      if (x = 1) and (y < 2) or (x >= 2) and (y >= 1) then
+      begin
+        BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2), y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt,
+          SRCPAINT);
+        BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt, SRCPAINT);
+      end;
+      BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+        DitherMask.Canvas.Handle, 0, 0, SRCAND);
+    end;
+
+  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt * 2,
+    DitherMask.Canvas.Handle, 0, 0, DSTINVERT); { invert dither mask }
+  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt * 2,
+    GrExt[HGrTerrain].Mask.Canvas.Handle, 1, 1 + yyt, SRCPAINT);
+
+  for x := -1 to 6 do
+    for y := -2 to 6 do
+      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
+        xxt * 2, yyt, DitherMask.Canvas.Handle, 0, 0, SRCAND);
+
+  for y := -1 to 6 do
+    for x := -2 to 7 do
+      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
+        xxt * 2, yyt, DitherMask.Canvas.Handle, 0, yyt, SRCAND);
+
+  BitBlt(LandPatch.Canvas.Handle, 0, 0, (xxt * 2) * 9, yyt * 9,
+    LandMore.Canvas.Handle, 0, 0, SRCPAINT);
+
+  for x := 0 to 3 do
+    for y := 0 to 3 do
+      BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+        DitherMask.Canvas.Handle, 0, 0, SRCAND);
+
+  for y := 0 to 3 do
+    for x := 0 to 4 do
+      BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2) - xxt, y * yyt, xxt * 2,
+        yyt, DitherMask.Canvas.Handle, 0, yyt, SRCAND);
+
+  BitBlt(OceanPatch.Canvas.Handle, 0, 0, (xxt * 2) * 4, yyt * 4,
+    OceanMore.Canvas.Handle, 0, 0, SRCPAINT);
+
+  with DitherMask.Canvas do
   begin
-  if (x=1) and (y=1) then xSrc:=1
-  else xSrc:=(x mod 2)*(xxt*2+1)+1;
-  ySrc:=1+yyt;
-  if (x>=1)=(y>=2) then
-    BitBlt(OceanPatch.Canvas.Handle,x*(xxt*2),y*yyt,xxt*2,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc,SRCCOPY);
-  if (x>=1) and ((y<2) or (x>=2)) then
+    Brush.Color := $FFFFFF;
+    FillRect(Rect(0, 0, xxt * 2, yyt));
+  end;
+  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt,
+    GrExt[HGrTerrain].Mask.Canvas.Handle, 1, 1 + yyt, SRCCOPY);
+
+  for x := 0 to 6 do
+    BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), yyt, xxt * 2, yyt,
+      DitherMask.Canvas.Handle, 0, 0, SRCAND);
+
+  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt, DitherMask.Canvas.Handle,
+    0, 0, DSTINVERT);
+
+  for y := 0 to 6 do
+    BitBlt(LandPatch.Canvas.Handle, xxt * 2, (y + 2) * yyt, xxt * 2, yyt,
+      DitherMask.Canvas.Handle, 0, 0, SRCAND);
+
+  LandMore.Free;
+  OceanMore.Free;
+  DitherMask.Free;
+  // LandPatch.Savetofile('landpatch.bmp');
+
+  // reduce size of terrain icons
+  Mask24 := TBitmap.Create;
+  Mask24.Assign(GrExt[HGrTerrain].Mask);
+  Mask24.PixelFormat := pf24bit;
+  for ySrc := 0 to TerrainIconLines - 1 do
+  begin
+    for i := 0 to yyt * 3 - 1 do
+      MaskLine[i] := Mask24.ScanLine[1 + ySrc * (yyt * 3 + 1) + i];
+    for xSrc := 0 to 9 - 1 do
     begin
-    BitBlt(OceanPatch.Canvas.Handle,x*(xxt*2),y*yyt,xxt,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc+xxt,ySrc+yyt,SRCPAINT);
-    BitBlt(OceanPatch.Canvas.Handle,x*(xxt*2)+xxt,y*yyt,xxt,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc+yyt,SRCPAINT);
-    end;
-  BitBlt(OceanPatch.Canvas.Handle,x*(xxt*2),y*yyt,xxt,yyt,
-    DitherMask.Canvas.Handle,xxt,yyt,SRCAND);
-  BitBlt(OceanPatch.Canvas.Handle,x*(xxt*2)+xxt,y*yyt,xxt,yyt,
-    DitherMask.Canvas.Handle,0,yyt,SRCAND);
-  end;
-
-for y:=0 to 3 do for x:=0 to 3 do
-  begin
-  if (x=1) and (y=1) then xSrc:=1
-  else xSrc:=(y mod 2)*(xxt*2+1)+1;
-  ySrc:=1+yyt;
-  if (x<1) or (y>=2) then
-    BitBlt(OceanMore.Canvas.Handle,x*(xxt*2),y*yyt,xxt*2,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc,SRCCOPY);
-  if (x=1) and (y<2) or (x>=2) and (y>=1) then
-    begin
-    BitBlt(OceanMore.Canvas.Handle,x*(xxt*2),y*yyt,xxt,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc+xxt,ySrc+yyt,SRCPAINT);
-    BitBlt(OceanMore.Canvas.Handle,x*(xxt*2)+xxt,y*yyt,xxt,yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle,xSrc,ySrc+yyt,SRCPAINT);
-    end;
-  BitBlt(OceanMore.Canvas.Handle,x*(xxt*2),y*yyt,xxt*2,yyt,
-    DitherMask.Canvas.Handle,0,0,SRCAND);
-  end;
-
-BitBlt(DitherMask.Canvas.Handle,0,0,xxt*2,yyt*2,
-  DitherMask.Canvas.Handle,0,0,DSTINVERT); {invert dither mask}
-BitBlt(DitherMask.Canvas.Handle,0,0,xxt*2,yyt*2,
-  GrExt[HGrTerrain].Mask.Canvas.Handle,1,1+yyt,SRCPAINT);
-
-for x:=-1 to 6 do
-  for y:=-2 to 6 do
-    BitBlt(LandPatch.Canvas.Handle,(x+2)*(xxt*2),(y+2)*yyt,xxt*2,yyt,
-      DitherMask.Canvas.Handle,0,0,SRCAND);
-
-for y:=-1 to 6 do
-  for x:=-2 to 7 do
-    BitBlt(LandMore.Canvas.Handle,(x+2)*(xxt*2)-xxt,(y+2)*yyt,xxt*2,yyt,
-      DitherMask.Canvas.Handle,0,yyt,SRCAND);
-
-BitBlt(LandPatch.Canvas.Handle,0,0,(xxt*2)*9,yyt*9,LandMore.Canvas.Handle,0,0,
-  SRCPAINT);
-
-for x:=0 to 3 do
-  for y:=0 to 3 do
-    BitBlt(OceanPatch.Canvas.Handle,x*(xxt*2),y*yyt,xxt*2,yyt,
-      DitherMask.Canvas.Handle,0,0,SRCAND);
-
-for y:=0 to 3 do
-  for x:=0 to 4 do
-    BitBlt(OceanMore.Canvas.Handle,x*(xxt*2)-xxt,y*yyt,xxt*2,yyt,
-      DitherMask.Canvas.Handle,0,yyt,SRCAND);
-
-BitBlt(OceanPatch.Canvas.Handle,0,0,(xxt*2)*4,yyt*4,OceanMore.Canvas.Handle,0,0,
-  SRCPAINT);
-
-with DitherMask.Canvas do
-  begin
-  Brush.Color:=$FFFFFF;
-  FillRect(Rect(0,0,xxt*2,yyt));
-  end;
-BitBlt(DitherMask.Canvas.Handle,0,0,xxt*2,yyt,
-  GrExt[HGrTerrain].Mask.Canvas.Handle,1,1+yyt,SRCCOPY);
-
-for x:=0 to 6 do
-  BitBlt(LandPatch.Canvas.Handle,(x+2)*(xxt*2),yyt,xxt*2,yyt,
-    DitherMask.Canvas.Handle,0,0,SRCAND);
-
-BitBlt(DitherMask.Canvas.Handle,0,0,xxt*2,yyt,
-  DitherMask.Canvas.Handle,0,0,DSTINVERT);
-
-for y:=0 to 6 do
-  BitBlt(LandPatch.Canvas.Handle,xxt*2,(y+2)*yyt,xxt*2,yyt,
-    DitherMask.Canvas.Handle,0,0,SRCAND);
-
-LandMore.Free; OceanMore.Free; DitherMask.Free;
-//LandPatch.Savetofile('landpatch.bmp');
-
-// reduce size of terrain icons
-Mask24:=TBitmap.Create;
-Mask24.Assign(GrExt[HGrTerrain].Mask);
-Mask24.PixelFormat:=pf24bit;
-for ySrc:=0 to TerrainIconLines-1 do
-  begin
-  for i:=0 to yyt*3-1 do
-    MaskLine[i]:=Mask24.ScanLine[1+ySrc*(yyt*3+1)+i];
-  for xSrc:=0 to 9-1 do
-    begin
-    i:=ySrc*9+xSrc;
-    TSpriteSize[i].Left:=0;
-    repeat
-      Border:=true;
-      for y:=0 to yyt*3-1 do
-        if MaskLine[y]^[1+xSrc*(xxt*2+1)+TSpriteSize[i].Left,0]=0 then
-          Border:=false;
-      if Border then inc(TSpriteSize[i].Left)
-    until not Border or (TSpriteSize[i].Left=xxt*2-1);
-    TSpriteSize[i].Top:=0;
-    repeat
-      Border:=true;
-      for x:=0 to xxt*2-1 do
-        if MaskLine[TSpriteSize[i].Top]^[1+xSrc*(xxt*2+1)+x,0]=0 then
-          Border:=false;
-      if Border then inc(TSpriteSize[i].Top)
-    until not Border or (TSpriteSize[i].Top=yyt*3-1);
-    TSpriteSize[i].Right:=xxt*2;
-    repeat
-      Border:=true;
-      for y:=0 to yyt*3-1 do
-        if MaskLine[y]^[xSrc*(xxt*2+1)+TSpriteSize[i].Right,0]=0 then
-          Border:=false;
-      if Border then dec(TSpriteSize[i].Right)
-    until not Border or (TSpriteSize[i].Right=TSpriteSize[i].Left);
-    TSpriteSize[i].Bottom:=yyt*3;
-    repeat
-      Border:=true;
-      for x:=0 to xxt*2-1 do
-        if MaskLine[TSpriteSize[i].Bottom-1]^[1+xSrc*(xxt*2+1)+x,0]=0 then
-          Border:=false;
-      if Border then dec(TSpriteSize[i].Bottom)
-    until not Border or (TSpriteSize[i].Bottom=TSpriteSize[i].Top);
-    end
-  end;
-Mask24.Free;
-
-if Borders<>nil then
-  Borders.Free;
-Borders:=TBitmap.Create;
-Borders.PixelFormat:=pf24bit;
-Borders.Width:=xxt*2; Borders.Height:=(yyt*2)*nPl;
-BordersOK:=0;
-end;
-
-procedure Done;
-begin
-NoMap.Free;
-NoMap:=nil;
-LandPatch.Free;
-LandPatch:=nil;
-OceanPatch.Free;
-OceanPatch:=nil;
-Borders.Free;
-Borders:=nil;
-end;
-
-procedure Reset;
-begin
-BordersOK:=0;
-end;
-
-constructor TIsoMap.Create;
-begin
-inherited;
-FLeft:=0;
-FTop:=0;
-FRight:=0;
-FBottom:=0;
-AttLoc:=-1;
-DefLoc:=-1;
-FAdviceLoc:=-1;
-end;
-
-procedure TIsoMap.SetOutput(Output: TBitmap);
-begin
-FOutput:=Output;
-FLeft:=0;
-FTop:=0;
-FRight:=FOutput.Width;
-FBottom:=FOutput.Height;
-end;
-
-procedure TIsoMap.SetPaintBounds(Left, Top, Right, Bottom: integer);
-begin
-FLeft:=Left; FTop:=Top; FRight:=Right; FBottom:=Bottom;
-end;
-
-procedure TIsoMap.FillRect(x,y,Width,Height,Color: integer);
-begin
-if x<FLeft then
-  begin Width:=Width-(FLeft-x); x:=FLeft end;
-if y<FTop then
-  begin Height:=Height-(FTop-y); y:=FTop end;
-if x+Width>=FRight then Width:=FRight-x;
-if y+Height>=FBottom then Height:=FBottom-y;
-if (Width<=0) or (Height<=0) then
-  exit;
-  
-with FOutput.Canvas do
-  begin
-  Brush.Color:=Color;
-  FillRect(Rect(x,y,x+Width,y+Height));
-  Brush.Style:=bsClear;
-  end
-end;
-
-procedure TIsoMap.Textout(x,y,Color: integer; const s: string);
-begin
-FOutput.Canvas.Font.Color:=Color;
-FOutput.Canvas.TextRect(Rect(FLeft,FTop,FRight,FBottom), x, y, s)
-end;
-
-procedure TIsoMap.BitBlt(Src: TBitmap; x,y,Width,Height,xSrc,ySrc,Rop: integer);
-begin
-if x<FLeft then
-  begin Width:=Width-(FLeft-x); xSrc:=xSrc+(FLeft-x); x:=FLeft end;
-if y<FTop then
-  begin Height:=Height-(FTop-y); ySrc:=ySrc+(FTop-y); y:=FTop end;
-if x+Width>=FRight then Width:=FRight-x;
-if y+Height>=FBottom then Height:=FBottom-y;
-if (Width<=0) or (Height<=0) then
-  exit;
-
-Windows.BitBlt(FOutput.Canvas.Handle,x,y,Width,Height,Src.Canvas.Handle,xSrc,
-  ySrc,Rop);
-end;
-
-procedure TIsoMap.Sprite(HGr,xDst,yDst,Width,Height,xGr,yGr: integer);
-begin
-BitBlt(GrExt[HGr].Mask,xDst,yDst,Width,Height,xGr,yGr,SRCAND);
-BitBlt(GrExt[HGr].Data,xDst,yDst,Width,Height,xGr,yGr,SRCPAINT);
-end;
-
-procedure TIsoMap.TSprite(xDst,yDst,grix: integer; PureBlack: boolean = false);
-var
-Width, Height, xSrc, ySrc: integer;
-begin
-Width:=TSpriteSize[grix].Right-TSpriteSize[grix].Left;
-Height:=TSpriteSize[grix].Bottom-TSpriteSize[grix].Top;
-xSrc:=1+grix mod 9 *(xxt*2+1)+TSpriteSize[grix].Left;
-ySrc:=1+grix div 9 *(yyt*3+1)+TSpriteSize[grix].Top;
-xDst:=xDst+TSpriteSize[grix].Left;
-yDst:=yDst-yyt+TSpriteSize[grix].Top;
-if xDst<FLeft then
-  begin Width:=Width-(FLeft-xDst); xSrc:=xSrc+(FLeft-xDst); xDst:=FLeft end;
-if yDst<FTop then
-  begin Height:=Height-(FTop-yDst); ySrc:=ySrc+(FTop-yDst); yDst:=FTop end;
-if xDst+Width>=FRight then Width:=FRight-xDst;
-if yDst+Height>=FBottom then Height:=FBottom-yDst;
-if (Width<=0) or (Height<=0) then
-  exit;
-  
-Windows.BitBlt(OutDC,xDst,yDst,Width,Height,MaskDC,xSrc,ySrc,SRCAND);
-if not PureBlack then
-  Windows.BitBlt(OutDC,xDst,yDst,Width,Height,DataDC,xSrc,ySrc,SRCPAINT);
-end;
-
-procedure TIsoMap.PaintUnit(x,y:integer;const UnitInfo:TUnitInfo;Status:integer);
-var
-xsh,ysh,xGr,yGr,j,mixShow: integer;
-begin
-with UnitInfo do if (Owner=me) or (emix<>$FFFF) then
-  begin
-  if Job=jCity then mixShow:=-1 // building site
-  else mixShow:=mix;
-  if (Tribe[Owner].ModelPicture[mixShow].HGr=0) and (@OnInitEnemyModel<>nil) then
-    if not OnInitEnemyModel(emix) then
-      exit;
-  xsh:=Tribe[Owner].ModelPicture[mixShow].xShield;
-  ysh:=Tribe[Owner].ModelPicture[mixShow].yShield;
-  {$IFNDEF SCR}if Status and usStay<>0 then j:=19
-  else if Status and usRecover<>0 then j:=16
-  else if Status and (usGoto or usEnhance)=usGoto or usEnhance then j:=18
-  else if Status and usEnhance<>0 then j:=17
-  else if Status and usGoto<>0 then j:=20
-  else{$ENDIF} if Job=jCity then j:=jNone
-  else j:=Job;
-  if Flags and unMulti<>0 then
-    Sprite(Tribe[Owner].symHGr,x+xsh-1+4,y+ysh-2,14,12,
-      33+Tribe[Owner].sympix mod 10 *65,1+Tribe[Owner].sympix div 10 *49);
-  Sprite(Tribe[Owner].symHGr,x+xsh-1,y+ysh-2,14,12,
-    18+Tribe[Owner].sympix mod 10 *65,1+Tribe[Owner].sympix div 10 *49);
-  FillRect(x+xsh,y+ysh+5,1+Health*11 div 100,3,ColorOfHealth(Health));
-  if j>0 then
-    begin
-    xGr:=121+j mod 7 *9; yGr:=1+j div 7 *9;
-    BitBlt(GrExt[HGrSystem].Mask,x+xsh+3,y+ysh+9,8,8,xGr,yGr,SRCAND);
-    Sprite(HGrSystem,x+xsh+2,y+ysh+8,8,8,xGr,yGr);
-    end;
-  with Tribe[Owner].ModelPicture[mixShow] do
-    Sprite(HGr,x,y,64,48,pix mod 10 *65+1,pix div 10 *49+1);
-  if Flags and unFortified<>0 then
-    begin
-{    OutDC:=FOutput.Canvas.Handle;
-    DataDC:=GrExt[HGrTerrain].Data.Canvas.Handle;
-    MaskDC:=GrExt[HGrTerrain].Mask.Canvas.Handle;
-    TSprite(x,y+16,12*9+7);}
-    Sprite(HGrStdUnits,x,y,xxu*2,yyu*2,1+6*(xxu*2+1),1);
-    end
-  end
-end;{PaintUnit}
-
-procedure TIsoMap.PaintCity(x,y:integer; const CityInfo:TCityInfo;
-  accessory: boolean);
-var
-age,cHGr,cpix,xGr,xShield,yShield,LabelTextColor,LabelLength: integer;
-cpic:TCityPicture;
-s:string;
-begin
-age:=GetAge(CityInfo.Owner);
-if CityInfo.Size<5 then xGr:=0
-else if CityInfo.Size<9 then xGr:=1
-else if CityInfo.Size<13 then xGr:=2
-else xGr:=3;
-Tribe[CityInfo.Owner].InitAge(age);
-if age<2 then
-  begin
-  cHGr:=Tribe[CityInfo.Owner].cHGr;
-  cpix:=Tribe[CityInfo.Owner].cpix;
-  if (ciWalled and CityInfo.Flags=0)
-    or (GrExt[cHGr].Data.Canvas.Pixels[(xGr+4)*65,cpix*49+48]=$00FFFF) then
-    Sprite(cHGr,x-xxc,y-2*yyc,xxc*2,yyc*3,xGr*(xxc*2+1)+1,1+cpix*(yyc*3+1));
-  if ciWalled and CityInfo.Flags<>0 then
-    Sprite(cHGr,x-xxc,y-2*yyc,xxc*2,yyc*3,(xGr+4)*(xxc*2+1)+1,1+cpix*(yyc*3+1));
-  end
-else
-  begin
-  if ciWalled and CityInfo.Flags<>0 then
-    Sprite(HGrCities,x-xxt,y-2*yyt,2*xxt,3*yyt,(xGr+4)*(2*xxt+1)+1,1+(age-2)*(3*yyt+1))
-  else Sprite(HGrCities,x-xxt,y-2*yyt,2*xxt,3*yyt,xGr*(2*xxt+1)+1,1+(age-2)*(3*yyt+1));
-  end;
-
-if not Accessory then exit;
-
-{if ciCapital and CityInfo.Flags<>0 then
-  Sprite(Tribe[CityInfo.Owner].symHGr,x+cpic.xf,y-13+cpic.yf,13,14,
-    1+Tribe[CityInfo.Owner].sympix mod 10 *65,
-    1+Tribe[CityInfo.Owner].sympix div 10 *49); {capital -- paint flag}
-
-if MyMap[CityInfo.Loc] and fObserved<>0 then
-  begin
-  if age<2 then
-    begin
-    cpic:=Tribe[CityInfo.Owner].CityPicture[xGr];
-    xShield:=x-xxc+cpic.xShield;
-    yShield:=y-2*yyc+cpic.yShield;
-    end
-  else
-    begin
-    cpic:=CitiesPictures[age,xGr];
-    xShield:=x-xxt+cpic.xShield;
-    yShield:=y-2*yyt+cpic.yShield;
-    end;
-  s:=IntToStr(CityInfo.Size);
-  LabelLength:=FOutput.Canvas.TextWidth(s);
-  FillRect(xShield,yShield,LabelLength+4,16,$000000);
-  if MyMap[CityInfo.Loc] and (fUnit or fObserved)=fObserved then
-    // empty city
-    LabelTextColor:=Tribe[CityInfo.Owner].Color
-  else
-    begin
-    FillRect(xShield+1,yShield+1,LabelLength+2,14,Tribe[CityInfo.Owner].Color);
-    LabelTextColor:=$000000;
-    end;
-  Textout(xShield+2,yShield-1,LabelTextColor,s);
-  end
-end;{PaintCity}
-
-function PoleTile(Loc: integer): integer;
-begin {virtual pole tile}
-result:=fUNKNOWN;
-if Loc<-2*G.lx then
-else if Loc<-G.lx then
-  begin
-  if (MyMap[dLoc(Loc,0,2)] and fTerrain<>fUNKNOWN)
-    and (MyMap[dLoc(Loc,-2,2)] and fTerrain<>fUNKNOWN)
-    and (MyMap[dLoc(Loc,2,2)] and fTerrain<>fUNKNOWN) then result:=fArctic;
-  if (MyMap[dLoc(Loc,0,2)] and fObserved<>0)
-    and (MyMap[dLoc(Loc,-2,2)] and fObserved<>0)
-    and (MyMap[dLoc(Loc,2,2)] and fObserved<>0) then
-    result:=result or fObserved
-  end
-else if Loc<0 then
-  begin
-  if (MyMap[dLoc(Loc,-1,1)] and fTerrain<>fUNKNOWN)
-    and (MyMap[dLoc(Loc,1,1)] and fTerrain<>fUNKNOWN) then result:=fArctic;
-  if (MyMap[dLoc(Loc,-1,1)] and fObserved<>0)
-    and (MyMap[dLoc(Loc,1,1)] and fObserved<>0) then
-    result:=result or fObserved
-  end
-else if Loc<G.lx*(G.ly+1) then
-  begin
-  if (MyMap[dLoc(Loc,-1,-1)] and fTerrain<>fUNKNOWN)
-    and (MyMap[dLoc(Loc,1,-1)] and fTerrain<>fUNKNOWN) then result:=fArctic;
-  if (MyMap[dLoc(Loc,-1,-1)] and fObserved<>0)
-    and (MyMap[dLoc(Loc,1,-1)] and fObserved<>0) then
-    result:=result or fObserved
-  end
-else if Loc<G.lx*(G.ly+2) then
-  begin
-  if (MyMap[dLoc(Loc,0,-2)] and fTerrain<>fUNKNOWN)
-    and (MyMap[dLoc(Loc,-2,-2)] and fTerrain<>fUNKNOWN)
-    and (MyMap[dLoc(Loc,2,-2)] and fTerrain<>fUNKNOWN) then result:=fArctic;
-  if (MyMap[dLoc(Loc,0,-2)] and fObserved<>0)
-    and (MyMap[dLoc(Loc,-2,-2)] and fObserved<>0)
-    and (MyMap[dLoc(Loc,2,-2)] and fObserved<>0) then
-    result:=result or fObserved
-  end
-end;
-
-const
-Dirx: array[0..7] of integer=(1,2,1,0,-1,-2,-1,0);
-Diry: array[0..7] of integer=(-1,0,1,2,1,0,-1,-2);
-
-function TIsoMap.Connection4(Loc,Mask,Value:integer):integer;
-begin
-result:=0;
-if dLoc(Loc,1,-1)>=0 then
-  begin
-  if MyMap[dLoc(Loc,1,-1)] and Mask=Cardinal(Value) then inc(result,1);
-  if MyMap[dLoc(Loc,-1,-1)] and Mask=Cardinal(Value) then inc(result,8);
-  end;
-if dLoc(Loc,1,1)<G.lx*G.ly then
-  begin
-  if MyMap[dLoc(Loc,1,1)] and Mask=Cardinal(Value) then inc(result,2);
-  if MyMap[dLoc(Loc,-1,1)] and Mask=Cardinal(Value) then inc(result,4);
-  end
-end;
-
-function TIsoMap.Connection8(Loc,Mask:integer):integer;
-var
-Dir, ConnLoc: integer;
-begin
-result:=0;
-for Dir:=0 to 7 do
-  begin
-  ConnLoc:=dLoc(Loc,Dirx[Dir],Diry[Dir]);
-  if (ConnLoc>=0) and (ConnLoc<G.lx*G.ly) and (MyMap[ConnLoc] and Mask<>0) then
-    inc(result,1 shl Dir);
-  end
-end;
-
-function TIsoMap.OceanConnection(Loc: integer): integer;
-var
-Dir,ConnLoc: integer;
-begin
-result:=0;
-for Dir:=0 to 7 do
-  begin
-  ConnLoc:=dLoc(Loc,Dirx[Dir],Diry[Dir]);
-  if (ConnLoc<0) or (ConnLoc>=G.lx*G.ly)
-    or ((MyMap[ConnLoc]-2) and fTerrain<13) then
-    inc(result,1 shl Dir);
-  end
-end;
-
-procedure TIsoMap.PaintShore(x,y,Loc:integer);
-var
-Conn,Tile:integer;
-begin
-if (y<=FTop-yyt*2) or (y>FBottom) or (x<=FLeft-xxt*2) or (x>FRight) then exit;
-if (Loc<0) or (Loc>=G.lx*G.ly) then exit;
-Tile:=MyMap[Loc];
-if Tile and fTerrain>=fGrass then exit;
-Conn:=OceanConnection(Loc);
-if Conn=0 then exit;
-
-BitBlt(GrExt[HGrTerrain].Data,x+xxt div 2,y,xxt,yyt,
-  1+(Conn shr 6 +Conn and 1 shl 2)*(xxt*2+1),
-  1+yyt+(16+Tile and fTerrain)*(yyt*3+1),SRCPAINT);
-BitBlt(GrExt[HGrTerrain].Data,x+xxt,y+yyt div 2,xxt,yyt,
-  1+(Conn and 7)*(xxt*2+1)+xxt,
-  1+yyt*2+(16+Tile and fTerrain)*(yyt*3+1),SRCPAINT);
-BitBlt(GrExt[HGrTerrain].Data,x+xxt div 2,y+yyt,xxt,yyt,
-  1+(Conn shr 2 and 7)*(xxt*2+1)+xxt,
-  1+yyt+(16+Tile and fTerrain)*(yyt*3+1),SRCPAINT);
-BitBlt(GrExt[HGrTerrain].Data,x,y+yyt div 2,xxt,yyt,
-  1+(Conn shr 4 and 7)*(xxt*2+1),
-  1+yyt*2+(16+Tile and fTerrain)*(yyt*3+1),SRCPAINT);
-Conn:=Connection4(Loc,fTerrain,fUNKNOWN); {dither to black}
-if Conn and 1<>0 then
-  BitBlt(GrExt[HGrTerrain].Mask,x+xxt,y,xxt,yyt,1+7*(xxt*2+1)+xxt,
-    1+yyt+15*(yyt*3+1),SRCAND);
-if Conn and 2<>0 then
-  BitBlt(GrExt[HGrTerrain].Mask,x+xxt,y+yyt,xxt,yyt,1+7*(xxt*2+1)+xxt,
-    1+yyt*2+15*(yyt*3+1),SRCAND);
-if Conn and 4<>0 then
-  BitBlt(GrExt[HGrTerrain].Mask,x,y+yyt,xxt,yyt,1+7*(xxt*2+1),
-    1+yyt*2+15*(yyt*3+1),SRCAND);
-if Conn and 8<>0 then
-  BitBlt(GrExt[HGrTerrain].Mask,x,y,xxt,yyt,1+7*(xxt*2+1),
-    1+yyt+15*(yyt*3+1),SRCAND);
-end;
-
-procedure TIsoMap.PaintTileExtraTerrain(x,y,Loc: integer);
-var
-Dir,Conn,RRConn,yGr,Tile,yLoc:integer;
-begin
-if (Loc<0) or (Loc>=G.lx*G.ly) or (y<=-yyt*2) or (y>FOutput.Height)
-  or (x<=-xxt*2) or (x>FOutput.Width) then exit;
-Tile:=MyMap[Loc];
-if Tile and fTerrain=fForest then
-  begin
-  yLoc:=Loc div G.lx;
-  if IsJungle(yLoc) then yGr:=18
-  else yGr:=3;
-  Conn:=Connection4(Loc,fTerrain,Tile and fTerrain);
-  if (yLoc=(G.ly-2) div 4) or (G.ly-1-yLoc=(G.ly+2) div 4) then
-    Conn:=Conn and not 6 // no connection to south
-  else if (yLoc=(G.ly+2) div 4) or (G.ly-1-yLoc=(G.ly-2) div 4) then
-    Conn:=Conn and not 9; // no connection to north
-  TSprite(x,y,Conn mod 8+(yGr+Conn div 8)*9);
-  end
-else if Tile and fTerrain in [fHills,fMountains,fForest] then
-  begin
-  yGr:=3+2*(Tile and fTerrain-fForest);
-  Conn:=Connection4(Loc,fTerrain,Tile and fTerrain);
-  TSprite(x,y,Conn mod 8+(yGr+Conn div 8)*9);
-  end
-else if Tile and fDeadLands<>0 then
-  TSprite(x,y,2*9+6);
-
-if ShowObjects then
-  begin
-  if Tile and fTerImp=tiFarm then TSprite(x,y,109) {farmland}
-  else if Tile and fTerImp=tiIrrigation then TSprite(x,y,108); // irrigation
-  end;
-if Tile and fRiver<>0 then
-  begin
-  Conn:=Connection4(Loc,fRiver,fRiver) or Connection4(Loc,fTerrain,fShore)
-    or Connection4(Loc,fTerrain,fUNKNOWN);
-  TSprite(x,y,Conn mod 8+(13+Conn div 8)*9);
-  end;
-
-if Tile and fTerrain<fGrass then
-  begin
-  Conn:=Connection4(Loc,fRiver,fRiver);
-  for Dir:=0 to 3 do if Conn and (1 shl Dir)<>0 then {river mouths}
-    TSprite(x,y,15*9+Dir);
-  if ShowObjects then
-    begin
-    Conn:=Connection8(Loc,fCanal);
-    for Dir:=0 to 7 do if Conn and (1 shl Dir)<>0 then {canal mouths}
-      TSprite(x,y,20*9+1+Dir);
-    end
-  end;
-
-if ShowObjects then
-  begin
-  if (Tile and fCanal<>0) or (Tile and fCity<>0) then
-    begin // paint canal connections
-    Conn:=Connection8(Loc,fCanal or fCity);
-    if Tile and fCanal<>0 then Conn:=Conn or ($FF-OceanConnection(Loc));
-    if Conn=0 then
-      begin
-      if Tile and fCanal<>0 then TSprite(x,y,99)
-      end
-    else for Dir:=0 to 7 do if (1 shl Dir) and Conn<>0 then
-      TSprite(x,y,100+Dir);
-    end;
-  if Tile and (fRR or fCity)<>0 then RRConn:=Connection8(Loc,fRR or fCity)
-  else RRConn:=0;
-  if Tile and (fRoad or fRR or fCity)<>0 then
-    begin // paint road connections
-    Conn:=Connection8(Loc,fRoad or fRR or fCity) and not RRConn;
-    if (Conn=0) and (Tile and (fRR or fCity)=0) then TSprite(x,y,81)
-    else if Conn>0 then
-      for Dir:=0 to 7 do if (1 shl Dir) and Conn<>0 then TSprite(x,y,82+Dir);
-    end;
-  // paint railroad connections
-  if (Tile and fRR<>0) and (RRConn=0) then TSprite(x,y,90)
-  else if RRConn>0 then
-    for Dir:=0 to 7 do if (1 shl Dir) and RRConn<>0 then TSprite(x,y,91+Dir);
-  end;
-end;
-
-// (x,y) is top left pixel of (2*xxt,3*yyt) rectangle
-procedure TIsoMap.PaintTileObjects(x,y,Loc,CityLoc,CityOwner:integer;
-  UseBlink: boolean);
-type
-TLine=array[0..9*65,0..2] of Byte;
-var
-p1,p2,uix,cix,dy,Loc1,Tile,Multi,Destination: integer;
-CityInfo:TCityInfo;
-UnitInfo:TUnitInfo;
-fog: boolean;
-
-  procedure NameCity;
-  var
-  cix,xs,w: integer;
-  BehindCityInfo:TCityInfo;
-  s: string;
-  IsCapital: boolean;
-  begin
-  BehindCityInfo.Loc:=Loc-2*G.lx;
-  if ShowCityNames and (Options and (1 shl moEditMode)=0)
-    and (BehindCityInfo.Loc>=0) and (BehindCityInfo.Loc<G.lx*G.ly)
-    and (MyMap[BehindCityInfo.Loc] and fCity<>0) then
-    begin
-    GetCityInfo(BehindCityInfo.Loc,cix,BehindCityInfo);
-    IsCapital:= BehindCityInfo.Flags and ciCapital<>0;
-    {if Showuix and (cix>=0) then s:=IntToStr(cix)
-    else} s:=CityName(BehindCityInfo.ID);
-    w:=FOutput.Canvas.TextWidth(s);
-    xs:=x+xxt-(w+1) div 2;
-    if IsCapital then
-      FOutput.Canvas.Font.Style:=FOutput.Canvas.Font.Style+[fsUnderline];
-    Textout(xs+1,y-9,$000000,s);
-    Textout(xs,y-10,$FFFFFF,s);
-    if IsCapital then
-      FOutput.Canvas.Font.Style:=FOutput.Canvas.Font.Style-[fsUnderline];
-    end;
-  end;
-
-  procedure ShowSpacePort;
-  begin
-  if ShowObjects and (Options and (1 shl moEditMode)=0) and (Tile and fCity<>0)
-    and (CityInfo.Flags and ciSpacePort<>0) then
-    TSprite(x+xxt,y-6,12*9+5);
-  end;
-
-  procedure PaintBorder;
-  var
-  dx,dy: integer;
-  Line: ^TLine;
-  begin
-  if ShowBorder and (Loc>=0) and (Loc<G.lx*G.ly)
-    and (Tile and fTerrain<>fUNKNOWN) then
-    begin
-    p1:=MyRO.Territory[Loc];
-    if (p1>=0) and (ShowMyBorder or (p1<>me)) then
-      begin
-      if BordersOK and (1 shl p1)=0 then
-        begin
-        Windows.BitBlt(Borders.Canvas.Handle,0,p1*(yyt*2),xxt*2,yyt*2,
-          GrExt[HGrTerrain].Data.Canvas.Handle,1+8*(xxt*2+1),1+yyt+16*(yyt*3+1),SRCCOPY);
-        for dy:=0 to yyt*2-1 do
-          begin
-          Line:=Borders.ScanLine[p1*(yyt*2)+dy];
-          for dx:=0 to xxt*2-1 do if Line[dx,0]=99 then
+      i := ySrc * 9 + xSrc;
+      TSpriteSize[i].Left := 0;
+      repeat
+        Border := true;
+        for y := 0 to yyt * 3 - 1 do
+          if MaskLine[y]^[1 + xSrc * (xxt * 2 + 1) + TSpriteSize[i].Left, 0] = 0
+          then
+            Border := false;
+        if Border then
+          inc(TSpriteSize[i].Left) until not Border or
+            (TSpriteSize[i].Left = xxt * 2 - 1);
+        TSpriteSize[i].Top := 0;
+        repeat
+          Border := true;
+          for x := 0 to xxt * 2 - 1 do
+            if MaskLine[TSpriteSize[i].Top]^[1 + xSrc * (xxt * 2 + 1) + x, 0] = 0
+            then
+              Border := false;
+          if Border then
+            inc(TSpriteSize[i].Top) until not Border or
+              (TSpriteSize[i].Top = yyt * 3 - 1);
+          TSpriteSize[i].Right := xxt * 2;
+          repeat
+            Border := true;
+            for y := 0 to yyt * 3 - 1 do
+              if MaskLine[y]^[xSrc * (xxt * 2 + 1) + TSpriteSize[i].Right, 0] = 0
+              then
+                Border := false;
+            if Border then
+              dec(TSpriteSize[i].Right) until not Border or
+                (TSpriteSize[i].Right = TSpriteSize[i].Left);
+            TSpriteSize[i].Bottom := yyt * 3;
+            repeat
+              Border := true;
+              for x := 0 to xxt * 2 - 1 do
+                if MaskLine[TSpriteSize[i].Bottom - 1]^
+                  [1 + xSrc * (xxt * 2 + 1) + x, 0] = 0 then
+                  Border := false;
+              if Border then
+                dec(TSpriteSize[i].Bottom) until not Border or
+                  (TSpriteSize[i].Bottom = TSpriteSize[i].Top);
+            end
+          end;
+          Mask24.Free;
+
+          if Borders <> nil then
+            Borders.Free;
+          Borders := TBitmap.Create;
+          Borders.PixelFormat := pf24bit;
+          Borders.Width := xxt * 2;
+          Borders.Height := (yyt * 2) * nPl;
+          BordersOK := 0;
+        end;
+
+        procedure Done;
+        begin
+          NoMap.Free;
+          NoMap := nil;
+          LandPatch.Free;
+          LandPatch := nil;
+          OceanPatch.Free;
+          OceanPatch := nil;
+          Borders.Free;
+          Borders := nil;
+        end;
+
+        procedure Reset;
+        begin
+          BordersOK := 0;
+        end;
+
+        constructor TIsoMap.Create;
+        begin
+          inherited;
+          FLeft := 0;
+          FTop := 0;
+          FRight := 0;
+          FBottom := 0;
+          AttLoc := -1;
+          DefLoc := -1;
+          FAdviceLoc := -1;
+        end;
+
+        procedure TIsoMap.SetOutput(Output: TBitmap);
+        begin
+          FOutput := Output;
+          FLeft := 0;
+          FTop := 0;
+          FRight := FOutput.Width;
+          FBottom := FOutput.Height;
+        end;
+
+        procedure TIsoMap.SetPaintBounds(Left, Top, Right, Bottom: integer);
+        begin
+          FLeft := Left;
+          FTop := Top;
+          FRight := Right;
+          FBottom := Bottom;
+        end;
+
+        procedure TIsoMap.FillRect(x, y, Width, Height, Color: integer);
+        begin
+          if x < FLeft then
+          begin
+            Width := Width - (FLeft - x);
+            x := FLeft
+          end;
+          if y < FTop then
+          begin
+            Height := Height - (FTop - y);
+            y := FTop
+          end;
+          if x + Width >= FRight then
+            Width := FRight - x;
+          if y + Height >= FBottom then
+            Height := FBottom - y;
+          if (Width <= 0) or (Height <= 0) then
+            exit;
+
+          with FOutput.Canvas do
+          begin
+            Brush.Color := Color;
+            FillRect(Rect(x, y, x + Width, y + Height));
+            Brush.Style := bsClear;
+          end
+        end;
+
+        procedure TIsoMap.Textout(x, y, Color: integer; const s: string);
+        begin
+          FOutput.Canvas.Font.Color := Color;
+          FOutput.Canvas.TextRect(Rect(FLeft, FTop, FRight, FBottom), x, y, s)
+        end;
+
+        procedure TIsoMap.BitBlt(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
+          Rop: integer);
+        begin
+          if x < FLeft then
+          begin
+            Width := Width - (FLeft - x);
+            xSrc := xSrc + (FLeft - x);
+            x := FLeft
+          end;
+          if y < FTop then
+          begin
+            Height := Height - (FTop - y);
+            ySrc := ySrc + (FTop - y);
+            y := FTop
+          end;
+          if x + Width >= FRight then
+            Width := FRight - x;
+          if y + Height >= FBottom then
+            Height := FBottom - y;
+          if (Width <= 0) or (Height <= 0) then
+            exit;
+
+          Windows.BitBlt(FOutput.Canvas.Handle, x, y, Width, Height,
+            Src.Canvas.Handle, xSrc, ySrc, Rop);
+        end;
+
+        procedure TIsoMap.Sprite(HGr, xDst, yDst, Width, Height, xGr,
+          yGr: integer);
+        begin
+          BitBlt(GrExt[HGr].Mask, xDst, yDst, Width, Height, xGr, yGr, SRCAND);
+          BitBlt(GrExt[HGr].Data, xDst, yDst, Width, Height, xGr, yGr,
+            SRCPAINT);
+        end;
+
+        procedure TIsoMap.TSprite(xDst, yDst, grix: integer;
+          PureBlack: boolean = false);
+        var
+          Width, Height, xSrc, ySrc: integer;
+        begin
+          Width := TSpriteSize[grix].Right - TSpriteSize[grix].Left;
+          Height := TSpriteSize[grix].Bottom - TSpriteSize[grix].Top;
+          xSrc := 1 + grix mod 9 * (xxt * 2 + 1) + TSpriteSize[grix].Left;
+          ySrc := 1 + grix div 9 * (yyt * 3 + 1) + TSpriteSize[grix].Top;
+          xDst := xDst + TSpriteSize[grix].Left;
+          yDst := yDst - yyt + TSpriteSize[grix].Top;
+          if xDst < FLeft then
+          begin
+            Width := Width - (FLeft - xDst);
+            xSrc := xSrc + (FLeft - xDst);
+            xDst := FLeft
+          end;
+          if yDst < FTop then
+          begin
+            Height := Height - (FTop - yDst);
+            ySrc := ySrc + (FTop - yDst);
+            yDst := FTop
+          end;
+          if xDst + Width >= FRight then
+            Width := FRight - xDst;
+          if yDst + Height >= FBottom then
+            Height := FBottom - yDst;
+          if (Width <= 0) or (Height <= 0) then
+            exit;
+
+          Windows.BitBlt(OutDC, xDst, yDst, Width, Height, MaskDC, xSrc,
+            ySrc, SRCAND);
+          if not PureBlack then
+            Windows.BitBlt(OutDC, xDst, yDst, Width, Height, DataDC, xSrc, ySrc,
+              SRCPAINT);
+        end;
+
+        procedure TIsoMap.PaintUnit(x, y: integer; const UnitInfo: TUnitInfo;
+          Status: integer);
+        var
+          xsh, ysh, xGr, yGr, j, mixShow: integer;
+        begin
+          with UnitInfo do
+            if (Owner = me) or (emix <> $FFFF) then
             begin
-            Line[dx,0]:=Tribe[p1].Color shr 16 and $FF;
-            Line[dx,1]:=Tribe[p1].Color shr 8 and $FF;
-            Line[dx,2]:=Tribe[p1].Color and $FF;
+              if Job = jCity then
+                mixShow := -1 // building site
+              else
+                mixShow := mix;
+              if (Tribe[Owner].ModelPicture[mixShow].HGr = 0) and
+                (@OnInitEnemyModel <> nil) then
+                if not OnInitEnemyModel(emix) then
+                  exit;
+              xsh := Tribe[Owner].ModelPicture[mixShow].xShield;
+              ysh := Tribe[Owner].ModelPicture[mixShow].yShield;
+{$IFNDEF SCR} if Status and usStay <> 0 then
+                j := 19
+              else if Status and usRecover <> 0 then
+                j := 16
+              else if Status and (usGoto or usEnhance) = usGoto or usEnhance
+              then
+                j := 18
+              else if Status and usEnhance <> 0 then
+                j := 17
+              else if Status and usGoto <> 0 then
+                j := 20
+              else {$ENDIF} if Job = jCity then
+                  j := jNone
+                else
+                  j := Job;
+              if Flags and unMulti <> 0 then
+                Sprite(Tribe[Owner].symHGr, x + xsh - 1 + 4, y + ysh - 2, 14,
+                  12, 33 + Tribe[Owner].sympix mod 10 * 65,
+                  1 + Tribe[Owner].sympix div 10 * 49);
+              Sprite(Tribe[Owner].symHGr, x + xsh - 1, y + ysh - 2, 14, 12,
+                18 + Tribe[Owner].sympix mod 10 * 65,
+                1 + Tribe[Owner].sympix div 10 * 49);
+              FillRect(x + xsh, y + ysh + 5, 1 + Health * 11 div 100, 3,
+                ColorOfHealth(Health));
+              if j > 0 then
+              begin
+                xGr := 121 + j mod 7 * 9;
+                yGr := 1 + j div 7 * 9;
+                BitBlt(GrExt[HGrSystem].Mask, x + xsh + 3, y + ysh + 9, 8, 8,
+                  xGr, yGr, SRCAND);
+                Sprite(HGrSystem, x + xsh + 2, y + ysh + 8, 8, 8, xGr, yGr);
+              end;
+              with Tribe[Owner].ModelPicture[mixShow] do
+                Sprite(HGr, x, y, 64, 48, pix mod 10 * 65 + 1,
+                  pix div 10 * 49 + 1);
+              if Flags and unFortified <> 0 then
+              begin
+                { OutDC:=FOutput.Canvas.Handle;
+                  DataDC:=GrExt[HGrTerrain].Data.Canvas.Handle;
+                  MaskDC:=GrExt[HGrTerrain].Mask.Canvas.Handle;
+                  TSprite(x,y+16,12*9+7); }
+                Sprite(HGrStdUnits, x, y, xxu * 2, yyu * 2,
+                  1 + 6 * (xxu * 2 + 1), 1);
+              end
             end
-          end;
-        BordersOK:=BordersOK or 1 shl p1;
-        end;
-      for dy:=0 to 1 do for dx:=0 to 1 do
-        begin
-        Loc1:=dLoc(Loc,dx*2-1,dy*2-1);
-          begin
-          if (Loc1<0) or (Loc1>=G.lx*G.ly) then p2:=-1
-          else if MyMap[Loc1] and fTerrain=fUNKNOWN then
-            p2:=p1
-          else p2:=MyRO.Territory[Loc1];
-          if p2<>p1 then
+        end; { PaintUnit }
+
+        procedure TIsoMap.PaintCity(x, y: integer; const CityInfo: TCityInfo;
+          accessory: boolean);
+        var
+          age, cHGr, cpix, xGr, xShield, yShield, LabelTextColor,
+            LabelLength: integer;
+          cpic: TCityPicture;
+          s: string;
+        begin
+          age := GetAge(CityInfo.Owner);
+          if CityInfo.size < 5 then
+            xGr := 0
+          else if CityInfo.size < 9 then
+            xGr := 1
+          else if CityInfo.size < 13 then
+            xGr := 2
+          else
+            xGr := 3;
+          Tribe[CityInfo.Owner].InitAge(age);
+          if age < 2 then
+          begin
+            cHGr := Tribe[CityInfo.Owner].cHGr;
+            cpix := Tribe[CityInfo.Owner].cpix;
+            if (ciWalled and CityInfo.Flags = 0) or
+              (GrExt[cHGr].Data.Canvas.Pixels[(xGr + 4) * 65, cpix * 49 + 48]
+              = $00FFFF) then
+              Sprite(cHGr, x - xxc, y - 2 * yyc, xxc * 2, yyc * 3,
+                xGr * (xxc * 2 + 1) + 1, 1 + cpix * (yyc * 3 + 1));
+            if ciWalled and CityInfo.Flags <> 0 then
+              Sprite(cHGr, x - xxc, y - 2 * yyc, xxc * 2, yyc * 3,
+                (xGr + 4) * (xxc * 2 + 1) + 1, 1 + cpix * (yyc * 3 + 1));
+          end
+          else
+          begin
+            if ciWalled and CityInfo.Flags <> 0 then
+              Sprite(HGrCities, x - xxt, y - 2 * yyt, 2 * xxt, 3 * yyt,
+                (xGr + 4) * (2 * xxt + 1) + 1, 1 + (age - 2) * (3 * yyt + 1))
+            else
+              Sprite(HGrCities, x - xxt, y - 2 * yyt, 2 * xxt, 3 * yyt,
+                xGr * (2 * xxt + 1) + 1, 1 + (age - 2) * (3 * yyt + 1));
+          end;
+
+          if not accessory then
+            exit;
+
+          { if ciCapital and CityInfo.Flags<>0 then
+            Sprite(Tribe[CityInfo.Owner].symHGr,x+cpic.xf,y-13+cpic.yf,13,14,
+            1+Tribe[CityInfo.Owner].sympix mod 10 *65,
+            1+Tribe[CityInfo.Owner].sympix div 10 *49); {capital -- paint flag }
+
+          if MyMap[CityInfo.Loc] and fObserved <> 0 then
+          begin
+            if age < 2 then
             begin
-            BitBlt(GrExt[HGrTerrain].Mask,x+dx*xxt,y+dy*yyt,xxt,yyt,
-              1+8*(xxt*2+1)+dx*xxt,1+yyt+16*(yyt*3+1)+dy*yyt,SRCAND);
-            BitBlt(Borders,x+dx*xxt,y+dy*yyt,xxt,yyt,dx*xxt,p1*(yyt*2)+dy*yyt,SRCPAINT);
+              cpic := Tribe[CityInfo.Owner].CityPicture[xGr];
+              xShield := x - xxc + cpic.xShield;
+              yShield := y - 2 * yyc + cpic.yShield;
             end
-          end;
-        end
-      end
-    end;
-  end;
-
-begin
-if (Loc<0) or (Loc>=G.lx*G.ly) then Tile:=PoleTile(Loc)
-else Tile:=MyMap[Loc];
-if ShowObjects and (Options and (1 shl moEditMode)=0) and (Tile and fCity<>0) then
-  GetCityInfo(Loc,cix,CityInfo);
-if (y<=FTop-yyt*2) or (y>FBottom) or (x<=FLeft-xxt*2) or (x>FRight) then
-  begin NameCity; ShowSpacePort; exit; end;
-if Tile and fTerrain=fUNKNOWN then
-  begin NameCity; ShowSpacePort; exit end;{square not discovered}
-
-if not (FoW and (Tile and fObserved=0)) then
-  PaintBorder;
-
-if (Loc>=0) and (Loc<G.lx*G.ly) and (Loc=FAdviceLoc) then
-  TSprite(x,y,7+9*2);
-
-if (Loc>=0) and (Loc<G.lx*G.ly) and (Tile and fSpecial<>0) then {special ressources}
-  begin
-  dy:=Loc div G.lx;
-  if Tile and fTerrain<fForest then
-    TSprite(x,y,Tile and fTerrain+(Tile and fSpecial shr 5)*9)
-  else if (Tile and fTerrain=fForest) and IsJungle(dy) then
-    TSprite(x,y,8+17*9+(Tile and fSpecial shr 5)*9)
-  else TSprite(x,y,8+2*9+((Tile and fTerrain-fForest)*2+Tile and fSpecial shr 5)*9);
-  end;
-
-if ShowObjects then
-  begin
-  if Tile and fTerImp=tiMine then
-    TSprite(x,y,2+9*12);
-  if Tile and fTerImp=tiBase then
-    TSprite(x,y,4+9*12);
-  if Tile and fPoll<>0 then
-    TSprite(x,y,6+9*12);
-  if Tile and fTerImp=tiFort then
-    begin
-    TSprite(x,y,7+9*12);
-    if Tile and fObserved=0 then
-      TSprite(x,y,3+9*12);
-    end;
-  end;
-if Tile and fDeadLands<>0 then TSprite(x,y,(12+Tile shr 25 and 3)*9+8);
-
-if Options and (1 shl moEditMode)<>0 then
-  fog:= (Loc<0) or (Loc>=G.lx*G.ly)
-//else if CityLoc>=0 then
-//  fog:= (Loc<0) or (Loc>=G.lx*G.ly) or (Distance(Loc,CityLoc)>5)
-else if ShowGrWall then fog:= Tile and fGrWall=0
-else fog:=FoW and (Tile and fObserved=0);
-if fog and ShowObjects then
-  if Loc<-G.lx then
-    Sprite(HGrTerrain,x,y+yyt,xxt*2,yyt,1+6*(xxt*2+1),1+yyt*2+15*(yyt*3+1))
-  else if Loc>=G.lx*(G.ly+1) then
-    Sprite(HGrTerrain,x,y,xxt*2,yyt,1+6*(xxt*2+1),1+yyt+15*(yyt*3+1))
-  else TSprite(x,y,6+9*15,xxt<>33);
-
-if FoW and (Tile and fObserved=0) then
-  PaintBorder;
+            else
+            begin
+              cpic := CitiesPictures[age, xGr];
+              xShield := x - xxt + cpic.xShield;
+              yShield := y - 2 * yyt + cpic.yShield;
+            end;
+            s := IntToStr(CityInfo.size);
+            LabelLength := FOutput.Canvas.TextWidth(s);
+            FillRect(xShield, yShield, LabelLength + 4, 16, $000000);
+            if MyMap[CityInfo.Loc] and (fUnit or fObserved) = fObserved then
+              // empty city
+              LabelTextColor := Tribe[CityInfo.Owner].Color
+            else
+            begin
+              FillRect(xShield + 1, yShield + 1, LabelLength + 2, 14,
+                Tribe[CityInfo.Owner].Color);
+              LabelTextColor := $000000;
+            end;
+            Textout(xShield + 2, yShield - 1, LabelTextColor, s);
+          end
+        end; { PaintCity }
+
+        function PoleTile(Loc: integer): integer;
+        begin { virtual pole tile }
+          result := fUNKNOWN;
+          if Loc < -2 * G.lx then
+          else if Loc < -G.lx then
+          begin
+            if (MyMap[dLoc(Loc, 0, 2)] and fTerrain <> fUNKNOWN) and
+              (MyMap[dLoc(Loc, -2, 2)] and fTerrain <> fUNKNOWN) and
+              (MyMap[dLoc(Loc, 2, 2)] and fTerrain <> fUNKNOWN) then
+              result := fArctic;
+            if (MyMap[dLoc(Loc, 0, 2)] and fObserved <> 0) and
+              (MyMap[dLoc(Loc, -2, 2)] and fObserved <> 0) and
+              (MyMap[dLoc(Loc, 2, 2)] and fObserved <> 0) then
+              result := result or fObserved
+          end
+          else if Loc < 0 then
+          begin
+            if (MyMap[dLoc(Loc, -1, 1)] and fTerrain <> fUNKNOWN) and
+              (MyMap[dLoc(Loc, 1, 1)] and fTerrain <> fUNKNOWN) then
+              result := fArctic;
+            if (MyMap[dLoc(Loc, -1, 1)] and fObserved <> 0) and
+              (MyMap[dLoc(Loc, 1, 1)] and fObserved <> 0) then
+              result := result or fObserved
+          end
+          else if Loc < G.lx * (G.ly + 1) then
+          begin
+            if (MyMap[dLoc(Loc, -1, -1)] and fTerrain <> fUNKNOWN) and
+              (MyMap[dLoc(Loc, 1, -1)] and fTerrain <> fUNKNOWN) then
+              result := fArctic;
+            if (MyMap[dLoc(Loc, -1, -1)] and fObserved <> 0) and
+              (MyMap[dLoc(Loc, 1, -1)] and fObserved <> 0) then
+              result := result or fObserved
+          end
+          else if Loc < G.lx * (G.ly + 2) then
+          begin
+            if (MyMap[dLoc(Loc, 0, -2)] and fTerrain <> fUNKNOWN) and
+              (MyMap[dLoc(Loc, -2, -2)] and fTerrain <> fUNKNOWN) and
+              (MyMap[dLoc(Loc, 2, -2)] and fTerrain <> fUNKNOWN) then
+              result := fArctic;
+            if (MyMap[dLoc(Loc, 0, -2)] and fObserved <> 0) and
+              (MyMap[dLoc(Loc, -2, -2)] and fObserved <> 0) and
+              (MyMap[dLoc(Loc, 2, -2)] and fObserved <> 0) then
+              result := result or fObserved
+          end
+        end;
+
+        const
+          Dirx: array [0 .. 7] of integer = (1, 2, 1, 0, -1, -2, -1, 0);
+          Diry: array [0 .. 7] of integer = (-1, 0, 1, 2, 1, 0, -1, -2);
+
+        function TIsoMap.Connection4(Loc, Mask, Value: integer): integer;
+        begin
+          result := 0;
+          if dLoc(Loc, 1, -1) >= 0 then
+          begin
+            if MyMap[dLoc(Loc, 1, -1)] and Mask = Cardinal(Value) then
+              inc(result, 1);
+            if MyMap[dLoc(Loc, -1, -1)] and Mask = Cardinal(Value) then
+              inc(result, 8);
+          end;
+          if dLoc(Loc, 1, 1) < G.lx * G.ly then
+          begin
+            if MyMap[dLoc(Loc, 1, 1)] and Mask = Cardinal(Value) then
+              inc(result, 2);
+            if MyMap[dLoc(Loc, -1, 1)] and Mask = Cardinal(Value) then
+              inc(result, 4);
+          end
+        end;
+
+        function TIsoMap.Connection8(Loc, Mask: integer): integer;
+        var
+          Dir, ConnLoc: integer;
+        begin
+          result := 0;
+          for Dir := 0 to 7 do
+          begin
+            ConnLoc := dLoc(Loc, Dirx[Dir], Diry[Dir]);
+            if (ConnLoc >= 0) and (ConnLoc < G.lx * G.ly) and
+              (MyMap[ConnLoc] and Mask <> 0) then
+              inc(result, 1 shl Dir);
+          end
+        end;
+
+        function TIsoMap.OceanConnection(Loc: integer): integer;
+        var
+          Dir, ConnLoc: integer;
+        begin
+          result := 0;
+          for Dir := 0 to 7 do
+          begin
+            ConnLoc := dLoc(Loc, Dirx[Dir], Diry[Dir]);
+            if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
+              ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
+              inc(result, 1 shl Dir);
+          end
+        end;
+
+        procedure TIsoMap.PaintShore(x, y, Loc: integer);
+        var
+          Conn, Tile: integer;
+        begin
+          if (y <= FTop - yyt * 2) or (y > FBottom) or (x <= FLeft - xxt * 2) or
+            (x > FRight) then
+            exit;
+          if (Loc < 0) or (Loc >= G.lx * G.ly) then
+            exit;
+          Tile := MyMap[Loc];
+          if Tile and fTerrain >= fGrass then
+            exit;
+          Conn := OceanConnection(Loc);
+          if Conn = 0 then
+            exit;
+
+          BitBlt(GrExt[HGrTerrain].Data, x + xxt div 2, y, xxt, yyt,
+            1 + (Conn shr 6 + Conn and 1 shl 2) * (xxt * 2 + 1),
+            1 + yyt + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
+          BitBlt(GrExt[HGrTerrain].Data, x + xxt, y + yyt div 2, xxt, yyt,
+            1 + (Conn and 7) * (xxt * 2 + 1) + xxt,
+            1 + yyt * 2 + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
+          BitBlt(GrExt[HGrTerrain].Data, x + xxt div 2, y + yyt, xxt, yyt,
+            1 + (Conn shr 2 and 7) * (xxt * 2 + 1) + xxt,
+            1 + yyt + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
+          BitBlt(GrExt[HGrTerrain].Data, x, y + yyt div 2, xxt, yyt,
+            1 + (Conn shr 4 and 7) * (xxt * 2 + 1),
+            1 + yyt * 2 + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
+          Conn := Connection4(Loc, fTerrain, fUNKNOWN); { dither to black }
+          if Conn and 1 <> 0 then
+            BitBlt(GrExt[HGrTerrain].Mask, x + xxt, y, xxt, yyt,
+              1 + 7 * (xxt * 2 + 1) + xxt,
+              1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
+          if Conn and 2 <> 0 then
+            BitBlt(GrExt[HGrTerrain].Mask, x + xxt, y + yyt, xxt, yyt,
+              1 + 7 * (xxt * 2 + 1) + xxt, 1 + yyt * 2 + 15 *
+              (yyt * 3 + 1), SRCAND);
+          if Conn and 4 <> 0 then
+            BitBlt(GrExt[HGrTerrain].Mask, x, y + yyt, xxt, yyt,
+              1 + 7 * (xxt * 2 + 1), 1 + yyt * 2 + 15 * (yyt * 3 + 1), SRCAND);
+          if Conn and 8 <> 0 then
+            BitBlt(GrExt[HGrTerrain].Mask, x, y, xxt, yyt,
+              1 + 7 * (xxt * 2 + 1), 1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
+        end;
+
+        procedure TIsoMap.PaintTileExtraTerrain(x, y, Loc: integer);
+        var
+          Dir, Conn, RRConn, yGr, Tile, yLoc: integer;
+        begin
+          if (Loc < 0) or (Loc >= G.lx * G.ly) or (y <= -yyt * 2) or
+            (y > FOutput.Height) or (x <= -xxt * 2) or (x > FOutput.Width) then
+            exit;
+          Tile := MyMap[Loc];
+          if Tile and fTerrain = fForest then
+          begin
+            yLoc := Loc div G.lx;
+            if IsJungle(yLoc) then
+              yGr := 18
+            else
+              yGr := 3;
+            Conn := Connection4(Loc, fTerrain, Tile and fTerrain);
+            if (yLoc = (G.ly - 2) div 4) or (G.ly - 1 - yLoc = (G.ly + 2) div 4)
+            then
+              Conn := Conn and not 6 // no connection to south
+            else if (yLoc = (G.ly + 2) div 4) or
+              (G.ly - 1 - yLoc = (G.ly - 2) div 4) then
+              Conn := Conn and not 9; // no connection to north
+            TSprite(x, y, Conn mod 8 + (yGr + Conn div 8) * 9);
+          end
+          else if Tile and fTerrain in [fHills, fMountains, fForest] then
+          begin
+            yGr := 3 + 2 * (Tile and fTerrain - fForest);
+            Conn := Connection4(Loc, fTerrain, Tile and fTerrain);
+            TSprite(x, y, Conn mod 8 + (yGr + Conn div 8) * 9);
+          end
+          else if Tile and fDeadLands <> 0 then
+            TSprite(x, y, 2 * 9 + 6);
+
+          if ShowObjects then
+          begin
+            if Tile and fTerImp = tiFarm then
+              TSprite(x, y, 109) { farmland }
+            else if Tile and fTerImp = tiIrrigation then
+              TSprite(x, y, 108); // irrigation
+          end;
+          if Tile and fRiver <> 0 then
+          begin
+            Conn := Connection4(Loc, fRiver, fRiver) or
+              Connection4(Loc, fTerrain, fShore) or
+              Connection4(Loc, fTerrain, fUNKNOWN);
+            TSprite(x, y, Conn mod 8 + (13 + Conn div 8) * 9);
+          end;
+
+          if Tile and fTerrain < fGrass then
+          begin
+            Conn := Connection4(Loc, fRiver, fRiver);
+            for Dir := 0 to 3 do
+              if Conn and (1 shl Dir) <> 0 then { river mouths }
+                TSprite(x, y, 15 * 9 + Dir);
+            if ShowObjects then
+            begin
+              Conn := Connection8(Loc, fCanal);
+              for Dir := 0 to 7 do
+                if Conn and (1 shl Dir) <> 0 then { canal mouths }
+                  TSprite(x, y, 20 * 9 + 1 + Dir);
+            end
+          end;
+
+          if ShowObjects then
+          begin
+            if (Tile and fCanal <> 0) or (Tile and fCity <> 0) then
+            begin // paint canal connections
+              Conn := Connection8(Loc, fCanal or fCity);
+              if Tile and fCanal <> 0 then
+                Conn := Conn or ($FF - OceanConnection(Loc));
+              if Conn = 0 then
+              begin
+                if Tile and fCanal <> 0 then
+                  TSprite(x, y, 99)
+              end
+              else
+                for Dir := 0 to 7 do
+                  if (1 shl Dir) and Conn <> 0 then
+                    TSprite(x, y, 100 + Dir);
+            end;
+            if Tile and (fRR or fCity) <> 0 then
+              RRConn := Connection8(Loc, fRR or fCity)
+            else
+              RRConn := 0;
+            if Tile and (fRoad or fRR or fCity) <> 0 then
+            begin // paint road connections
+              Conn := Connection8(Loc, fRoad or fRR or fCity) and not RRConn;
+              if (Conn = 0) and (Tile and (fRR or fCity) = 0) then
+                TSprite(x, y, 81)
+              else if Conn > 0 then
+                for Dir := 0 to 7 do
+                  if (1 shl Dir) and Conn <> 0 then
+                    TSprite(x, y, 82 + Dir);
+            end;
+            // paint railroad connections
+            if (Tile and fRR <> 0) and (RRConn = 0) then
+              TSprite(x, y, 90)
+            else if RRConn > 0 then
+              for Dir := 0 to 7 do
+                if (1 shl Dir) and RRConn <> 0 then
+                  TSprite(x, y, 91 + Dir);
+          end;
+        end;
+
+        // (x,y) is top left pixel of (2*xxt,3*yyt) rectangle
+        procedure TIsoMap.PaintTileObjects(x, y, Loc, CityLoc,
+          CityOwner: integer; UseBlink: boolean);
+        type
+          TLine = array [0 .. 9 * 65, 0 .. 2] of Byte;
+        var
+          p1, p2, uix, cix, dy, Loc1, Tile, Multi, Destination: integer;
+          CityInfo: TCityInfo;
+          UnitInfo: TUnitInfo;
+          fog: boolean;
+
+          procedure NameCity;
+          var
+            cix, xs, w: integer;
+            BehindCityInfo: TCityInfo;
+            s: string;
+            IsCapital: boolean;
+          begin
+            BehindCityInfo.Loc := Loc - 2 * G.lx;
+            if ShowCityNames and (Options and (1 shl moEditMode) = 0) and
+              (BehindCityInfo.Loc >= 0) and (BehindCityInfo.Loc < G.lx * G.ly)
+              and (MyMap[BehindCityInfo.Loc] and fCity <> 0) then
+            begin
+              GetCityInfo(BehindCityInfo.Loc, cix, BehindCityInfo);
+              IsCapital := BehindCityInfo.Flags and ciCapital <> 0;
+              { if Showuix and (cix>=0) then s:=IntToStr(cix)
+                else } s := CityName(BehindCityInfo.ID);
+              w := FOutput.Canvas.TextWidth(s);
+              xs := x + xxt - (w + 1) div 2;
+              if IsCapital then
+                FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style +
+                  [fsUnderline];
+              Textout(xs + 1, y - 9, $000000, s);
+              Textout(xs, y - 10, $FFFFFF, s);
+              if IsCapital then
+                FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style -
+                  [fsUnderline];
+            end;
+          end;
+
+          procedure ShowSpacePort;
+          begin
+            if ShowObjects and (Options and (1 shl moEditMode) = 0) and
+              (Tile and fCity <> 0) and (CityInfo.Flags and ciSpacePort <> 0)
+            then
+              TSprite(x + xxt, y - 6, 12 * 9 + 5);
+          end;
+
+          procedure PaintBorder;
+          var
+            dx, dy: integer;
+            Line: ^TLine;
+          begin
+            if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
+              (Tile and fTerrain <> fUNKNOWN) then
+            begin
+              p1 := MyRO.Territory[Loc];
+              if (p1 >= 0) and (ShowMyBorder or (p1 <> me)) then
+              begin
+                if BordersOK and (1 shl p1) = 0 then
+                begin
+                  Windows.BitBlt(Borders.Canvas.Handle, 0, p1 * (yyt * 2),
+                    xxt * 2, yyt * 2, GrExt[HGrTerrain].Data.Canvas.Handle,
+                    1 + 8 * (xxt * 2 + 1),
+                    1 + yyt + 16 * (yyt * 3 + 1), SRCCOPY);
+                  for dy := 0 to yyt * 2 - 1 do
+                  begin
+                    Line := Borders.ScanLine[p1 * (yyt * 2) + dy];
+                    for dx := 0 to xxt * 2 - 1 do
+                      if Line[dx, 0] = 99 then
+                      begin
+                        Line[dx, 0] := Tribe[p1].Color shr 16 and $FF;
+                        Line[dx, 1] := Tribe[p1].Color shr 8 and $FF;
+                        Line[dx, 2] := Tribe[p1].Color and $FF;
+                      end
+                  end;
+                  BordersOK := BordersOK or 1 shl p1;
+                end;
+                for dy := 0 to 1 do
+                  for dx := 0 to 1 do
+                  begin
+                    Loc1 := dLoc(Loc, dx * 2 - 1, dy * 2 - 1);
+                    begin
+                      if (Loc1 < 0) or (Loc1 >= G.lx * G.ly) then
+                        p2 := -1
+                      else if MyMap[Loc1] and fTerrain = fUNKNOWN then
+                        p2 := p1
+                      else
+                        p2 := MyRO.Territory[Loc1];
+                      if p2 <> p1 then
+                      begin
+                        BitBlt(GrExt[HGrTerrain].Mask, x + dx * xxt,
+                          y + dy * yyt, xxt, yyt, 1 + 8 * (xxt * 2 + 1) + dx *
+                          xxt, 1 + yyt + 16 * (yyt * 3 + 1) + dy * yyt, SRCAND);
+                        BitBlt(Borders, x + dx * xxt, y + dy * yyt, xxt, yyt,
+                          dx * xxt, p1 * (yyt * 2) + dy * yyt, SRCPAINT);
+                      end
+                    end;
+                  end
+              end
+            end;
+          end;
+
+        begin
+          if (Loc < 0) or (Loc >= G.lx * G.ly) then
+            Tile := PoleTile(Loc)
+          else
+            Tile := MyMap[Loc];
+          if ShowObjects and (Options and (1 shl moEditMode) = 0) and
+            (Tile and fCity <> 0) then
+            GetCityInfo(Loc, cix, CityInfo);
+          if (y <= FTop - yyt * 2) or (y > FBottom) or (x <= FLeft - xxt * 2) or
+            (x > FRight) then
+          begin
+            NameCity;
+            ShowSpacePort;
+            exit;
+          end;
+          if Tile and fTerrain = fUNKNOWN then
+          begin
+            NameCity;
+            ShowSpacePort;
+            exit
+          end; { square not discovered }
+
+          if not(FoW and (Tile and fObserved = 0)) then
+            PaintBorder;
+
+          if (Loc >= 0) and (Loc < G.lx * G.ly) and (Loc = FAdviceLoc) then
+            TSprite(x, y, 7 + 9 * 2);
+
+          if (Loc >= 0) and (Loc < G.lx * G.ly) and (Tile and fSpecial <> 0)
+          then { special ressources }
+          begin
+            dy := Loc div G.lx;
+            if Tile and fTerrain < fForest then
+              TSprite(x, y, Tile and fTerrain + (Tile and fSpecial shr 5) * 9)
+            else if (Tile and fTerrain = fForest) and IsJungle(dy) then
+              TSprite(x, y, 8 + 17 * 9 + (Tile and fSpecial shr 5) * 9)
+            else
+              TSprite(x, y, 8 + 2 * 9 + ((Tile and fTerrain - fForest) * 2 +
+                Tile and fSpecial shr 5) * 9);
+          end;
+
+          if ShowObjects then
+          begin
+            if Tile and fTerImp = tiMine then
+              TSprite(x, y, 2 + 9 * 12);
+            if Tile and fTerImp = tiBase then
+              TSprite(x, y, 4 + 9 * 12);
+            if Tile and fPoll <> 0 then
+              TSprite(x, y, 6 + 9 * 12);
+            if Tile and fTerImp = tiFort then
+            begin
+              TSprite(x, y, 7 + 9 * 12);
+              if Tile and fObserved = 0 then
+                TSprite(x, y, 3 + 9 * 12);
+            end;
+          end;
+          if Tile and fDeadLands <> 0 then
+            TSprite(x, y, (12 + Tile shr 25 and 3) * 9 + 8);
+
+          if Options and (1 shl moEditMode) <> 0 then
+            fog := (Loc < 0) or (Loc >= G.lx * G.ly)
+            // else if CityLoc>=0 then
+            // fog:= (Loc<0) or (Loc>=G.lx*G.ly) or (Distance(Loc,CityLoc)>5)
+          else if ShowGrWall then
+            fog := Tile and fGrWall = 0
+          else
+            fog := FoW and (Tile and fObserved = 0);
+          if fog and ShowObjects then
+            if Loc < -G.lx then
+              Sprite(HGrTerrain, x, y + yyt, xxt * 2, yyt,
+                1 + 6 * (xxt * 2 + 1), 1 + yyt * 2 + 15 * (yyt * 3 + 1))
+            else if Loc >= G.lx * (G.ly + 1) then
+              Sprite(HGrTerrain, x, y, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
+                1 + yyt + 15 * (yyt * 3 + 1))
+            else
+              TSprite(x, y, 6 + 9 * 15, xxt <> 33);
+
+          if FoW and (Tile and fObserved = 0) then
+            PaintBorder;
 
 {$IFNDEF SCR}
-// paint goto destination mark
-if DestinationMarkON and (CityOwner<0) and (UnFocus>=0)
-  and (MyUn[UnFocus].Status and usGoto<>0) then
-  begin
-  Destination:=MyUn[UnFocus].Status shr 16;
-  if (Destination=Loc) and (Destination<>MyUn[UnFocus].Loc) then
-    if not UseBlink or BlinkOn then TSprite(x,y,8+9*1)
-    else TSprite(x,y,8+9*2)
-  end;  
+          // paint goto destination mark
+          if DestinationMarkON and (CityOwner < 0) and (UnFocus >= 0) and
+            (MyUn[UnFocus].Status and usGoto <> 0) then
+          begin
+            Destination := MyUn[UnFocus].Status shr 16;
+            if (Destination = Loc) and (Destination <> MyUn[UnFocus].Loc) then
+              if not UseBlink or BlinkOn then
+                TSprite(x, y, 8 + 9 * 1)
+              else
+                TSprite(x, y, 8 + 9 * 2)
+          end;
 {$ENDIF}
-
-if Options and (1 shl moEditMode)<>0 then
-  begin
-  if Tile and fPrefStartPos<>0 then TSprite(x,y,0+9*1)
-  else if Tile and fStartPos<>0 then TSprite(x,y,0+9*2);
-  end
-else if ShowObjects then
-  begin
-{  if (CityLoc<0) and (UnFocus>=0) and (Loc=MyUn[UnFocus].Loc) then
-    if BlinkOn then TSprite(x,y,8+9*0)
-    else TSprite(x,y,8+9*1);}
-
-  NameCity;
-  ShowSpacePort;
-  if Tile and fCity<>0 then
-    PaintCity(x+xxt,y+yyt,CityInfo,CityOwner<0);
-
-  if (Tile and fUnit<>0) and (Loc<>AttLoc)
-    and ((Loc<>DefLoc) or (DefHealth<>0))
-    {$IFNDEF SCR}and ((CityOwner>=0) or (UnFocus<0) or not UseBlink or BlinkON
-        or (Loc<>MyUn[UnFocus].Loc)){$ENDIF}
-    and ((Tile and fCity<>fCity) or (Loc=DefLoc)
-      {$IFNDEF SCR}or (not UseBlink or BlinkON) and (UnFocus>=0)
-      and (Loc=MyUn[UnFocus].Loc){$ENDIF}) then
-    begin {unit}
-    GetUnitInfo(Loc,uix,UnitInfo);
-    if (Loc=DefLoc) and (DefHealth>=0) then
-      UnitInfo.Health:=DefHealth;
-    if (UnitInfo.Owner<>CityOwner)
-      and not ((CityOwner=me) and (MyRO.Treaty[UnitInfo.Owner]=trAlliance)) then
-      {$IFNDEF SCR}if (UnFocus>=0) and (Loc=MyUn[UnFocus].Loc) then {active unit}
-        begin
-        Multi:=UnitInfo.Flags and unMulti;
-        MakeUnitInfo(me,MyUn[UnFocus],UnitInfo);
-        UnitInfo.Flags:=UnitInfo.Flags or Multi;
-        PaintUnit(x+(xxt-xxu),y+(yyt-yyu_anchor),UnitInfo,MyUn[UnFocus].Status);
-        end
-      else if UnitInfo.Owner=me then
-        begin
-        if ClientMode=cMovieTurn then
-          PaintUnit(x+(xxt-xxu),y+(yyt-yyu_anchor),UnitInfo,0)
-          // status is not set with precise timing during loading 
-        else PaintUnit(x+(xxt-xxu),y+(yyt-yyu_anchor),UnitInfo,MyUn[uix].Status);
-  //      if Showuix then Textout(x+16,y+5,$80FF00,IntToStr(uix));
-        end
-      else{$ENDIF} PaintUnit(x+(xxt-xxu),y+(yyt-yyu_anchor),UnitInfo,0);
-    end
-  else if Tile and fHiddenUnit<>0 then
-    Sprite(HGrStdUnits,x+(xxt-xxu),y+(yyt-yyu_anchor),xxu*2,yyu*2,
-      1+5*(xxu*2+1),1)
-  else if Tile and fStealthUnit<>0 then
-    Sprite(HGrStdUnits,x+(xxt-xxu),y+(yyt-yyu_anchor),xxu*2,yyu*2,
-      1+5*(xxu*2+1),1+1*(yyu*2+1))
-  end;
-
-if ShowObjects and (Tile and fTerImp=tiFort) and (Tile and fObserved<>0) then
-  TSprite(x,y,3+9*12);
-
-if (Loc>=0) and (Loc<G.lx*G.ly) then
-  if ShowLoc then Textout(x+xxt-16,y+yyt-9,$FFFF00,IntToStr(Loc))
-  else if ShowDebug and (DebugMap<>nil)
-    and (Loc>=0) and (Loc<G.lx*G.ly) and (DebugMap[Loc]<>0) then
-    Textout(x+xxt-16,y+yyt-9,$00E0FF,IntToStr(integer(DebugMap[Loc])))
-end;{PaintTileObjects}
-
-procedure TIsoMap.PaintGrid(x,y,nx,ny: integer);
-
-  procedure ClippedLine(dx0,dy0: integer; mirror: boolean);
-  var
-  x0,x1,dxmin,dymin,dxmax,dymax,n: integer;
-  begin
-  with FOutput.Canvas do
-    begin
-    dxmin:=(FLeft-x) div xxt;
-    dymin:=(RealTop-y) div yyt;
-    dxmax:=(FRight-x-1) div xxt+1;
-    dymax:=(RealBottom-y-1) div yyt+1;
-    n:=dymax-dy0;
-    if mirror then
-      begin
-      if dx0-dxmin<n then n:=dx0-dxmin;
-      if dx0>dxmax then
-        begin n:=n-(dx0-dxmax); dy0:=dy0+(dx0-dxmax); dx0:=dxmax end;
-      if dy0<dymin then
-        begin n:=n-(dymin-dy0); dx0:=dx0-(dymin-dy0); dy0:=dymin end;
-      end
-    else
-      begin
-      if dxmax-dx0<n then n:=dxmax-dx0;
-      if dx0<dxmin then
-        begin n:=n-(dxmin-dx0); dy0:=dy0+(dxmin-dx0); dx0:=dxmin end;
-      if dy0<dymin then
-        begin n:=n-(dymin-dy0); dx0:=dx0+(dymin-dy0); dy0:=dymin end;
-      end;
-    if n<=0 then exit;
-    if mirror then begin x0:=x+dx0*xxt-1; x1:=x+(dx0-n)*xxt-1; end
-    else begin x0:=x+dx0*xxt; x1:=x+(dx0+n)*xxt; end;
-    moveto(x0,y+dy0*yyt);
-    lineto(x1,y+(dy0+n)*yyt);
-    end
-  end;
-
-var
-i: integer;
-begin
-FOutput.Canvas.pen.color:=$000000; //$FF shl (8*random(3));
-for i:=0 to nx div 2 do ClippedLine(i*2,0,false);
-for i:=1 to (nx+1) div 2 do ClippedLine(i*2,0,true);
-for i:=0 to ny div 2 do
-  begin
-  ClippedLine(0,2*i+2,false);
-  ClippedLine(nx+1,2*i+1+nx and 1,true);
-  end;
-end;
-
-procedure TIsoMap.Paint(x,y,Loc,nx,ny,CityLoc,CityOwner:integer;
-  UseBlink: boolean; CityAllowClick: boolean);
-
-  function IsShoreTile(Loc: integer):boolean;
-  const
-  Dirx: array[0..7] of integer=(1,2,1,0,-1,-2,-1,0);
-  Diry: array[0..7] of integer=(-1,0,1,2,1,0,-1,-2);
-  var
-  Dir,ConnLoc: integer;
-  begin
-  result:=false;
-  for Dir:=0 to 7 do
-    begin
-    ConnLoc:=dLoc(Loc,Dirx[Dir],Diry[Dir]);
-    if (ConnLoc<0) or (ConnLoc>=G.lx*G.ly)
-      or ((MyMap[ConnLoc]-2) and fTerrain<13) then
-      result:=true
-    end
-  end;
-
-  procedure ShadeOutside(x0,y0,x1,y1,xm,ym: integer);
-  const
-  rShade=3.75;
-
-    procedure MakeDark(line: pointer; length: integer);
-    type
-    TCardArray=array[0..9999] of cardinal;
-    PCardArray=^TCardArray;
-    TByteArray=array[0..9999] of byte;
-    PByteArray=^TByteArray;
-    var
-    i,rest: integer;
-    begin
-    for i:=length*3 div 4-1 downto 0 do
-      PCardArray(line)[i]:=PCardArray(line)[i] shr 1 and $7F7F7F7F;
-    rest:=(length*3 div 4)*4;
-    for i:=length*3 mod 4-1 downto 0 do
-      PByteArray(line)[rest+i]:=PByteArray(line)[rest+i] shr 1 and $7F;
-    end;
-
-  type
-  TLine=array[0..99999,0..2] of Byte;
-  var
-  y,wBright: integer;
-  y_n,w_n: single;
-  line: ^TLine;
-  begin
-  for y:=y0 to y1-1 do
-    begin
-    line:=FOutput.ScanLine[y];
-    y_n:=(y-ym)/yyt;
-    if abs(y_n)<rShade then
-      begin
-      w_n:=sqrt(sqr(rShade)-sqr(y_n));
-      wBright:=trunc(w_n*xxt+0.5);
-      MakeDark(@line[x0],xm-x0-wBright);
-      MakeDark(@line[xm+wBright],x1-xm-wBright);
-      end
-    else MakeDark(@line[x0],x1-x0);
-    end
-  end;
-
-  procedure CityGrid(xm,ym: integer);
-  var
-  i: integer;
-  begin
-  with FOutput.Canvas do
-    begin
-    if CityAllowClick then pen.Color:=$FFFFFF
-    else pen.color:=$000000;
-    pen.width:=1;
-    for i:=0 to 3 do
-      begin
-      moveto(xm-xxt*(4-i),ym+yyt*(1+i)); lineto(xm+xxt*(1+i),ym-yyt*(4-i));
-      moveto(xm-xxt*(4-i),ym-yyt*(1+i)); lineto(xm+xxt*(1+i),ym+yyt*(4-i));
-      end;
-    moveto(xm-xxt*4,ym+yyt*1); lineto(xm-xxt*1,ym+yyt*4);
-    moveto(xm+xxt*1,ym+yyt*4); lineto(xm+xxt*4,ym+yyt*1);
-    moveto(xm-xxt*4,ym-yyt*1); lineto(xm-xxt*1,ym-yyt*4);
-    moveto(xm+xxt*1,ym-yyt*4); lineto(xm+xxt*4,ym-yyt*1);
-    pen.width:=1;
-    end
-  end;
-
-var
-dx,dy,xm,ym,ALoc,BLoc,ATer,BTer,Aix,bix:integer;
-begin
-FoW:=true;
-ShowLoc:=Options and (1 shl moLocCodes)<>0;
-ShowDebug:= pDebugMap>=0;
-ShowObjects:= (CityOwner>=0) or (Options and (1 shl moBareTerrain)=0);
-ShowCityNames:= ShowObjects and (CityOwner<0) and (Options and (1 shl moCityNames)<>0);
-ShowBorder:=true;
-ShowMyBorder:= CityOwner<0;
-ShowGrWall:= (CityOwner<0) and (Options and (1 shl moGreatWall)<>0);
-if ShowDebug then
-  Server(sGetDebugMap,me,pDebugMap,DebugMap)
-else DebugMap:=nil;
-with FOutput.Canvas do
-  begin
-  RealTop:=y-((Loc+12345*G.lx) div G.lx-12345)*yyt;
-  RealBottom:=y+(G.ly-((Loc+12345*G.lx) div G.lx-12345)+3)*yyt;
-  Brush.Color:=EmptySpaceColor;
-  if RealTop>FTop then
-    FillRect(Rect(FLeft,FTop,FRight,RealTop))
-  else RealTop:=FTop;
-  if RealBottom<FBottom then
-    FillRect(Rect(FLeft,RealBottom,FRight,FBottom))
-  else RealBottom:=FBottom;
-  Brush.Color:=$000000;
-  FillRect(Rect(FLeft,RealTop,FRight,RealBottom));
-  Brush.Style:=bsClear;
-  end;
-
-for dy:=0 to ny+1 do if (Loc+dy*G.lx>=0) and (Loc+(dy-3)*G.lx<G.lx*G.ly) then
-  for dx:=0 to nx do
-    begin
-    ALoc:=dLoc(Loc,dx-(dy+dx) and 1,dy-2);
-    BLoc:=dLoc(Loc,dx-(dy+dx+1) and 1,dy-1);
-    if (ALoc<0) or (ALoc>=G.lx*G.ly) then ATer:=PoleTile(ALoc) and fTerrain
-    else ATer:=MyMap[ALoc] and fTerrain;
-    if (BLoc<0) or (BLoc>=G.lx*G.ly) then BTer:=PoleTile(BLoc) and fTerrain
-    else BTer:=MyMap[BLoc] and fTerrain;
-
-    if (ATer<>fUNKNOWN) or (BTer<>fUNKNOWN) then
-      if ((ATer<fGrass) or (ATer=fUNKNOWN)) and ((BTer<fGrass) or (BTer=fUNKNOWN)) then
-        begin
-        if ATer=fUNKNOWN then Aix:=0
-        else if IsShoreTile(ALoc) then
-          if ATer=fOcean then Aix:=-1
-          else Aix:=1
-        else Aix:=ATer+2;
-        if BTer=fUNKNOWN then bix:=0
-        else if IsShoreTile(BLoc) then
-          if BTer=fOcean then bix:=-1
-          else bix:=1
-        else bix:=BTer+2;
-        if (Aix>1) or (bix>1) then
-          begin
-          if aix=-1 then
-            if bix=fOcean+2 then begin aix:=0; bix:=0 end
-            else begin aix:=0; bix:=1 end
-          else if bix=-1 then
-            if aix=fOcean+2 then begin aix:=1; bix:=1 end
-            else begin aix:=1; bix:=0 end;
-          BitBlt(OceanPatch,x+dx*xxt,y+dy*yyt,xxt,yyt,
-            Aix*(xxt*2)+(dx+dy+1) and 1 *xxt,bix*yyt,SRCCOPY)
+          if Options and (1 shl moEditMode) <> 0 then
+          begin
+            if Tile and fPrefStartPos <> 0 then
+              TSprite(x, y, 0 + 9 * 1)
+            else if Tile and fStartPos <> 0 then
+              TSprite(x, y, 0 + 9 * 2);
           end
-        end
-      else
-        begin
-        if ATer=fUNKNOWN then Aix:=0
-        else if (ALoc>=0) and (ALoc<G.lx*G.ly) and (MyMap[ALoc] and fDeadLands<>0) then
-          Aix:=-2
-        else if ATer=fOcean then Aix:=-1
-        else if ATer=fShore then Aix:=1
-        else if ATer>=fForest then Aix:=8
-        else Aix:=ATer;
-        if BTer=fUNKNOWN then bix:=0
-        else if (BLoc>=0) and (BLoc<G.lx*G.ly) and (MyMap[BLoc] and fDeadLands<>0) then
-          Bix:=-2
-        else if BTer=fOcean then bix:=-1
-        else if BTer=fShore then bix:=1
-        else if BTer>=fForest then bix:=8
-        else bix:=BTer;
-        if (Aix=-2) and (Bix=-2) then
-          begin Aix:=fDesert; Bix:=fDesert end
-        else if Aix=-2 then
-          if Bix<2 then Aix:=8 else Aix:=Bix
-        else if Bix=-2 then
-          if Aix<2 then Bix:=8 else Bix:=Aix;
-        if Aix=-1 then BitBlt(GrExt[HGrTerrain].Data,x+dx*xxt,y+dy*yyt,xxt,yyt,
-          1+6*(xxt*2+1)+(dx+dy+1) and 1 *xxt,1+yyt,SRCCOPY) // arctic <-> ocean
-        else if bix=-1 then BitBlt(GrExt[HGrTerrain].Data,x+dx*xxt,y+dy*yyt,xxt,
-          yyt,1+6*(xxt*2+1)+xxt-(dx+dy+1) and 1 *xxt,1+yyt*2,SRCCOPY) // arctic <-> ocean
-        else BitBlt(LandPatch,x+dx*xxt,y+dy*yyt,xxt,yyt,
-          Aix*(xxt*2)+(dx+dy+1) and 1 *xxt,bix*yyt,SRCCOPY)
-        end
-    end;
-
-OutDC:=FOutput.Canvas.Handle;
-DataDC:=GrExt[HGrTerrain].Data.Canvas.Handle;
-MaskDC:=GrExt[HGrTerrain].Mask.Canvas.Handle;
-for dy:=-2 to ny+1 do for dx:=-1 to nx do if (dx+dy) and 1=0 then
-  PaintShore(x+xxt*dx,y+yyt+yyt*dy,dLoc(Loc,dx,dy));
-for dy:=-2 to ny+1 do for dx:=-1 to nx do if (dx+dy) and 1=0 then
-  PaintTileExtraTerrain(x+xxt*dx,y+yyt+yyt*dy,dLoc(Loc,dx,dy));
-if CityOwner>=0 then
-  begin
-  for dy:=-2 to ny+1 do for dx:=-2 to nx+1 do if (dx+dy) and 1=0 then
-    begin
-    ALoc:=dLoc(Loc,dx,dy);
-    if Distance(ALoc,CityLoc)>5 then
-      PaintTileObjects(x+xxt*dx,y+yyt+yyt*dy,ALoc,CityLoc,CityOwner,UseBlink);
-    end;
-  dx:=((CityLoc mod G.lx *2 +CityLoc div G.lx and 1)
-    -((Loc+666*G.lx) mod G.lx *2
-    +(Loc+666*G.lx) div G.lx and 1)+3*G.lx) mod (2*G.lx) -G.lx;
-  dy:=CityLoc div G.lx-(Loc+666*G.lx) div G.lx+666;
-  xm:=x+(dx+1)*xxt;
-  ym:=y+(dy+1)*yyt+yyt;
-  ShadeOutside(FLeft,FTop,FRight,FBottom,xm,ym);
-  CityGrid(xm,ym);
-  for dy:=-2 to ny+1 do for dx:=-2 to nx+1 do if (dx+dy) and 1=0 then
-    begin
-    ALoc:=dLoc(Loc,dx,dy);
-    if Distance(ALoc,CityLoc)<=5 then
-      PaintTileObjects(x+xxt*dx,y+yyt+yyt*dy,ALoc,CityLoc,CityOwner,UseBlink);
-    end;
-  end
-else
-  begin
-  if ShowLoc or (Options and (1 shl moEditMode)<>0)
-    or (Options and (1 shl moGrid)<>0) then
-    PaintGrid(x,y,nx,ny);
-  for dy:=-2 to ny+1 do for dx:=-2 to nx+1 do if (dx+dy) and 1=0 then
-    PaintTileObjects(x+xxt*dx,y+yyt+yyt*dy,dLoc(Loc,dx,dy),CityLoc,CityOwner,UseBlink);
-  end;
-
-//frame(FOutput.Canvas,x+1,y+1,x+nx*33+33-2,y+ny*16+32-2,$FFFF,$FFFF);
-end; {Paint}
-
-procedure TIsoMap.AttackBegin(const ShowMove: TShowMove);
-begin
-AttLoc:=ShowMove.FromLoc;
-DefLoc:=dLoc(AttLoc,ShowMove.dx,ShowMove.dy);
-DefHealth:=-1;
-end;
-
-procedure TIsoMap.AttackEffect(const ShowMove: TShowMove);
-begin
-DefHealth:=ShowMove.EndHealthDef;
-end;
-
-procedure TIsoMap.AttackEnd;
-begin
-AttLoc:=-1;
-DefLoc:=-1;
-end;
-
+          else if ShowObjects then
+          begin
+            { if (CityLoc<0) and (UnFocus>=0) and (Loc=MyUn[UnFocus].Loc) then
+              if BlinkOn then TSprite(x,y,8+9*0)
+              else TSprite(x,y,8+9*1); }
+
+            NameCity;
+            ShowSpacePort;
+            if Tile and fCity <> 0 then
+              PaintCity(x + xxt, y + yyt, CityInfo, CityOwner < 0);
+
+            if (Tile and fUnit <> 0) and (Loc <> AttLoc) and
+              ((Loc <> DefLoc) or (DefHealth <> 0))
+{$IFNDEF SCR} and ((CityOwner >= 0) or (UnFocus < 0) or not UseBlink or
+              BlinkOn or (Loc <> MyUn[UnFocus].Loc)){$ENDIF}
+              and ((Tile and fCity <> fCity) or (Loc = DefLoc)
+{$IFNDEF SCR} or (not UseBlink or BlinkOn) and (UnFocus >= 0) and
+              (Loc = MyUn[UnFocus].Loc){$ENDIF}) then
+            begin { unit }
+              GetUnitInfo(Loc, uix, UnitInfo);
+              if (Loc = DefLoc) and (DefHealth >= 0) then
+                UnitInfo.Health := DefHealth;
+              if (UnitInfo.Owner <> CityOwner) and
+                not((CityOwner = me) and
+                (MyRO.Treaty[UnitInfo.Owner] = trAlliance)) then
+{$IFNDEF SCR} if (UnFocus >= 0) and (Loc = MyUn[UnFocus].Loc) then { active unit }
+                begin
+                  Multi := UnitInfo.Flags and unMulti;
+                  MakeUnitInfo(me, MyUn[UnFocus], UnitInfo);
+                  UnitInfo.Flags := UnitInfo.Flags or Multi;
+                  PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor), UnitInfo,
+                    MyUn[UnFocus].Status);
+                end
+                else if UnitInfo.Owner = me then
+                begin
+                  if ClientMode = cMovieTurn then
+                    PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor),
+                      UnitInfo, 0)
+                    // status is not set with precise timing during loading
+                  else
+                    PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor), UnitInfo,
+                      MyUn[uix].Status);
+                  // if Showuix then Textout(x+16,y+5,$80FF00,IntToStr(uix));
+                end
+                else {$ENDIF} PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor), UnitInfo, 0);
+            end
+            else if Tile and fHiddenUnit <> 0 then
+              Sprite(HGrStdUnits, x + (xxt - xxu), y + (yyt - yyu_anchor),
+                xxu * 2, yyu * 2, 1 + 5 * (xxu * 2 + 1), 1)
+            else if Tile and fStealthUnit <> 0 then
+              Sprite(HGrStdUnits, x + (xxt - xxu), y + (yyt - yyu_anchor),
+                xxu * 2, yyu * 2, 1 + 5 * (xxu * 2 + 1), 1 + 1 * (yyu * 2 + 1))
+          end;
+
+          if ShowObjects and (Tile and fTerImp = tiFort) and
+            (Tile and fObserved <> 0) then
+            TSprite(x, y, 3 + 9 * 12);
+
+          if (Loc >= 0) and (Loc < G.lx * G.ly) then
+            if ShowLoc then
+              Textout(x + xxt - 16, y + yyt - 9, $FFFF00, IntToStr(Loc))
+            else if ShowDebug and (DebugMap <> nil) and (Loc >= 0) and
+              (Loc < G.lx * G.ly) and (DebugMap[Loc] <> 0) then
+              Textout(x + xxt - 16, y + yyt - 9, $00E0FF,
+                IntToStr(integer(DebugMap[Loc])))
+        end; { PaintTileObjects }
+
+        procedure TIsoMap.PaintGrid(x, y, nx, ny: integer);
+
+          procedure ClippedLine(dx0, dy0: integer; mirror: boolean);
+          var
+            x0, x1, dxmin, dymin, dxmax, dymax, n: integer;
+          begin
+            with FOutput.Canvas do
+            begin
+              dxmin := (FLeft - x) div xxt;
+              dymin := (RealTop - y) div yyt;
+              dxmax := (FRight - x - 1) div xxt + 1;
+              dymax := (RealBottom - y - 1) div yyt + 1;
+              n := dymax - dy0;
+              if mirror then
+              begin
+                if dx0 - dxmin < n then
+                  n := dx0 - dxmin;
+                if dx0 > dxmax then
+                begin
+                  n := n - (dx0 - dxmax);
+                  dy0 := dy0 + (dx0 - dxmax);
+                  dx0 := dxmax
+                end;
+                if dy0 < dymin then
+                begin
+                  n := n - (dymin - dy0);
+                  dx0 := dx0 - (dymin - dy0);
+                  dy0 := dymin
+                end;
+              end
+              else
+              begin
+                if dxmax - dx0 < n then
+                  n := dxmax - dx0;
+                if dx0 < dxmin then
+                begin
+                  n := n - (dxmin - dx0);
+                  dy0 := dy0 + (dxmin - dx0);
+                  dx0 := dxmin
+                end;
+                if dy0 < dymin then
+                begin
+                  n := n - (dymin - dy0);
+                  dx0 := dx0 + (dymin - dy0);
+                  dy0 := dymin
+                end;
+              end;
+              if n <= 0 then
+                exit;
+              if mirror then
+              begin
+                x0 := x + dx0 * xxt - 1;
+                x1 := x + (dx0 - n) * xxt - 1;
+              end
+              else
+              begin
+                x0 := x + dx0 * xxt;
+                x1 := x + (dx0 + n) * xxt;
+              end;
+              moveto(x0, y + dy0 * yyt);
+              lineto(x1, y + (dy0 + n) * yyt);
+            end
+          end;
+
+        var
+          i: integer;
+        begin
+          FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
+          for i := 0 to nx div 2 do
+            ClippedLine(i * 2, 0, false);
+          for i := 1 to (nx + 1) div 2 do
+            ClippedLine(i * 2, 0, true);
+          for i := 0 to ny div 2 do
+          begin
+            ClippedLine(0, 2 * i + 2, false);
+            ClippedLine(nx + 1, 2 * i + 1 + nx and 1, true);
+          end;
+        end;
+
+        procedure TIsoMap.Paint(x, y, Loc, nx, ny, CityLoc, CityOwner: integer;
+          UseBlink: boolean; CityAllowClick: boolean);
+
+          function IsShoreTile(Loc: integer): boolean;
+          const
+            Dirx: array [0 .. 7] of integer = (1, 2, 1, 0, -1, -2, -1, 0);
+            Diry: array [0 .. 7] of integer = (-1, 0, 1, 2, 1, 0, -1, -2);
+          var
+            Dir, ConnLoc: integer;
+          begin
+            result := false;
+            for Dir := 0 to 7 do
+            begin
+              ConnLoc := dLoc(Loc, Dirx[Dir], Diry[Dir]);
+              if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
+                ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
+                result := true
+            end
+          end;
+
+          procedure ShadeOutside(x0, y0, x1, y1, xm, ym: integer);
+          const
+            rShade = 3.75;
+
+            procedure MakeDark(Line: pointer; length: integer);
+            type
+              TCardArray = array [0 .. 9999] of Cardinal;
+              PCardArray = ^TCardArray;
+              TByteArray = array [0 .. 9999] of Byte;
+              PByteArray = ^TByteArray;
+            var
+              i, rest: integer;
+            begin
+              for i := length * 3 div 4 - 1 downto 0 do
+                PCardArray(Line)[i] := PCardArray(Line)[i] shr 1 and $7F7F7F7F;
+              rest := (length * 3 div 4) * 4;
+              for i := length * 3 mod 4 - 1 downto 0 do
+                PByteArray(Line)[rest + i] := PByteArray(Line)
+                  [rest + i] shr 1 and $7F;
+            end;
+
+          type
+            TLine = array [0 .. 99999, 0 .. 2] of Byte;
+          var
+            y, wBright: integer;
+            y_n, w_n: single;
+            Line: ^TLine;
+          begin
+            for y := y0 to y1 - 1 do
+            begin
+              Line := FOutput.ScanLine[y];
+              y_n := (y - ym) / yyt;
+              if abs(y_n) < rShade then
+              begin
+                w_n := sqrt(sqr(rShade) - sqr(y_n));
+                wBright := trunc(w_n * xxt + 0.5);
+                MakeDark(@Line[x0], xm - x0 - wBright);
+                MakeDark(@Line[xm + wBright], x1 - xm - wBright);
+              end
+              else
+                MakeDark(@Line[x0], x1 - x0);
+            end
+          end;
+
+          procedure CityGrid(xm, ym: integer);
+          var
+            i: integer;
+          begin
+            with FOutput.Canvas do
+            begin
+              if CityAllowClick then
+                pen.Color := $FFFFFF
+              else
+                pen.Color := $000000;
+              pen.Width := 1;
+              for i := 0 to 3 do
+              begin
+                moveto(xm - xxt * (4 - i), ym + yyt * (1 + i));
+                lineto(xm + xxt * (1 + i), ym - yyt * (4 - i));
+                moveto(xm - xxt * (4 - i), ym - yyt * (1 + i));
+                lineto(xm + xxt * (1 + i), ym + yyt * (4 - i));
+              end;
+              moveto(xm - xxt * 4, ym + yyt * 1);
+              lineto(xm - xxt * 1, ym + yyt * 4);
+              moveto(xm + xxt * 1, ym + yyt * 4);
+              lineto(xm + xxt * 4, ym + yyt * 1);
+              moveto(xm - xxt * 4, ym - yyt * 1);
+              lineto(xm - xxt * 1, ym - yyt * 4);
+              moveto(xm + xxt * 1, ym - yyt * 4);
+              lineto(xm + xxt * 4, ym - yyt * 1);
+              pen.Width := 1;
+            end
+          end;
+
+        var
+          dx, dy, xm, ym, ALoc, BLoc, ATer, BTer, Aix, bix: integer;
+        begin
+          FoW := true;
+          ShowLoc := Options and (1 shl moLocCodes) <> 0;
+          ShowDebug := pDebugMap >= 0;
+          ShowObjects := (CityOwner >= 0) or
+            (Options and (1 shl moBareTerrain) = 0);
+          ShowCityNames := ShowObjects and (CityOwner < 0) and
+            (Options and (1 shl moCityNames) <> 0);
+          ShowBorder := true;
+          ShowMyBorder := CityOwner < 0;
+          ShowGrWall := (CityOwner < 0) and
+            (Options and (1 shl moGreatWall) <> 0);
+          if ShowDebug then
+            Server(sGetDebugMap, me, pDebugMap, DebugMap)
+          else
+            DebugMap := nil;
+          with FOutput.Canvas do
+          begin
+            RealTop := y - ((Loc + 12345 * G.lx) div G.lx - 12345) * yyt;
+            RealBottom := y +
+              (G.ly - ((Loc + 12345 * G.lx) div G.lx - 12345) + 3) * yyt;
+            Brush.Color := EmptySpaceColor;
+            if RealTop > FTop then
+              FillRect(Rect(FLeft, FTop, FRight, RealTop))
+            else
+              RealTop := FTop;
+            if RealBottom < FBottom then
+              FillRect(Rect(FLeft, RealBottom, FRight, FBottom))
+            else
+              RealBottom := FBottom;
+            Brush.Color := $000000;
+            FillRect(Rect(FLeft, RealTop, FRight, RealBottom));
+            Brush.Style := bsClear;
+          end;
+
+          for dy := 0 to ny + 1 do
+            if (Loc + dy * G.lx >= 0) and (Loc + (dy - 3) * G.lx < G.lx * G.ly)
+            then
+              for dx := 0 to nx do
+              begin
+                ALoc := dLoc(Loc, dx - (dy + dx) and 1, dy - 2);
+                BLoc := dLoc(Loc, dx - (dy + dx + 1) and 1, dy - 1);
+                if (ALoc < 0) or (ALoc >= G.lx * G.ly) then
+                  ATer := PoleTile(ALoc) and fTerrain
+                else
+                  ATer := MyMap[ALoc] and fTerrain;
+                if (BLoc < 0) or (BLoc >= G.lx * G.ly) then
+                  BTer := PoleTile(BLoc) and fTerrain
+                else
+                  BTer := MyMap[BLoc] and fTerrain;
+
+                if (ATer <> fUNKNOWN) or (BTer <> fUNKNOWN) then
+                  if ((ATer < fGrass) or (ATer = fUNKNOWN)) and
+                    ((BTer < fGrass) or (BTer = fUNKNOWN)) then
+                  begin
+                    if ATer = fUNKNOWN then
+                      Aix := 0
+                    else if IsShoreTile(ALoc) then
+                      if ATer = fOcean then
+                        Aix := -1
+                      else
+                        Aix := 1
+                    else
+                      Aix := ATer + 2;
+                    if BTer = fUNKNOWN then
+                      bix := 0
+                    else if IsShoreTile(BLoc) then
+                      if BTer = fOcean then
+                        bix := -1
+                      else
+                        bix := 1
+                    else
+                      bix := BTer + 2;
+                    if (Aix > 1) or (bix > 1) then
+                    begin
+                      if Aix = -1 then
+                        if bix = fOcean + 2 then
+                        begin
+                          Aix := 0;
+                          bix := 0
+                        end
+                        else
+                        begin
+                          Aix := 0;
+                          bix := 1
+                        end
+                      else if bix = -1 then
+                        if Aix = fOcean + 2 then
+                        begin
+                          Aix := 1;
+                          bix := 1
+                        end
+                        else
+                        begin
+                          Aix := 1;
+                          bix := 0
+                        end;
+                      BitBlt(OceanPatch, x + dx * xxt, y + dy * yyt, xxt, yyt,
+                        Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt,
+                        bix * yyt, SRCCOPY)
+                    end
+                  end
+                  else
+                  begin
+                    if ATer = fUNKNOWN then
+                      Aix := 0
+                    else if (ALoc >= 0) and (ALoc < G.lx * G.ly) and
+                      (MyMap[ALoc] and fDeadLands <> 0) then
+                      Aix := -2
+                    else if ATer = fOcean then
+                      Aix := -1
+                    else if ATer = fShore then
+                      Aix := 1
+                    else if ATer >= fForest then
+                      Aix := 8
+                    else
+                      Aix := ATer;
+                    if BTer = fUNKNOWN then
+                      bix := 0
+                    else if (BLoc >= 0) and (BLoc < G.lx * G.ly) and
+                      (MyMap[BLoc] and fDeadLands <> 0) then
+                      bix := -2
+                    else if BTer = fOcean then
+                      bix := -1
+                    else if BTer = fShore then
+                      bix := 1
+                    else if BTer >= fForest then
+                      bix := 8
+                    else
+                      bix := BTer;
+                    if (Aix = -2) and (bix = -2) then
+                    begin
+                      Aix := fDesert;
+                      bix := fDesert
+                    end
+                    else if Aix = -2 then
+                      if bix < 2 then
+                        Aix := 8
+                      else
+                        Aix := bix
+                    else if bix = -2 then
+                      if Aix < 2 then
+                        bix := 8
+                      else
+                        bix := Aix;
+                    if Aix = -1 then
+                      BitBlt(GrExt[HGrTerrain].Data, x + dx * xxt, y + dy * yyt,
+                        xxt, yyt, 1 + 6 * (xxt * 2 + 1) + (dx + dy + 1) and
+                        1 * xxt, 1 + yyt, SRCCOPY) // arctic <-> ocean
+                    else if bix = -1 then
+                      BitBlt(GrExt[HGrTerrain].Data, x + dx * xxt, y + dy * yyt,
+                        xxt, yyt, 1 + 6 * (xxt * 2 + 1) + xxt - (dx + dy + 1)
+                        and 1 * xxt, 1 + yyt * 2, SRCCOPY) // arctic <-> ocean
+                    else
+                      BitBlt(LandPatch, x + dx * xxt, y + dy * yyt, xxt, yyt,
+                        Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt,
+                        bix * yyt, SRCCOPY)
+                  end
+              end;
+
+          OutDC := FOutput.Canvas.Handle;
+          DataDC := GrExt[HGrTerrain].Data.Canvas.Handle;
+          MaskDC := GrExt[HGrTerrain].Mask.Canvas.Handle;
+          for dy := -2 to ny + 1 do
+            for dx := -1 to nx do
+              if (dx + dy) and 1 = 0 then
+                PaintShore(x + xxt * dx, y + yyt + yyt * dy, dLoc(Loc, dx, dy));
+          for dy := -2 to ny + 1 do
+            for dx := -1 to nx do
+              if (dx + dy) and 1 = 0 then
+                PaintTileExtraTerrain(x + xxt * dx, y + yyt + yyt * dy,
+                  dLoc(Loc, dx, dy));
+          if CityOwner >= 0 then
+          begin
+            for dy := -2 to ny + 1 do
+              for dx := -2 to nx + 1 do
+                if (dx + dy) and 1 = 0 then
+                begin
+                  ALoc := dLoc(Loc, dx, dy);
+                  if Distance(ALoc, CityLoc) > 5 then
+                    PaintTileObjects(x + xxt * dx, y + yyt + yyt * dy, ALoc,
+                      CityLoc, CityOwner, UseBlink);
+                end;
+            dx := ((CityLoc mod G.lx * 2 + CityLoc div G.lx and 1) -
+              ((Loc + 666 * G.lx) mod G.lx * 2 + (Loc + 666 * G.lx) div G.lx and
+              1) + 3 * G.lx) mod (2 * G.lx) - G.lx;
+            dy := CityLoc div G.lx - (Loc + 666 * G.lx) div G.lx + 666;
+            xm := x + (dx + 1) * xxt;
+            ym := y + (dy + 1) * yyt + yyt;
+            ShadeOutside(FLeft, FTop, FRight, FBottom, xm, ym);
+            CityGrid(xm, ym);
+            for dy := -2 to ny + 1 do
+              for dx := -2 to nx + 1 do
+                if (dx + dy) and 1 = 0 then
+                begin
+                  ALoc := dLoc(Loc, dx, dy);
+                  if Distance(ALoc, CityLoc) <= 5 then
+                    PaintTileObjects(x + xxt * dx, y + yyt + yyt * dy, ALoc,
+                      CityLoc, CityOwner, UseBlink);
+                end;
+          end
+          else
+          begin
+            if ShowLoc or (Options and (1 shl moEditMode) <> 0) or
+              (Options and (1 shl moGrid) <> 0) then
+              PaintGrid(x, y, nx, ny);
+            for dy := -2 to ny + 1 do
+              for dx := -2 to nx + 1 do
+                if (dx + dy) and 1 = 0 then
+                  PaintTileObjects(x + xxt * dx, y + yyt + yyt * dy,
+                    dLoc(Loc, dx, dy), CityLoc, CityOwner, UseBlink);
+          end;
+
+          // frame(FOutput.Canvas,x+1,y+1,x+nx*33+33-2,y+ny*16+32-2,$FFFF,$FFFF);
+        end; { Paint }
+
+        procedure TIsoMap.AttackBegin(const ShowMove: TShowMove);
+        begin
+          AttLoc := ShowMove.FromLoc;
+          DefLoc := dLoc(AttLoc, ShowMove.dx, ShowMove.dy);
+          DefHealth := -1;
+        end;
+
+        procedure TIsoMap.AttackEffect(const ShowMove: TShowMove);
+        begin
+          DefHealth := ShowMove.EndHealthDef;
+        end;
+
+        procedure TIsoMap.AttackEnd;
+        begin
+          AttLoc := -1;
+          DefLoc := -1;
+        end;
 
 initialization
 
-NoMap:=nil;
-LandPatch:=nil;
-OceanPatch:=nil;
-Borders:=nil;
+NoMap := nil;
+LandPatch := nil;
+OceanPatch := nil;
+Borders := nil;
+
 end.
-

trunk/LocalPlayer/LocalPlayer.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit LocalPlayer;
 
 interface
 
-procedure Client(Command,Player:integer;var Data); stdcall;
+procedure Client(Command, Player: integer; var Data); stdcall;
 
 procedure SetAIName(p: integer; Name: string);
-
 
 implementation
 
 uses
-Term,CityScreen,Draft,MessgEx,Select,CityType,Help,UnitStat,Diagram,
-NatStat,Wonders,Nego,Enhance,BaseWin,Battle,Rates,TechTree,
+  Term, CityScreen, Draft, MessgEx, Select, CityType, Help, UnitStat, Diagram,
+  NatStat, Wonders, Nego, Enhance, BaseWin, Battle, Rates, TechTree,
 
-Forms;
+  Forms;
 
 var
-FormsCreated: boolean;
+  FormsCreated: boolean;
 
 procedure Client;
 begin
-if not FormsCreated then
+  if not FormsCreated then
   begin
-  FormsCreated:=true;
-  BaseWin.CreateOffscreen;
-  Application.CreateForm(TMainScreen, MainScreen);
-  Application.CreateForm(TCityDlg, CityDlg);
-  Application.CreateForm(TModalSelectDlg, ModalSelectDlg);
-  Application.CreateForm(TListDlg, ListDlg);
-  Application.CreateForm(TMessgExDlg, MessgExDlg);
-  Application.CreateForm(TDraftDlg, DraftDlg);
-  Application.CreateForm(TCityTypeDlg, CityTypeDlg);
-  Application.CreateForm(THelpDlg, HelpDlg);
-  Application.CreateForm(TUnitStatDlg, UnitStatDlg);
-  Application.CreateForm(TDiaDlg, DiaDlg);
-  Application.CreateForm(TNatStatDlg, NatStatDlg);
-  Application.CreateForm(TWondersDlg, WondersDlg);
-  Application.CreateForm(TNegoDlg, NegoDlg);
-  Application.CreateForm(TEnhanceDlg, EnhanceDlg);
-  Application.CreateForm(TBattleDlg, BattleDlg);
-  //Application.CreateForm(TAdvisorDlg, AdvisorDlg);
-  Application.CreateForm(TRatesDlg, RatesDlg);
-  Application.CreateForm(TTechTreeDlg, TechTreeDlg);
+    FormsCreated := true;
+    BaseWin.CreateOffscreen;
+    Application.CreateForm(TMainScreen, MainScreen);
+    Application.CreateForm(TCityDlg, CityDlg);
+    Application.CreateForm(TModalSelectDlg, ModalSelectDlg);
+    Application.CreateForm(TListDlg, ListDlg);
+    Application.CreateForm(TMessgExDlg, MessgExDlg);
+    Application.CreateForm(TDraftDlg, DraftDlg);
+    Application.CreateForm(TCityTypeDlg, CityTypeDlg);
+    Application.CreateForm(THelpDlg, HelpDlg);
+    Application.CreateForm(TUnitStatDlg, UnitStatDlg);
+    Application.CreateForm(TDiaDlg, DiaDlg);
+    Application.CreateForm(TNatStatDlg, NatStatDlg);
+    Application.CreateForm(TWondersDlg, WondersDlg);
+    Application.CreateForm(TNegoDlg, NegoDlg);
+    Application.CreateForm(TEnhanceDlg, EnhanceDlg);
+    Application.CreateForm(TBattleDlg, BattleDlg);
+    // Application.CreateForm(TAdvisorDlg, AdvisorDlg);
+    Application.CreateForm(TRatesDlg, RatesDlg);
+    Application.CreateForm(TTechTreeDlg, TechTreeDlg);
   end;
-MainScreen.Client(Command,Player,Data);
+  MainScreen.Client(Command, Player, Data);
 end;
 
 procedure SetAIName(p: integer; Name: string);
 begin
-MainScreen.SetAIName(p, Name);
+  MainScreen.SetAIName(p, Name);
 end;
 
 initialization
-FormsCreated:=false;
+
+FormsCreated := false;
 
 end.
-

trunk/LocalPlayer/MessgEx.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit MessgEx;
 
@@ -6 +5 @@
 
 uses
-  Messg,Protocol,ScreenTools,
-
-  Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms,ButtonA,
+  Messg, Protocol, ScreenTools,
+
+  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
   ButtonB, ButtonBase, StdCtrls;
 
@@ -18 +17 @@
     RemoveBtn: TButtonB;
     EInput: TEdit;
-    procedure FormCreate(Sender:TObject);
-    procedure FormPaint(Sender:TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormPaint(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Button1Click(Sender: TObject);
@@ -30 +29 @@
     Kind, IconKind, IconIndex, HelpKind, HelpNo, CenterTo: integer;
     OpenSound: string;
-    function ShowModal: Integer; override;
+    function ShowModal: integer; override;
     procedure CancelMovie;
   private
     MovieCancelled: boolean;
-    procedure PaintBook(ca: TCanvas; x,y,clPage,clCover: integer);
+    procedure PaintBook(ca: TCanvas; x, y, clPage, clCover: integer);
     procedure PaintMyArmy;
     procedure PaintEnemyArmy;
-    procedure OnPlaySound(var Msg:TMessage); message WM_PLAYSOUND;
+    procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   end;
 
 const
-// extra message kinds
-mkYesNoCancel=4; mkOkCancelRemove=5; mkOkHelp=6; mkModel=7;
-
-
-//message icon kinds
-mikNone=-1; mikImp=0; mikModel=1; mikTribe=2; mikBook=3; mikAge=4;
-mikPureIcon=5; mikMyArmy=6; mikEnemyArmy=7; mikFullControl=8; mikShip=9;
-mikBigIcon=10; mikEnemyShipComplete=11;
-
-
-var
-  MessgExDlg:TMessgExDlg;
+  // extra message kinds
+  mkYesNoCancel = 4;
+  mkOkCancelRemove = 5;
+  mkOkHelp = 6;
+  mkModel = 7;
+
+  // message icon kinds
+  mikNone = -1;
+  mikImp = 0;
+  mikModel = 1;
+  mikTribe = 2;
+  mikBook = 3;
+  mikAge = 4;
+  mikPureIcon = 5;
+  mikMyArmy = 6;
+  mikEnemyArmy = 7;
+  mikFullControl = 8;
+  mikShip = 9;
+  mikBigIcon = 10;
+  mikEnemyShipComplete = 11;
+
+var
+  MessgExDlg: TMessgExDlg;
 
 procedure SoundMessageEx(SimpleText, SoundItem: string);
 procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
-function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string):
-  integer;
-procedure ContextMessage(SimpleText, SoundItem: string; ContextKind,
-  ContextNo: integer);
-
+function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string)
+  : integer;
+procedure ContextMessage(SimpleText, SoundItem: string;
+  ContextKind, ContextNo: integer);
 
 implementation
 
 uses
-ClientTools,BaseWin,Term,Help, Select, Diplomacy, Inp, UnitStat, Tribes,
-IsoEngine,Diagram;
+  ClientTools, BaseWin, Term, Help, Select, Diplomacy, Inp, UnitStat, Tribes,
+  IsoEngine, Diagram;
 
 {$R *.DFM}
 
 const
-LostUnitsPerLine=6;
-
-var
-PerfFreq: int64;
-
-
-procedure TMessgExDlg.FormCreate(Sender:TObject);
-begin
-inherited;
-IconKind:=mikNone;
-CenterTo:=0;
-OpenSound:='';
+  LostUnitsPerLine = 6;
+
+var
+  PerfFreq: int64;
+
+procedure TMessgExDlg.FormCreate(Sender: TObject);
+begin
+  inherited;
+  IconKind := mikNone;
+  CenterTo := 0;
+  OpenSound := '';
 end;
 
 procedure TMessgExDlg.FormShow(Sender: TObject);
 var
-i: integer;
-begin
-if IconKind=mikEnemyArmy then
-  InitAllEnemyModels;
-
-Button1.Visible:= GameMode<>cMovie;
-Button2.Visible:= (GameMode<>cMovie) and (Kind<>mkOk);
-Button3.Visible:= (GameMode<>cMovie) and (Kind=mkYesNoCancel);
-RemoveBtn.Visible:= (GameMode<>cMovie) and (Kind=mkOkCancelRemove);
-EInput.Visible:= (GameMode<>cMovie) and (Kind=mkModel);
-if Button3.Visible then
-  begin Button1.Left:=43; Button2.Left:=159; end
-else if Button2.Visible then
-  begin Button1.Left:=101; Button2.Left:=217; end
-else Button1.Left:=159;
-RemoveBtn.Left:=ClientWidth-38;
-case Kind of
-  mkYesNo, mkYesNoCancel:
+  i: integer;
+begin
+  if IconKind = mikEnemyArmy then
+    InitAllEnemyModels;
+
+  Button1.Visible := GameMode <> cMovie;
+  Button2.Visible := (GameMode <> cMovie) and (Kind <> mkOk);
+  Button3.Visible := (GameMode <> cMovie) and (Kind = mkYesNoCancel);
+  RemoveBtn.Visible := (GameMode <> cMovie) and (Kind = mkOkCancelRemove);
+  EInput.Visible := (GameMode <> cMovie) and (Kind = mkModel);
+  if Button3.Visible then
+  begin
+    Button1.Left := 43;
+    Button2.Left := 159;
+  end
+  else if Button2.Visible then
+  begin
+    Button1.Left := 101;
+    Button2.Left := 217;
+  end
+  else
+    Button1.Left := 159;
+  RemoveBtn.Left := ClientWidth - 38;
+  case Kind of
+    mkYesNo, mkYesNoCancel:
+      begin
+        Button1.Caption := Phrases.Lookup('BTN_YES');
+        Button2.Caption := Phrases.Lookup('BTN_NO')
+      end;
+    mkOKCancel, mkOkCancelRemove:
+      begin
+        Button1.Caption := Phrases.Lookup('BTN_OK');
+        Button2.Caption := Phrases.Lookup('BTN_CANCEL');
+      end;
+  else
     begin
-    Button1.Caption:=Phrases.Lookup('BTN_YES');
-    Button2.Caption:=Phrases.Lookup('BTN_NO')
+      Button1.Caption := Phrases.Lookup('BTN_OK');
+      Button2.Caption := Phrases.Lookup('BTN_INFO');
     end;
-  mkOKCancel, mkOkCancelRemove:
+  end;
+  Button3.Caption := Phrases.Lookup('BTN_CANCEL');
+  RemoveBtn.Hint := Phrases.Lookup('BTN_DELGAME');
+
+  case IconKind of
+    mikImp, mikModel, mikAge, mikPureIcon:
+      TopSpace := 56;
+    mikBigIcon:
+      TopSpace := 152;
+    mikEnemyShipComplete:
+      TopSpace := 136;
+    mikBook:
+      if IconIndex >= 0 then
+        TopSpace := 84
+      else
+        TopSpace := 47;
+    mikTribe:
+      begin
+        Tribe[IconIndex].InitAge(GetAge(IconIndex));
+        if Tribe[IconIndex].faceHGr >= 0 then
+          TopSpace := 64
+      end;
+    mikFullControl:
+      TopSpace := 80;
+    mikShip:
+      TopSpace := 240;
+  else
+    TopSpace := 0;
+  end;
+
+  SplitText(true);
+  ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
+  if GameMode = cMovie then
+    ClientHeight := ClientHeight - 32;
+  if Kind = mkModel then
+    ClientHeight := ClientHeight + 36;
+  if IconKind in [mikMyArmy, mikEnemyArmy] then
+  begin
+    if nLostArmy > LostUnitsPerLine * 6 then
+      ClientHeight := ClientHeight + 6 * 48
+    else
+      ClientHeight := ClientHeight + ((nLostArmy - 1) div LostUnitsPerLine
+        + 1) * 48;
+  end;
+  case CenterTo of
+    0:
+      begin
+        Left := (Screen.Width - ClientWidth) div 2;
+        Top := (Screen.Height - ClientHeight) div 2 - MapCenterUp;
+      end;
+    1:
+      begin
+        Left := (Screen.Width - ClientWidth) div 4;
+        Top := (Screen.Height - ClientHeight) * 2 div 3 - MapCenterUp;
+      end;
+    -1:
+      begin
+        Left := (Screen.Width - ClientWidth) div 4;
+        Top := (Screen.Height - ClientHeight) div 3 - MapCenterUp;
+      end;
+  end;
+  for i := 0 to ControlCount - 1 do
+    Controls[i].Top := ClientHeight - (34 + Border);
+  if Kind = mkModel then
+    EInput.Top := ClientHeight - (76 + Border);
+end;
+
+function TMessgExDlg.ShowModal: integer;
+var
+  Ticks0, Ticks: int64;
+begin
+  if GameMode = cMovie then
+  begin
+    if not((GameMode = cMovie) and (MovieSpeed = 4)) then
     begin
-    Button1.Caption:=Phrases.Lookup('BTN_OK');
-    Button2.Caption:=Phrases.Lookup('BTN_CANCEL');
+      MovieCancelled := false;
+      Show;
+      QueryPerformanceCounter(Ticks0);
+      repeat
+        Application.ProcessMessages;
+        Sleep(1);
+        QueryPerformanceCounter(Ticks);
+      until MovieCancelled or ((Ticks - Ticks0) * 1000 >= 1500 * PerfFreq);
+      Hide;
     end;
-  else
+    result := mrOk;
+  end
+  else
+    result := inherited ShowModal;
+end;
+
+procedure TMessgExDlg.CancelMovie;
+begin
+  MovieCancelled := true;
+end;
+
+procedure TMessgExDlg.PaintBook(ca: TCanvas; x, y, clPage, clCover: integer);
+const
+  xScrewed = 77;
+  yScrewed = 10;
+  wScrewed = 43;
+  hScrewed = 27;
+type
+  TLine = array [0 .. 9999, 0 .. 2] of Byte;
+var
+  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon, xb, yb, wb, hb: integer;
+  x1, xR, yR, share: single;
+  Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
+  SrcLine: ^TLine;
+
+begin
+  if IconIndex >= 0 then
+  begin
+    xIcon := IconIndex mod 7 * xSizeBig;
+    yIcon := (IconIndex + SystemIconLines * 7) div 7 * ySizeBig;
+    // prepare screwed icon
+    fillchar(Screwed, sizeof(Screwed), 0);
+    for iy := 0 to 39 do
     begin
-    Button1.Caption:=Phrases.Lookup('BTN_OK');
-    Button2.Caption:=Phrases.Lookup('BTN_INFO');
+      SrcLine := BigImp.ScanLine[iy + yIcon];
+      for ix := 0 to 55 do
+      begin
+        xR := ix * (37 + iy * 5 / 40) / 56;
+        xDst := Trunc(xR);
+        xR := Frac(xR);
+        x1 := (120 - ix) * (120 - ix) - 10000;
+        yR := iy * 18 / 40 + x1 * x1 / 4000000;
+        yDst := Trunc(yR);
+        yR := Frac(yR);
+        for dx := 0 to 1 do
+          for dy := 0 to 1 do
+          begin
+            if dx = 0 then
+              share := 1 - xR
+            else
+              share := xR;
+            if dy = 0 then
+              share := share * (1 - yR)
+            else
+              share := share * yR;
+            Screwed[xDst + dx, yDst + dy, 0] := Screwed[xDst + dx, yDst + dy, 0]
+              + share * SrcLine[ix + xIcon, 0];
+            Screwed[xDst + dx, yDst + dy, 1] := Screwed[xDst + dx, yDst + dy, 1]
+              + share * SrcLine[ix + xIcon, 1];
+            Screwed[xDst + dx, yDst + dy, 2] := Screwed[xDst + dx, yDst + dy, 2]
+              + share * SrcLine[ix + xIcon, 2];
+            Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
+              3] + share;
+          end
+      end;
     end;
-  end;
-Button3.Caption:=Phrases.Lookup('BTN_CANCEL');
-RemoveBtn.Hint:=Phrases.Lookup('BTN_DELGAME');
-
-case IconKind of
-  mikImp,mikModel,mikAge,mikPureIcon:
-    TopSpace:=56;
-  mikBigIcon:
-    TopSpace:=152;
-  mikEnemyShipComplete:
-    TopSpace:=136;
-  mikBook:
-    if IconIndex>=0 then TopSpace:=84
-    else TopSpace:=47;
-  mikTribe:
+    xb := xBBook;
+    yb := yBBook;
+    wb := wBBook;
+    hb := hBBook;
+  end
+  else
+  begin
+    xb := xSBook;
+    yb := ySBook;
+    wb := wSBook;
+    hb := hSBook;
+  end;
+  x := x - wb div 2;
+
+  // paint
+  BitBlt(LogoBuffer.Canvas.Handle, 0, 0, wb, hb, ca.Handle, x, y, SRCCOPY);
+
+  if IconIndex >= 0 then
+    for iy := 0 to hScrewed - 1 do
+      for ix := 0 to wScrewed - 1 do
+        if Screwed[ix, iy, 3] > 0.01 then
+          LogoBuffer.Canvas.Pixels[xScrewed + ix, yScrewed + iy] :=
+            Trunc(Screwed[ix, iy, 2] / Screwed[ix, iy, 3]) +
+            Trunc(Screwed[ix, iy, 1] / Screwed[ix, iy, 3]) shl 8 +
+            Trunc(Screwed[ix, iy, 0] / Screwed[ix, iy, 3]) shl 16;
+
+  ImageOp_BCC(LogoBuffer, Templates, 0, 0, xb, yb, wb, hb, clCover, clPage);
+
+  BitBlt(ca.Handle, x, y, wb, hb, LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
+end;
+
+procedure TMessgExDlg.PaintMyArmy;
+begin
+end;
+
+procedure TMessgExDlg.PaintEnemyArmy;
+var
+  emix, ix, iy, x, y, count, UnitsInLine: integer;
+begin
+  ix := 0;
+  iy := 0;
+  if nLostArmy > LostUnitsPerLine then
+    UnitsInLine := LostUnitsPerLine
+  else
+    UnitsInLine := nLostArmy;
+  for emix := 0 to MyRO.nEnemyModel - 1 do
+    for count := 0 to LostArmy[emix] - 1 do
     begin
-    Tribe[IconIndex].InitAge(GetAge(IconIndex));
-    if Tribe[IconIndex].faceHGr>=0 then
-      TopSpace:=64
-    end;
-  mikFullControl:
-    TopSpace:=80;  
-  mikShip:
-    TopSpace:=240;
-  else TopSpace:=0;
-  end;
-
-SplitText(true);
-ClientHeight:=72+Border+TopSpace+Lines*MessageLineSpacing;
-if GameMode=cMovie then ClientHeight:=ClientHeight-32;
-if Kind=mkModel then
-  ClientHeight:=ClientHeight+36;
-if IconKind in [mikMyArmy,mikEnemyArmy] then
-  begin
-  if nLostArmy>LostUnitsPerLine*6 then ClientHeight:=ClientHeight+6*48
-  else ClientHeight:=ClientHeight+((nLostArmy-1) div LostUnitsPerLine +1)*48;
-  end;
-case CenterTo of
-  0:
-    begin
-    Left:=(Screen.Width-ClientWidth) div 2;
-    Top:=(Screen.Height-ClientHeight) div 2-MapCenterUp;
-    end;
-  1:
-    begin
-    Left:=(Screen.Width-ClientWidth) div 4;
-    Top:=(Screen.Height-ClientHeight)*2 div 3-MapCenterUp;
-    end;
-  -1:
-    begin
-    Left:=(Screen.Width-ClientWidth) div 4;
-    Top:=(Screen.Height-ClientHeight) div 3-MapCenterUp;
-    end;
-  end;
-for i:=0 to ControlCount-1 do
-  Controls[i].Top:=ClientHeight-(34+Border);
-if Kind=mkModel then
-  EInput.Top:=ClientHeight-(76+Border);
-end;
-
-function TMessgExDlg.ShowModal: Integer;
-var
-Ticks0,Ticks: int64;
-begin
-if GameMode=cMovie then
-  begin
-  if not ((GameMode=cMovie) and (MovieSpeed=4)) then
-    begin
-    MovieCancelled:=false;
-    Show;
-    QueryPerformanceCounter(Ticks0);
-    repeat
-      Application.ProcessMessages;
-      Sleep(1);
-      QueryPerformanceCounter(Ticks);
-    until MovieCancelled or ((Ticks-Ticks0)*1000>=1500*PerfFreq);
-    Hide;
-    end;
-  result:=mrOk;
-  end
-else
-  result:=inherited ShowModal;
-end;
-
-procedure TMessgExDlg.CancelMovie;
-begin
-MovieCancelled:=true;
-end;
-
-procedure TMessgExDlg.PaintBook(ca: TCanvas; x,y,clPage,clCover: integer);
-const
-xScrewed=77; yScrewed=10; wScrewed=43; hScrewed=27;
-type
-TLine=array[0..9999,0..2] of Byte;
-var
-ix,iy,xDst,yDst,dx,dy,xIcon,yIcon,xb,yb,wb,hb: integer;
-x1,xR,yR,share: single;
-Screwed: array[0..wScrewed-1,0..hScrewed-1,0..3] of single;
-SrcLine: ^TLine;
-
-begin
-if IconIndex>=0 then
-  begin
-  xIcon:=IconIndex mod 7*xSizeBig;
-  yIcon:=(IconIndex+SystemIconLines*7) div 7*ySizeBig;
-  // prepare screwed icon
-  fillchar(Screwed,sizeof(Screwed),0);
-  for iy:=0 to 39 do
-    begin
-    SrcLine:=BigImp.ScanLine[iy+yIcon];
-    for ix:=0 to 55 do
-      begin
-      xR:=ix*(37+iy*5/40)/56;
-      xDst:=Trunc(xR);
-      xR:=Frac(xR);
-      x1:=(120-ix)*(120-ix)-10000;
-      yR:=iy*18/40 +x1*x1/4000000;
-      yDst:=Trunc(yR);
-      yR:=Frac(yR);
-      for dx:=0 to 1 do for dy:=0 to 1 do
-        begin
-        if dx=0 then share:=1-xR else share:=xR;
-        if dy=0 then share:=share*(1-yR) else share:=share*yR;
-        Screwed[xDst+dx,yDst+dy,0]:=
-          Screwed[xDst+dx,yDst+dy,0]+share*SrcLine[ix+xIcon,0];
-        Screwed[xDst+dx,yDst+dy,1]:=
-          Screwed[xDst+dx,yDst+dy,1]+share*SrcLine[ix+xIcon,1];
-        Screwed[xDst+dx,yDst+dy,2]:=
-          Screwed[xDst+dx,yDst+dy,2]+share*SrcLine[ix+xIcon,2];
-        Screwed[xDst+dx,yDst+dy,3]:=
-          Screwed[xDst+dx,yDst+dy,3]+share;
-        end
-      end;
-    end;
-  xb:=xBBook; yb:=yBBook; wb:=wBBook; hb:=hBBook;
-  end
-else begin xb:=xSBook; yb:=ySBook; wb:=wSBook; hb:=hSBook; end;
-x:=x-wb div 2;
-
-// paint
-BitBlt(LogoBuffer.Canvas.Handle,0,0,wb,hb,ca.handle,x,y,SRCCOPY);
-
-if IconIndex>=0 then
-  for iy:=0 to hScrewed-1 do for ix:=0 to wScrewed-1 do
-    if Screwed[ix,iy,3]>0.01 then
-    LogoBuffer.Canvas.Pixels[xScrewed+ix,yScrewed+iy]:=
-      trunc(Screwed[ix,iy,2]/Screwed[ix,iy,3])
-      +trunc(Screwed[ix,iy,1]/Screwed[ix,iy,3]) shl 8
-      +trunc(Screwed[ix,iy,0]/Screwed[ix,iy,3]) shl 16;
-
-ImageOp_BCC(LogoBuffer,Templates,0,0,xb,yb,wb,hb,clCover,clPage);
-
-BitBlt(ca.handle,x,y,wb,hb,LogoBuffer.Canvas.Handle,0,0,SRCCOPY);
-end;
-
-procedure TMessgExDlg.PaintMyArmy;
-begin
-end;
-
-procedure TMessgExDlg.PaintEnemyArmy;
-var
-emix,ix,iy,x,y,count,UnitsInLine: integer;
-begin
-ix:=0;
-iy:=0;
-if nLostArmy>LostUnitsPerLine then
-  UnitsInLine:=LostUnitsPerLine
-else UnitsInLine:=nLostArmy;
-for emix:=0 to MyRO.nEnemyModel-1 do
-  for count:=0 to LostArmy[emix]-1 do
-    begin
-    x:=ClientWidth div 2+ix*64-UnitsInLine*32;
-    y:=26+Border+TopSpace+Lines*MessageLineSpacing+iy*48;
-    with MyRO.EnemyModel[emix],Tribe[Owner].ModelPicture[mix] do
-      begin
-      BitBlt(Canvas.Handle,x,y,64,48,GrExt[HGr].Mask.Canvas.Handle,
-        pix mod 10 *65+1,pix div 10 *49+1,SRCAND);
-      BitBlt(Canvas.Handle,x,y,64,48,GrExt[HGr].Data.Canvas.Handle,
-        pix mod 10 *65+1,pix div 10 *49+1,SRCPAINT);
-      end;  
-
-    // next position
-    inc(ix);
-    if ix=LostUnitsPerLine then
+      x := ClientWidth div 2 + ix * 64 - UnitsInLine * 32;
+      y := 26 + Border + TopSpace + Lines * MessageLineSpacing + iy * 48;
+      with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
+      begin
+        BitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Mask.Canvas.Handle,
+          pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
+        BitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Data.Canvas.Handle,
+          pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
+      end;
+
+      // next position
+      inc(ix);
+      if ix = LostUnitsPerLine then
       begin // next line
-      ix:=0;
-      inc(iy);
-      if iy=6 then
-        exit;
-      UnitsInLine:=nLostArmy-LostUnitsPerLine*iy;
-      if UnitsInLine>LostUnitsPerLine then
-        UnitsInLine:=LostUnitsPerLine;
+        ix := 0;
+        inc(iy);
+        if iy = 6 then
+          exit;
+        UnitsInLine := nLostArmy - LostUnitsPerLine * iy;
+        if UnitsInLine > LostUnitsPerLine then
+          UnitsInLine := LostUnitsPerLine;
       end
     end;
 end;
 
-procedure TMessgExDlg.FormPaint(Sender:TObject);
-var
-p1,clSaveTextLight,clSaveTextShade: integer;
-begin
-if (IconKind=mikImp) and (IconIndex=27) then
+procedure TMessgExDlg.FormPaint(Sender: TObject);
+var
+  p1, clSaveTextLight, clSaveTextShade: integer;
+begin
+  if (IconKind = mikImp) and (IconIndex = 27) then
   begin // "YOU WIN" message
-  clSaveTextLight:=MainTexture.clTextLight;
-  clSaveTextShade:=MainTexture.clTextShade;
-  MainTexture.clTextLight:=$000000; // gold
-  MainTexture.clTextShade:=$0FDBFF;
-  inherited;
-  MainTexture.clTextLight:=clSaveTextLight;
-  MainTexture.clTextShade:=clSaveTextShade;
-  end
-else
-  inherited;
-
-case IconKind of
-  mikImp:
-    if Imp[IconIndex].Kind=ikWonder then
-      begin
-      p1:=MyRO.Wonder[IconIndex].EffectiveOwner;
-      BitBlt(Buffer.Canvas.Handle,0,0,xSizeBig+2*GlowRange,ySizeBig+2*GlowRange,
-        Canvas.Handle,ClientWidth div 2-(28+GlowRange),24-GlowRange,SRCCOPY);
-      BitBlt(Buffer.Canvas.Handle,GlowRange,GlowRange,xSizeBig,ySizeBig,
-        BigImp.Canvas.Handle,IconIndex mod 7*xSizeBig,
-        (IconIndex+SystemIconLines*7) div 7*ySizeBig,SRCCOPY);
-      if p1<0 then
-        GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig, $000000)
-      else GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
-        Tribe[p1].Color);
-      BitBlt(Canvas.Handle,ClientWidth div 2-(28+GlowRange),24-GlowRange,
-        xSizeBig+2*GlowRange,ySizeBig+2*GlowRange,Buffer.Canvas.Handle,0,0,
-        SRCCOPY);
+    clSaveTextLight := MainTexture.clTextLight;
+    clSaveTextShade := MainTexture.clTextShade;
+    MainTexture.clTextLight := $000000; // gold
+    MainTexture.clTextShade := $0FDBFF;
+    inherited;
+    MainTexture.clTextLight := clSaveTextLight;
+    MainTexture.clTextShade := clSaveTextShade;
+  end
+  else
+    inherited;
+
+  case IconKind of
+    mikImp:
+      if Imp[IconIndex].Kind = ikWonder then
+      begin
+        p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
+        BitBlt(Buffer.Canvas.Handle, 0, 0, xSizeBig + 2 * GlowRange,
+          ySizeBig + 2 * GlowRange, Canvas.Handle,
+          ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange, SRCCOPY);
+        BitBlt(Buffer.Canvas.Handle, GlowRange, GlowRange, xSizeBig, ySizeBig,
+          BigImp.Canvas.Handle, IconIndex mod 7 * xSizeBig,
+          (IconIndex + SystemIconLines * 7) div 7 * ySizeBig, SRCCOPY);
+        if p1 < 0 then
+          GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig, $000000)
+        else
+          GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
+            Tribe[p1].Color);
+        BitBlt(Canvas.Handle, ClientWidth div 2 - (28 + GlowRange),
+          24 - GlowRange, xSizeBig + 2 * GlowRange, ySizeBig + 2 * GlowRange,
+          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
       end
-    else ImpImage(Canvas,ClientWidth div 2-28,24,IconIndex);
-  mikAge:
-    begin
-    if IconIndex=0 then
-      ImpImage(Canvas,ClientWidth div 2-28,24,-7)
-    else ImpImage(Canvas,ClientWidth div 2-28,24,24+IconIndex)
-    end;
-  mikModel:
-    with Tribe[me].ModelPicture[IconIndex] do
-      begin
-      FrameImage(Canvas,BigImp,ClientWidth div 2-28,24,xSizeBig,ySizeBig,0,0);
-      BitBlt(Canvas.Handle,ClientWidth div 2-32,20,64,44,
-        GrExt[HGr].Mask.Canvas.Handle,pix mod 10 *65+1,pix div 10*49+1,SRCAND);
-      BitBlt(Canvas.Handle,ClientWidth div 2-32,20,64,44,
-        GrExt[HGr].Data.Canvas.Handle,pix mod 10 *65+1,pix div 10*49+1,SRCPAINT);
-      end;
-  mikBook:
-    PaintBook(Canvas,ClientWidth div 2,24,MainTexture.clPage,MainTexture.clCover);
-  mikTribe:
-    if Tribe[IconIndex].faceHGr>=0 then
-      begin
-      Frame(Canvas,ClientWidth div 2-32-1,24-1,ClientWidth div 2+32,
-        24+48,$000000,$000000);
-      BitBlt(Canvas.Handle,ClientWidth div 2-32,24,64,48,
-        GrExt[Tribe[IconIndex].faceHGr].Data.Canvas.Handle,
-        1+Tribe[IconIndex].facepix mod 10 *65,
-        1+Tribe[IconIndex].facepix div 10 *49, SRCCOPY)
-      end;
-  mikPureIcon:
-    FrameImage(Canvas, BigImp, ClientWidth div 2-28,24,xSizeBig, ySizeBig,
-      IconIndex mod 7*xSizeBig,
-      IconIndex div 7*ySizeBig);
-  mikBigIcon:
-    FrameImage(Canvas, BigImp, ClientWidth div 2-3*28,32,xSizeBig*3, ySizeBig*3,
-      IconIndex mod 2*3*xSizeBig,
-      IconIndex div 2*3*ySizeBig);
-  mikEnemyShipComplete:
-    begin
-    BitBlt(Buffer.Canvas.Handle,0,0,140,120,Canvas.Handle,
-      (ClientWidth-140) div 2,24,SRCCOPY);
-    ImageOp_BCC(Buffer,Templates,0,0,1,279,140,120,0,$FFFFFF);
-    BitBlt(Canvas.Handle,(ClientWidth-140) div 2,24,140,
-      120,Buffer.Canvas.Handle,0,0,SRCCOPY);
-    end;
-  mikMyArmy:
-    PaintMyArmy;
-  mikEnemyArmy:
-    PaintEnemyArmy;
-  mikFullControl:
-    Sprite(Canvas,HGrSystem2,ClientWidth div 2-31,24,63,63,1,281);
-  mikShip:
-    PaintColonyShip(Canvas,IconIndex,17,ClientWidth-34,38);
-  end;
-
-if EInput.Visible then EditFrame(Canvas,EInput.BoundsRect,MainTexture);
-
-if OpenSound<>'' then PostMessage(Handle, WM_PLAYSOUND, 0, 0);
-end; {FormPaint}
+      else
+        ImpImage(Canvas, ClientWidth div 2 - 28, 24, IconIndex);
+    mikAge:
+      begin
+        if IconIndex = 0 then
+          ImpImage(Canvas, ClientWidth div 2 - 28, 24, -7)
+        else
+          ImpImage(Canvas, ClientWidth div 2 - 28, 24, 24 + IconIndex)
+      end;
+    mikModel:
+      with Tribe[me].ModelPicture[IconIndex] do
+      begin
+        FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig,
+          ySizeBig, 0, 0);
+        BitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Mask.Canvas.Handle, pix mod 10 * 65 + 1,
+          pix div 10 * 49 + 1, SRCAND);
+        BitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Data.Canvas.Handle, pix mod 10 * 65 + 1,
+          pix div 10 * 49 + 1, SRCPAINT);
+      end;
+    mikBook:
+      PaintBook(Canvas, ClientWidth div 2, 24, MainTexture.clPage,
+        MainTexture.clCover);
+    mikTribe:
+      if Tribe[IconIndex].faceHGr >= 0 then
+      begin
+        Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
+          ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
+        BitBlt(Canvas.Handle, ClientWidth div 2 - 32, 24, 64, 48,
+          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas.Handle,
+          1 + Tribe[IconIndex].facepix mod 10 * 65,
+          1 + Tribe[IconIndex].facepix div 10 * 49, SRCCOPY)
+      end;
+    mikPureIcon:
+      FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig, ySizeBig,
+        IconIndex mod 7 * xSizeBig, IconIndex div 7 * ySizeBig);
+    mikBigIcon:
+      FrameImage(Canvas, BigImp, ClientWidth div 2 - 3 * 28, 32, xSizeBig * 3,
+        ySizeBig * 3, IconIndex mod 2 * 3 * xSizeBig,
+        IconIndex div 2 * 3 * ySizeBig);
+    mikEnemyShipComplete:
+      begin
+        BitBlt(Buffer.Canvas.Handle, 0, 0, 140, 120, Canvas.Handle,
+          (ClientWidth - 140) div 2, 24, SRCCOPY);
+        ImageOp_BCC(Buffer, Templates, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);
+        BitBlt(Canvas.Handle, (ClientWidth - 140) div 2, 24, 140, 120,
+          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+      end;
+    mikMyArmy:
+      PaintMyArmy;
+    mikEnemyArmy:
+      PaintEnemyArmy;
+    mikFullControl:
+      Sprite(Canvas, HGrSystem2, ClientWidth div 2 - 31, 24, 63, 63, 1, 281);
+    mikShip:
+      PaintColonyShip(Canvas, IconIndex, 17, ClientWidth - 34, 38);
+  end;
+
+  if EInput.Visible then
+    EditFrame(Canvas, EInput.BoundsRect, MainTexture);
+
+  if OpenSound <> '' then
+    PostMessage(Handle, WM_PLAYSOUND, 0, 0);
+end; { FormPaint }
 
 procedure TMessgExDlg.Button1Click(Sender: TObject);
 begin
-ModalResult:=mrOK;
+  ModalResult := mrOk;
 end;
 
 procedure TMessgExDlg.Button2Click(Sender: TObject);
 begin
-if Kind=mkOkHelp then
-  HelpDlg.ShowNewContent(wmSubmodal, HelpKind, HelpNo)
-else if Kind=mkModel then
-  UnitStatDlg.ShowNewContent_OwnModel(wmSubmodal, IconIndex)
-else ModalResult:=mrIgnore;
+  if Kind = mkOkHelp then
+    HelpDlg.ShowNewContent(wmSubmodal, HelpKind, HelpNo)
+  else if Kind = mkModel then
+    UnitStatDlg.ShowNewContent_OwnModel(wmSubmodal, IconIndex)
+  else
+    ModalResult := mrIgnore;
 end;
 
 procedure TMessgExDlg.Button3Click(Sender: TObject);
 begin
-ModalResult:=mrCancel
+  ModalResult := mrCancel
 end;
 
 procedure TMessgExDlg.RemoveBtnClick(Sender: TObject);
 begin
-ModalResult:=mrNo
+  ModalResult := mrNo
 end;
 
 procedure TMessgExDlg.FormKeyPress(Sender: TObject; var Key: char);
 begin
-if Key=#13 then ModalResult:=mrOK
-else if (Key=#27) then
-  if Button3.Visible then ModalResult:=mrCancel
-  else if Button2.Visible then ModalResult:=mrIgnore
+  if Key = #13 then
+    ModalResult := mrOk
+  else if (Key = #27) then
+    if Button3.Visible then
+      ModalResult := mrCancel
+    else if Button2.Visible then
+      ModalResult := mrIgnore
 end;
 
@@ -444 +500 @@
 // because Messg.SoundMessage not capable of movie mode
 begin
-with MessgExDlg do
-  begin
-  MessgText:=SimpleText;
-  OpenSound:=SoundItem;
-  Kind:=mkOK;
-  ShowModal;
+  with MessgExDlg do
+  begin
+    MessgText := SimpleText;
+    OpenSound := SoundItem;
+    Kind := mkOk;
+    ShowModal;
   end
 end;
@@ -455 +511 @@
 procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
 begin
-with MessgExDlg do
-  begin
-  OpenSound:=SoundItem;
-  MessgText:=SimpleText;
-  Kind:=mkOK;
-  IconKind:=mikTribe;
-  IconIndex:=p;
-  ShowModal;
-  end;
-end;
-
-function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string):
-  integer;
-begin
-with MessgExDlg do
-  begin
-  MessgText:=SimpleText;
-  OpenSound:=SoundItem;
-  Kind:=QueryKind;
-  ShowModal;
-  result:=ModalResult
-  end
-end;
-
-procedure ContextMessage(SimpleText, SoundItem: string; ContextKind,
-  ContextNo: integer);
-begin
-with MessgExDlg do
-  begin
-  MessgText:=SimpleText;
-  OpenSound:=SoundItem;
-  Kind:=mkOkHelp;
-  HelpKind:=ContextKind;
-  HelpNo:=ContextNo;
-  ShowModal;
+  with MessgExDlg do
+  begin
+    OpenSound := SoundItem;
+    MessgText := SimpleText;
+    Kind := mkOk;
+    IconKind := mikTribe;
+    IconIndex := p;
+    ShowModal;
+  end;
+end;
+
+function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string)
+  : integer;
+begin
+  with MessgExDlg do
+  begin
+    MessgText := SimpleText;
+    OpenSound := SoundItem;
+    Kind := QueryKind;
+    ShowModal;
+    result := ModalResult
+  end
+end;
+
+procedure ContextMessage(SimpleText, SoundItem: string;
+  ContextKind, ContextNo: integer);
+begin
+  with MessgExDlg do
+  begin
+    MessgText := SimpleText;
+    OpenSound := SoundItem;
+    Kind := mkOkHelp;
+    HelpKind := ContextKind;
+    HelpNo := ContextNo;
+    ShowModal;
   end
 end;
@@ -495 +551 @@
 procedure TMessgExDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-IconKind:=mikNone;
-CenterTo:=0;
-end;
-
-procedure TMessgExDlg.OnPlaySound(var Msg:TMessage);
-begin
-Play(OpenSound);
-OpenSound:='';
-end;
-
+  IconKind := mikNone;
+  CenterTo := 0;
+end;
+
+procedure TMessgExDlg.OnPlaySound(var Msg: TMessage);
+begin
+  Play(OpenSound);
+  OpenSound := '';
+end;
 
 initialization
+
 QueryPerformanceFrequency(PerfFreq);
 
 end.
-

trunk/LocalPlayer/NatStat.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit NatStat;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ClientTools,Term,ScreenTools,BaseWin,
+  Protocol, ClientTools, Term, ScreenTools, BaseWin,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
@@ -12 +11 @@
 
 type
-  PEnemyReport=^TEnemyReport;
+  PEnemyReport = ^TEnemyReport;
 
   TNatStatDlg = class(TBufferedDrawDlg)
@@ -28 +27 @@
     procedure ToggleBtnClick(Sender: TObject);
     procedure PlayerClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
     procedure FormDestroy(Sender: TObject);
     procedure ScrollUpBtnClick(Sender: TObject);
@@ -45 +43 @@
   private
     pView, AgePrepared, LinesDown: integer;
-    SelfReport,CurrentReport: PEnemyReport;
-    ShowContact,ContactEnabled: boolean;
+    SelfReport, CurrentReport: PEnemyReport;
+    ShowContact, ContactEnabled: boolean;
     Back, Template: TBitmap;
     ReportText: TStringList;
@@ -55 +53 @@
   NatStatDlg: TNatStatDlg;
 
-
 implementation
 
@@ -61 +58 @@
 
 uses
-  Diagram,Select,Messg,MessgEx, Help,Tribes,Directories;
+  Diagram, Select, Messg, MessgEx, Help, Tribes, Directories;
 
 const
-xIcon=326; yIcon=49;
-xAttrib=96; yAttrib=40;
-xRelation=16; yRelation=110;
-PaperShade=3;
-ReportLines=12;
-LineSpacing=22;
-xReport=24; yReport=165; wReport=352; hReport=ReportLines*LineSpacing;
-
+  xIcon = 326;
+  yIcon = 49;
+  xAttrib = 96;
+  yAttrib = 40;
+  xRelation = 16;
+  yRelation = 110;
+  PaperShade = 3;
+  ReportLines = 12;
+  LineSpacing = 22;
+  xReport = 24;
+  yReport = 165;
+  wReport = 352;
+  hReport = ReportLines * LineSpacing;
 
 procedure TNatStatDlg.FormCreate(Sender: TObject);
 begin
-inherited;
-AgePrepared:=-2;
-GetMem(SelfReport,SizeOf(TEnemyReport)-2*(INFIN+1));
-ReportText:=TStringList.Create;
-InitButtons();
-ContactBtn.Template:=Templates;
-HelpContext:='DIPLOMACY';
-ToggleBtn.Hint:=Phrases.Lookup('BTN_SELECT');
-ContactBtn.Hint:=Phrases.Lookup('BTN_DIALOG');
-
-Back:=TBitmap.Create;
-Back.PixelFormat:=pf24bit;
-Back.Width:=ClientWidth; Back.Height:=ClientHeight;
-Template:=TBitmap.Create;
-LoadGraphicFile(Template, HomeDir+'Graphics\Nation', gfNoGamma);
-Template.PixelFormat:=pf8bit;
+  inherited;
+  AgePrepared := -2;
+  GetMem(SelfReport, SizeOf(TEnemyReport) - 2 * (INFIN + 1));
+  ReportText := TStringList.Create;
+  InitButtons();
+  ContactBtn.Template := Templates;
+  HelpContext := 'DIPLOMACY';
+  ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');
+  ContactBtn.Hint := Phrases.Lookup('BTN_DIALOG');
+
+  Back := TBitmap.Create;
+  Back.PixelFormat := pf24bit;
+  Back.Width := ClientWidth;
+  Back.Height := ClientHeight;
+  Template := TBitmap.Create;
+  LoadGraphicFile(Template, HomeDir + 'Graphics\Nation', gfNoGamma);
+  Template.PixelFormat := pf8bit;
 end;
 
 procedure TNatStatDlg.FormDestroy(Sender: TObject);
 begin
-ReportText.Free;
-FreeMem(SelfReport);
-Template.Free;
-Back.Free;
+  ReportText.Free;
+  FreeMem(SelfReport);
+  Template.Free;
+  Back.Free;
 end;
 
 procedure TNatStatDlg.CheckAge;
 begin
-if MainTextureAge<>AgePrepared then
-  begin
-  AgePrepared:=MainTextureAge;
-  bitblt(Back.Canvas.Handle,0,0,ClientWidth,ClientHeight,
-    MainTexture.Image.Canvas.Handle,(wMainTexture-ClientWidth) div 2,
-    (hMainTexture-ClientHeight) div 2,SRCCOPY);
-  ImageOp_B(Back,Template,0,0,0,0,ClientWidth,ClientHeight);
+  if MainTextureAge <> AgePrepared then
+  begin
+    AgePrepared := MainTextureAge;
+    bitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
+      (hMainTexture - ClientHeight) div 2, SRCCOPY);
+    ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
   end
 end;
@@ -115 +118 @@
 procedure TNatStatDlg.FormShow(Sender: TObject);
 begin
-if pView=me then
-  begin
-  SelfReport.TurnOfCivilReport:=MyRO.Turn;
-  SelfReport.TurnOfMilReport:=MyRO.Turn;
-  move(MyRO.Treaty, SelfReport.Treaty, sizeof(SelfReport.Treaty));
-  SelfReport.Government:=MyRO.Government;
-  SelfReport.Money:=MyRO.Money;
-  CurrentReport:=pointer(SelfReport);
-  end
-else CurrentReport:=pointer(MyRO.EnemyReport[pView]);
-if CurrentReport.TurnOfCivilReport>=0 then
-  GenerateReportText;
-ShowContact:= (pView<>me) and (not supervising or (me<>0));
-ContactEnabled:= ShowContact and not supervising
-  and (1 shl pView and MyRO.Alive<>0);
-ContactBtn.Visible:=ContactEnabled and (MyRO.Happened and phGameEnd=0)
-  and (ClientMode<scContact);
-ScrollUpBtn.Visible:=(CurrentReport.TurnOfCivilReport>=0)
-  and (ReportText.Count>ReportLines);
-ScrollDownBtn.Visible:=(CurrentReport.TurnOfCivilReport>=0)
-  and (ReportText.Count>ReportLines);
-if OptionChecked and (1 shl soTellAI)<>0 then
-  TellAIBtn.ButtonIndex:=3
-else TellAIBtn.ButtonIndex:=2;
-Caption:=Tribe[pView].TPhrase('TITLE_NATION');
-LinesDown:=0;
-
-OffscreenPaint;
-end;
-
-procedure TNatStatDlg.ShowNewContent(NewMode,p: integer);
-begin
-if p<0 then
-  if ClientMode>=scContact then
-    pView:=DipMem[me].pContact
+  if pView = me then
+  begin
+    SelfReport.TurnOfCivilReport := MyRO.Turn;
+    SelfReport.TurnOfMilReport := MyRO.Turn;
+    move(MyRO.Treaty, SelfReport.Treaty, SizeOf(SelfReport.Treaty));
+    SelfReport.Government := MyRO.Government;
+    SelfReport.Money := MyRO.Money;
+    CurrentReport := pointer(SelfReport);
+  end
   else
-    begin
-    pView:=0;
-    while (pView<nPl) and ((MyRO.Treaty[pView]<trNone)
-      or (1 shl pView and MyRO.Alive=0)) do
-      inc(pView);
-    if pView>=nPl then pView:=me;
+    CurrentReport := pointer(MyRO.EnemyReport[pView]);
+  if CurrentReport.TurnOfCivilReport >= 0 then
+    GenerateReportText;
+  ShowContact := (pView <> me) and (not supervising or (me <> 0));
+  ContactEnabled := ShowContact and not supervising and
+    (1 shl pView and MyRO.Alive <> 0);
+  ContactBtn.Visible := ContactEnabled and (MyRO.Happened and phGameEnd = 0) and
+    (ClientMode < scContact);
+  ScrollUpBtn.Visible := (CurrentReport.TurnOfCivilReport >= 0) and
+    (ReportText.Count > ReportLines);
+  ScrollDownBtn.Visible := (CurrentReport.TurnOfCivilReport >= 0) and
+    (ReportText.Count > ReportLines);
+  if OptionChecked and (1 shl soTellAI) <> 0 then
+    TellAIBtn.ButtonIndex := 3
+  else
+    TellAIBtn.ButtonIndex := 2;
+  Caption := Tribe[pView].TPhrase('TITLE_NATION');
+  LinesDown := 0;
+
+  OffscreenPaint;
+end;
+
+procedure TNatStatDlg.ShowNewContent(NewMode, p: integer);
+begin
+  if p < 0 then
+    if ClientMode >= scContact then
+      pView := DipMem[me].pContact
+    else
+    begin
+      pView := 0;
+      while (pView < nPl) and ((MyRO.Treaty[pView] < trNone) or
+        (1 shl pView and MyRO.Alive = 0)) do
+        inc(pView);
+      if pView >= nPl then
+        pView := me;
     end
-else pView:=p;
-inherited ShowNewContent(NewMode);
+  else
+    pView := p;
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TNatStatDlg.PlayerClick(Sender: TObject);
 begin
-ShowNewContent(FWindowMode, TComponent(Sender).Tag);
+  ShowNewContent(FWindowMode, TComponent(Sender).Tag);
 end;
 
 procedure TNatStatDlg.GenerateReportText;
 var
-List: ^TChart;
+  List: ^TChart;
 
   function StatText(no: integer): string;
   var
-  i: integer;
-  begin
-  if (CurrentReport.TurnOfCivilReport>=0) and (Server(sGetChart+no shl 4,me,pView,List^)>=rExecuted) then
-    begin
-    i:=List[CurrentReport.TurnOfCivilReport];
-    case no of
-      stPop: result:=Format(Phrases.Lookup('FRSTATPOP'),[i]);
-      stTerritory: result:=Format(Phrases.Lookup('FRSTATTER'),[i]);
-      stScience: result:=Format(Phrases.Lookup('FRSTATTECH'),[i div nAdv]);
-      stExplore: result:=Format(Phrases.Lookup('FRSTATEXP'),[i*100 div (G.lx*G.ly)]);
+    i: integer;
+  begin
+    if (CurrentReport.TurnOfCivilReport >= 0) and
+      (Server(sGetChart + no shl 4, me, pView, List^) >= rExecuted) then
+    begin
+      i := List[CurrentReport.TurnOfCivilReport];
+      case no of
+        stPop:
+          result := Format(Phrases.Lookup('FRSTATPOP'), [i]);
+        stTerritory:
+          result := Format(Phrases.Lookup('FRSTATTER'), [i]);
+        stScience:
+          result := Format(Phrases.Lookup('FRSTATTECH'), [i div nAdv]);
+        stExplore:
+          result := Format(Phrases.Lookup('FRSTATEXP'),
+            [i * 100 div (G.lx * G.ly)]);
       end;
     end
@@ -188 +201 @@
 
 var
-p1,Treaty: integer;
-s: string;
-HasContact,ExtinctPart: boolean;
-begin
-GetMem(List,4*(MyRO.Turn+2));
-
-ReportText.Clear;
-ReportText.Add('');
-if (MyRO.Turn-CurrentReport.TurnOfCivilReport>1)
-  and (1 shl pView and MyRO.Alive<>0) then
-  begin
-  s:=Format(Phrases.Lookup('FROLDCIVILREP'),
-    [TurnToString(CurrentReport.TurnOfCivilReport)]);
-  ReportText.Add('C'+s);
+  p1, Treaty: integer;
+  s: string;
+  HasContact, ExtinctPart: boolean;
+begin
+  GetMem(List, 4 * (MyRO.Turn + 2));
+
+  ReportText.Clear;
   ReportText.Add('');
-  end;
-
-if (1 shl pView and MyRO.Alive<>0) then
-  begin
-  ReportText.Add('M'+Format(Phrases.Lookup('FRTREASURY'),[CurrentReport.Money]));
-  ReportText.Add('P'+StatText(stPop));
-  ReportText.Add('T'+StatText(stTerritory));
-  end;
-ReportText.Add('S'+StatText(stScience));
-ReportText.Add('E'+StatText(stExplore));
-HasContact:=false;
-for p1:=0 to nPl-1 do
-  if (p1<>me) and (CurrentReport.Treaty[p1]>trNoContact) then
-    HasContact:=true;
-if HasContact then
-  begin
+  if (MyRO.Turn - CurrentReport.TurnOfCivilReport > 1) and
+    (1 shl pView and MyRO.Alive <> 0) then
+  begin
+    s := Format(Phrases.Lookup('FROLDCIVILREP'),
+      [TurnToString(CurrentReport.TurnOfCivilReport)]);
+    ReportText.Add('C' + s);
+    ReportText.Add('');
+  end;
+
+  if (1 shl pView and MyRO.Alive <> 0) then
+  begin
+    ReportText.Add('M' + Format(Phrases.Lookup('FRTREASURY'),
+      [CurrentReport.Money]));
+    ReportText.Add('P' + StatText(stPop));
+    ReportText.Add('T' + StatText(stTerritory));
+  end;
+  ReportText.Add('S' + StatText(stScience));
+  ReportText.Add('E' + StatText(stExplore));
+  HasContact := false;
+  for p1 := 0 to nPl - 1 do
+    if (p1 <> me) and (CurrentReport.Treaty[p1] > trNoContact) then
+      HasContact := true;
+  if HasContact then
+  begin
+    ReportText.Add('');
+    ReportText.Add(' ' + Phrases.Lookup('FRRELATIONS'));
+    for ExtinctPart := false to true do
+      for Treaty := trAlliance downto trNone do
+        for p1 := 0 to nPl - 1 do
+          if (p1 <> me) and (CurrentReport.Treaty[p1] = Treaty) and
+            ((1 shl p1 and MyRO.Alive = 0) = ExtinctPart) then
+          begin
+            s := Tribe[p1].TString(Phrases.Lookup('HAVETREATY', Treaty));
+            if ExtinctPart then
+              s := '(' + s + ')';
+            ReportText.Add(char(48 + Treaty) + s);
+          end;
+  end;
   ReportText.Add('');
-  ReportText.Add(' '+Phrases.Lookup('FRRELATIONS'));
-  for ExtinctPart:=false to true do
-    for Treaty:=trAlliance downto trNone do
-      for p1:=0 to nPl-1 do
-        if (p1<>me) and (CurrentReport.Treaty[p1]=Treaty)
-          and ((1 shl p1 and MyRO.Alive=0)=ExtinctPart) then
-          begin
-          s:=Tribe[p1].TString(Phrases.Lookup('HAVETREATY', Treaty));
-          if ExtinctPart then s:='('+s+')';
-          ReportText.Add(char(48+Treaty)+s);
-          end;
-  end;
-ReportText.Add('');
-
-FreeMem(List);
+
+  FreeMem(List);
 end;
 
 procedure TNatStatDlg.OffscreenPaint;
 var
-i, y: integer;
-s: string;
-ps: pchar;
-Extinct: boolean;
-
-begin
-inherited;
-
-Extinct:= 1 shl pView and MyRO.Alive=0;
-
-bitblt(offscreen.canvas.handle,0,0,ClientWidth,ClientHeight,Back.Canvas.handle,0,0,SRCCOPY);
-
-offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-RisedTextout(offscreen.Canvas,40{(ClientWidth-BiColorTextWidth(offscreen.canvas,caption)) div 2},7,Caption);
-
-offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-
-with offscreen do
-  begin
-  // show leader picture
-  Tribe[pView].InitAge(GetAge(pView));
-  if Tribe[pView].faceHGr>=0 then
-    begin
-    Dump(offscreen,Tribe[pView].faceHGr,18,yIcon-4,64,48,
-      1+Tribe[pView].facepix mod 10 *65,1+Tribe[pView].facepix div 10 *49);
-    frame(offscreen.Canvas,18-1,yIcon-4-1,18+64,yIcon-4+48,$000000,$000000);
+  i, y: integer;
+  s: string;
+  ps: pchar;
+  Extinct: boolean;
+
+begin
+  inherited;
+
+  Extinct := 1 shl pView and MyRO.Alive = 0;
+
+  bitblt(offscreen.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
+    Back.Canvas.Handle, 0, 0, SRCCOPY);
+
+  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  RisedTextout(offscreen.Canvas,
+    40 { (ClientWidth-BiColorTextWidth(offscreen.canvas,caption)) div 2 } ,
+    7, Caption);
+
+  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+
+  with offscreen do
+  begin
+    // show leader picture
+    Tribe[pView].InitAge(GetAge(pView));
+    if Tribe[pView].faceHGr >= 0 then
+    begin
+      Dump(offscreen, Tribe[pView].faceHGr, 18, yIcon - 4, 64, 48,
+        1 + Tribe[pView].facepix mod 10 * 65,
+        1 + Tribe[pView].facepix div 10 * 49);
+      frame(offscreen.Canvas, 18 - 1, yIcon - 4 - 1, 18 + 64, yIcon - 4 + 48,
+        $000000, $000000);
     end;
 
-  if (pView=me) or not Extinct then
-    LoweredTextOut(Canvas,-1,MainTexture,xAttrib,yAttrib,
-      Phrases.Lookup('GOVERNMENT',CurrentReport.Government)+Phrases.Lookup('FRAND'));
-  if pView=me then
-    begin
-    LoweredTextOut(Canvas,-1,MainTexture,xAttrib,yAttrib+19,
-      Phrases.Lookup('CREDIBILITY',RoughCredibility(MyRO.Credibility)));
-    LoweredTextOut(Canvas,-1,MainTexture,xAttrib,yAttrib+38,
-      Format(Phrases.Lookup('FRCREDIBILITY'),[MyRO.Credibility]));
+    if (pView = me) or not Extinct then
+      LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib,
+        Phrases.Lookup('GOVERNMENT', CurrentReport.Government) +
+        Phrases.Lookup('FRAND'));
+    if pView = me then
+    begin
+      LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 19,
+        Phrases.Lookup('CREDIBILITY', RoughCredibility(MyRO.Credibility)));
+      LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 38,
+        Format(Phrases.Lookup('FRCREDIBILITY'), [MyRO.Credibility]));
     end
-  else
-    begin
-    if Extinct then
-      begin
-      LoweredTextOut(Canvas,-1,MainTexture,xAttrib,yAttrib+9,
-        Phrases.Lookup('FREXTINCT'));
-      LoweredTextOut(Canvas,-1,MainTexture,xAttrib,yAttrib+28,
-        TurnToString(CurrentReport.TurnOfCivilReport))
+    else
+    begin
+      if Extinct then
+      begin
+        LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 9,
+          Phrases.Lookup('FREXTINCT'));
+        LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 28,
+          TurnToString(CurrentReport.TurnOfCivilReport))
       end
-    else
-      begin
-      LoweredTextOut(Canvas,-1,MainTexture,xAttrib,yAttrib+19,
-        Phrases.Lookup('CREDIBILITY',RoughCredibility(CurrentReport.Credibility)));
-      LoweredTextOut(Canvas,-1,MainTexture,xAttrib,yAttrib+38,
-        Format(Phrases.Lookup('FRCREDIBILITY'),[CurrentReport.Credibility]));
+      else
+      begin
+        LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 19,
+          Phrases.Lookup('CREDIBILITY',
+          RoughCredibility(CurrentReport.Credibility)));
+        LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 38,
+          Format(Phrases.Lookup('FRCREDIBILITY'), [CurrentReport.Credibility]));
       end;
 
-    if MyRO.Treaty[pView]=trNoContact then
-      begin
-      s:=Phrases.Lookup('FRNOCONTACT');
-      LoweredTextOut(Canvas,-1,MainTexture,
-        (ClientWidth-BiColorTextWidth(canvas,s)) div 2,yRelation+9,s)
+      if MyRO.Treaty[pView] = trNoContact then
+      begin
+        s := Phrases.Lookup('FRNOCONTACT');
+        LoweredTextOut(Canvas, -1, MainTexture,
+          (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, yRelation + 9, s)
       end
-    else if ShowContact then
-      begin
-      LoweredTextOut(Canvas,-1,MainTexture,xRelation,yRelation,
-        Phrases.Lookup('FRTREATY'));
-      LoweredTextOut(Canvas,-1,MainTexture,ClientWidth div 2,yRelation,
-        Phrases.Lookup('TREATY',MyRO.Treaty[pView]));
-      if CurrentReport.TurnOfContact<0 then
-        LoweredTextOut(Canvas,-1,MainTexture,ClientWidth div 2,yRelation+19,
-          Phrases.Lookup('FRNOVISIT'))
-      else
+      else if ShowContact then
+      begin
+        LoweredTextOut(Canvas, -1, MainTexture, xRelation, yRelation,
+          Phrases.Lookup('FRTREATY'));
+        LoweredTextOut(Canvas, -1, MainTexture, ClientWidth div 2, yRelation,
+          Phrases.Lookup('TREATY', MyRO.Treaty[pView]));
+        if CurrentReport.TurnOfContact < 0 then
+          LoweredTextOut(Canvas, -1, MainTexture, ClientWidth div 2,
+            yRelation + 19, Phrases.Lookup('FRNOVISIT'))
+        else
         begin
-        LoweredTextOut(Canvas,-1,MainTexture,xRelation,yRelation+19,
-          Phrases.Lookup('FRLASTCONTACT'));
-        if CurrentReport.TurnOfContact>=0 then
-          LoweredTextOut(Canvas,-1,MainTexture,ClientWidth div 2,yRelation+19,
-            TurnToString(CurrentReport.TurnOfContact));
+          LoweredTextOut(Canvas, -1, MainTexture, xRelation, yRelation + 19,
+            Phrases.Lookup('FRLASTCONTACT'));
+          if CurrentReport.TurnOfContact >= 0 then
+            LoweredTextOut(Canvas, -1, MainTexture, ClientWidth div 2,
+              yRelation + 19, TurnToString(CurrentReport.TurnOfContact));
         end;
       end;
 
-    if Extinct then
-      FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,0,200)
-    {else if CurrentReport.Government=gAnarchy then
-      FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,112,400,
-        ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact))
-    else
-      FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,
-        56*(CurrentReport.Government-1),40,
-        ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact))};
+      if Extinct then
+        FrameImage(Canvas, BigImp, xIcon, yIcon, xSizeBig, ySizeBig, 0, 200)
+        { else if CurrentReport.Government=gAnarchy then
+          FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,112,400,
+          ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact))
+          else
+          FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,
+          56*(CurrentReport.Government-1),40,
+          ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact)) };
     end;
 
-  if CurrentReport.TurnOfCivilReport>=0 then
+    if CurrentReport.TurnOfCivilReport >= 0 then
     begin // print state report
-    FillSeamless(Canvas, xReport, yReport, wReport, hReport, 0, 0, Paper);
-    with canvas do
-      begin
-      Brush.Color:=MainTexture.clBevelShade;
-      FillRect(Rect(xReport+wReport, yReport+PaperShade,
-        xReport+wReport+PaperShade, yReport+hReport+PaperShade));
-      FillRect(Rect(xReport+PaperShade, yReport+hReport,
-        xReport+wReport+PaperShade, yReport+hReport+PaperShade));
-      Brush.Style:=bsClear;
+      FillSeamless(Canvas, xReport, yReport, wReport, hReport, 0, 0, Paper);
+      with Canvas do
+      begin
+        Brush.Color := MainTexture.clBevelShade;
+        FillRect(Rect(xReport + wReport, yReport + PaperShade,
+          xReport + wReport + PaperShade, yReport + hReport + PaperShade));
+        FillRect(Rect(xReport + PaperShade, yReport + hReport,
+          xReport + wReport + PaperShade, yReport + hReport + PaperShade));
+        Brush.Style := bsClear;
       end;
 
-    y:=0;
-    for i:=0 to ReportText.Count-1 do
-      begin
-      if (i>=LinesDown) and (i<LinesDown+ReportLines) then
+      y := 0;
+      for i := 0 to ReportText.Count - 1 do
+      begin
+        if (i >= LinesDown) and (i < LinesDown + ReportLines) then
         begin
-        s:=ReportText[i];
-        if s<>'' then
+          s := ReportText[i];
+          if s <> '' then
           begin
-//          LineType:=s[1];
-          delete(s,1,1);
-          BiColorTextOut(canvas,Colors.Canvas.Pixels[clkMisc,cliPaperText],
-            $7F007F,xReport+8,yReport+LineSpacing*y,s);
+            // LineType:=s[1];
+            delete(s, 1, 1);
+            BiColorTextOut(Canvas, Colors.Canvas.Pixels[clkMisc, cliPaperText],
+              $7F007F, xReport + 8, yReport + LineSpacing * y, s);
           end;
-        inc(y);
+          inc(y);
         end
       end;
     end
+    else
+    begin
+      s := Phrases.Lookup('FRNOCIVILREP');
+      RisedTextout(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
+        yReport + hReport div 2 - 10, s);
+    end;
+
+    if OptionChecked and (1 shl soTellAI) <> 0 then
+    begin
+      Server(sGetAIInfo, me, pView, ps);
+      LoweredTextOut(Canvas, -1, MainTexture, 42, 445, ps);
+    end
+    else
+      LoweredTextOut(Canvas, -2, MainTexture, 42, 445,
+        Phrases2.Lookup('MENU_TELLAI'));
+  end;
+  ContactBtn.SetBack(offscreen.Canvas, ContactBtn.Left, ContactBtn.Top);
+
+  MarkUsedOffscreen(ClientWidth, ClientHeight);
+end; { OffscreenPaint }
+
+procedure TNatStatDlg.CloseBtnClick(Sender: TObject);
+begin
+  Close
+end;
+
+procedure TNatStatDlg.DialogBtnClick(Sender: TObject);
+var
+  ContactResult: integer;
+begin
+  ContactResult := MainScreen.DipCall(scContact + pView shl 4);
+  if ContactResult < rExecuted then
+  begin
+    if ContactResult = eColdWar then
+      SoundMessage(Phrases.Lookup('FRCOLDWAR'), 'MSG_DEFAULT')
+    else if MyRO.Government = gAnarchy then
+      SoundMessage(Tribe[me].TPhrase('FRMYANARCHY'), 'MSG_DEFAULT')
+    else if ContactResult = eAnarchy then
+      if MyRO.Treaty[pView] >= trPeace then
+      begin
+        if MainScreen.ContactRefused(pView, 'FRANARCHY') then
+          SmartUpdateContent
+      end
+      else
+        SoundMessage(Tribe[pView].TPhrase('FRANARCHY'), 'MSG_DEFAULT');
+  end
   else
-    begin
-    s:=Phrases.Lookup('FRNOCIVILREP');
-    RisedTextOut(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s)) div 2,
-      yReport+hReport div 2-10,s);
+    Close
+end;
+
+procedure TNatStatDlg.ToggleBtnClick(Sender: TObject);
+var
+  p1, StartCount: integer;
+  m: TMenuItem;
+  ExtinctPart: boolean;
+begin
+  EmptyMenu(Popup.Items);
+
+  // own nation
+  if G.Difficulty[me] <> 0 then
+  begin
+    m := TMenuItem.Create(Popup);
+    m.RadioItem := true;
+    m.Caption := Tribe[me].TPhrase('TITLE_NATION');
+    m.Tag := me;
+    m.OnClick := PlayerClick;
+    if me = pView then
+      m.Checked := true;
+    Popup.Items.Add(m);
+  end;
+
+  // foreign nations
+  for ExtinctPart := false to true do
+  begin
+    StartCount := Popup.Items.Count;
+    for p1 := 0 to nPl - 1 do
+      if ExtinctPart and (G.Difficulty[p1] > 0) and
+        (1 shl p1 and MyRO.Alive = 0) or not ExtinctPart and
+        (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] >= trNone) then
+      begin
+        m := TMenuItem.Create(Popup);
+        m.RadioItem := true;
+        m.Caption := Tribe[p1].TPhrase('TITLE_NATION');
+        if ExtinctPart then
+          m.Caption := '(' + m.Caption + ')';
+        m.Tag := p1;
+        m.OnClick := PlayerClick;
+        if p1 = pView then
+          m.Checked := true;
+        Popup.Items.Add(m);
+      end;
+    if (StartCount > 0) and (Popup.Items.Count > StartCount) then
+    begin // seperator
+      m := TMenuItem.Create(Popup);
+      m.Caption := '-';
+      Popup.Items.Insert(StartCount, m);
     end;
-
-  if OptionChecked and (1 shl soTellAI)<>0 then
-    begin
-    Server(sGetAIInfo,me,pView,ps);
-    LoweredTextOut(Canvas,-1,MainTexture,42,445,ps);
-    end
-  else LoweredTextOut(Canvas,-2,MainTexture,42,445,Phrases2.Lookup('MENU_TELLAI'));
-  end;
-ContactBtn.SetBack(Offscreen.Canvas,ContactBtn.Left,ContactBtn.Top);
-
-MarkUsedOffscreen(ClientWidth,ClientHeight);
-end; {OffscreenPaint}
-
-procedure TNatStatDlg.CloseBtnClick(Sender: TObject);
-begin
-Close
-end;
-
-procedure TNatStatDlg.DialogBtnClick(Sender: TObject);
-var
-ContactResult: integer;
-begin
-ContactResult:=MainScreen.DipCall(scContact+pView shl 4);
-if ContactResult<rExecuted then
-  begin
-  if ContactResult=eColdWar then
-    SoundMessage(Phrases.Lookup('FRCOLDWAR'),'MSG_DEFAULT')
-  else if MyRO.Government=gAnarchy then
-    SoundMessage(Tribe[me].TPhrase('FRMYANARCHY'),'MSG_DEFAULT')
-  else if ContactResult=eAnarchy then
-    if MyRO.Treaty[pView]>=trPeace then
-      begin
-      if MainScreen.ContactRefused(pView, 'FRANARCHY') then
-        SmartUpdateContent
-      end
-    else SoundMessage(Tribe[pView].TPhrase('FRANARCHY'),'MSG_DEFAULT');
-  end
-else Close
-end;
-
-procedure TNatStatDlg.ToggleBtnClick(Sender: TObject);
-var
-p1,StartCount: integer;
-m: TMenuItem;
-ExtinctPart: boolean;
-begin
-EmptyMenu(Popup.Items);
-
-// own nation
-if G.Difficulty[me]<>0 then
-  begin
-  m:=TMenuItem.Create(Popup);
-  m.RadioItem:=true;
-  m.Caption:=Tribe[me].TPhrase('TITLE_NATION');
-  m.Tag:=me;
-  m.OnClick:=PlayerClick;
-  if me=pView then m.Checked:=true;
-  Popup.Items.Add(m);
-  end;
-
-// foreign nations
-for ExtinctPart:=false to true do
-  begin
-  StartCount:=Popup.Items.Count;
-  for p1:=0 to nPl-1 do
-    if ExtinctPart and (G.Difficulty[p1]>0) and (1 shl p1 and MyRO.Alive=0)
-      or not ExtinctPart and (1 shl p1 and MyRO.Alive<>0)
-      and (MyRO.Treaty[p1]>=trNone) then
-      begin
-      m:=TMenuItem.Create(Popup);
-      m.RadioItem:=true;
-      m.Caption:=Tribe[p1].TPhrase('TITLE_NATION');
-      if ExtinctPart then
-        m.Caption:='('+m.Caption+')';
-      m.Tag:=p1;
-      m.OnClick:=PlayerClick;
-      if p1=pView then m.Checked:=true;
-      Popup.Items.Add(m);
-      end;
-  if (StartCount>0) and (Popup.Items.Count>StartCount) then
-    begin //seperator
-    m:=TMenuItem.Create(Popup);
-    m.Caption:='-';
-    Popup.Items.Insert(StartCount,m);
-    end;
-  end;
-
-Popup.Popup(Left+ToggleBtn.Left, Top+ToggleBtn.Top+ToggleBtn.Height);
+  end;
+
+  Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + ToggleBtn.Height);
 end;
 
@@ -459 +487 @@
   Shift: TShiftState);
 var
-i: integer;
-begin
-if Key=VK_F9 then // my key
+  i: integer;
+begin
+  if Key = VK_F9 then // my key
   begin // toggle nation
-  i:=0;
-  repeat
-    pView:=(pView+1) mod nPl;
-    inc(i);
-  until (i>=nPl)
-    or (1 shl pView and MyRO.Alive<>0) and (MyRO.Treaty[pView]>=trNone);
-  if i>=nPl then pView:=me;
-  Tag:=pView;
-  PlayerClick(self); // no, this is not nice
-  end
-else inherited  
+    i := 0;
+    repeat
+      pView := (pView + 1) mod nPl;
+      inc(i);
+    until (i >= nPl) or (1 shl pView and MyRO.Alive <> 0) and
+      (MyRO.Treaty[pView] >= trNone);
+    if i >= nPl then
+      pView := me;
+    Tag := pView;
+    PlayerClick(self); // no, this is not nice
+  end
+  else
+    inherited
 end;
 
 procedure TNatStatDlg.EcoChange;
 begin
-if Visible and (pView=me) then
-  begin
-  SelfReport.Government:=MyRO.Government;
-  SelfReport.Money:=MyRO.Money;
+  if Visible and (pView = me) then
+  begin
+    SelfReport.Government := MyRO.Government;
+    SelfReport.Money := MyRO.Money;
+    SmartUpdateContent
+  end
+end;
+
+procedure TNatStatDlg.ScrollUpBtnClick(Sender: TObject);
+begin
+  if LinesDown > 0 then
+  begin
+    dec(LinesDown);
+    SmartUpdateContent;
+  end
+end;
+
+procedure TNatStatDlg.ScrollDownBtnClick(Sender: TObject);
+begin
+  if LinesDown + ReportLines < ReportText.Count then
+  begin
+    inc(LinesDown);
+    SmartUpdateContent;
+  end
+end;
+
+procedure TNatStatDlg.TellAIBtnClick(Sender: TObject);
+begin
+  OptionChecked := OptionChecked xor (1 shl soTellAI);
+  if OptionChecked and (1 shl soTellAI) <> 0 then
+    TellAIBtn.ButtonIndex := 3
+  else
+    TellAIBtn.ButtonIndex := 2;
   SmartUpdateContent
-  end
-end;
-
-procedure TNatStatDlg.ScrollUpBtnClick(Sender: TObject);
-begin
-if LinesDown>0 then
-  begin
-  dec(LinesDown);
-  SmartUpdateContent;
-  end
-end;
-
-procedure TNatStatDlg.ScrollDownBtnClick(Sender: TObject);
-begin
-if LinesDown+ReportLines<ReportText.Count then
-  begin
-  inc(LinesDown);
-  SmartUpdateContent;
-  end
-end;
-
-procedure TNatStatDlg.TellAIBtnClick(Sender: TObject);
-begin
-OptionChecked:=OptionChecked xor (1 shl soTellAI);
-if OptionChecked and (1 shl soTellAI)<>0 then
-  TellAIBtn.ButtonIndex:=3
-else TellAIBtn.ButtonIndex:=2;
-SmartUpdateContent
 end;
 
 end.
-

trunk/LocalPlayer/Nego.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Nego;
 
@@ -6 +5 @@
 
 uses
-  ScreenTools,BaseWin,Protocol,Term,
+  ScreenTools, BaseWin, Protocol, Term,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
   ButtonBase, ButtonB, ButtonC, ButtonN;
 
-
 const
-MaxHistory=62;
+  MaxHistory = 62;
 
 type
-  THistory=record
+  THistory = record
     n: integer;
-    Text: array[0..MaxHistory-1] of ansistring;
-    end;
+    Text: array [0 .. MaxHistory - 1] of ansistring;
+  end;
 
   TNegoDlg = class(TBufferedDrawDlg)
@@ -56 +54 @@
     procedure FormCreate(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: Integer);
+      Shift: TShiftState; X, Y: integer);
     procedure OkBtnClick(Sender: TObject);
     procedure BwdBtnClick(Sender: TObject);
     procedure FwdBtnClick(Sender: TObject);
     procedure CloseBtnClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormShow(Sender: TObject);
     procedure WantClick(Sender: TObject);
@@ -79 +76 @@
     CurrentOffer: TOffer;
     MyAllowed, OppoAllowed: TPriceSet;
-    CommandAllowed: set of scDipNotice-scDipStart..scDipBreak-scDipStart;
-    History: array[0..nPl-1] of THistory;
+    CommandAllowed: set of scDipNotice - scDipStart .. scDipBreak - scDipStart;
+    History: array [0 .. nPl - 1] of THistory;
     RomanFont: TFont;
-    Costs,Delivers: array[0..11] of cardinal;
+    Costs, Delivers: array [0 .. 11] of cardinal;
     procedure ResetCurrentOffer;
     procedure BuildCurrentOffer;
     procedure FindAllowed;
     procedure SplitText(Text: string; Bounds: TRect);
-    procedure PaintNationPicture(x,y,p: integer);
+    procedure PaintNationPicture(X, Y, p: integer);
     procedure SetButtonStates;
   end;
@@ -97 +94 @@
 
 uses
-Messg,ClientTools,Diplomacy, Inp, Select, NatStat, Help,Tribes, MessgEx;
+  Messg, ClientTools, Diplomacy, Inp, Select, NatStat, Help, Tribes, MessgEx;
 
 {$R *.DFM}
 
 const
-xPadC=140; yPadC=427;
-xPad0=140; yPad0=13;
-xPad1=334; yPad1=13;
-wIcon=40; hIcon=40;
-wText=300; hText=256;
-xText0=14; yText0=154;
-xText1=326; yText1=154;
-xNationPicture0=20; xNationPicture1=556;
-yNationPicture=40;
-yAttitude=148;
-xCred0=42; yCred0=92;
-xCred1=578; yCred1=92;
-PaperShade=3;
-PaperBorder_Left=12; PaperBorder_Right=8;
-ListIndent=24;
-
-opLowTreaty=$FE000000;
-
-RomanNo: array[0..15] of string=
-('I','II','III','IV','V','VI','VII','VIII','IX','X','XI','XII','XIII','XIV','XV','XVI');
-
-ButtonPrice: array[0..11] of cardinal=
-(opChoose,opCivilReport,opMilReport,opMap,opAllTech,opAllTech,opAllModel,opMoney,
-  opTreaty,opLowTreaty,opShipParts,opShipParts);
-
+  xPadC = 140;
+  yPadC = 427;
+  xPad0 = 140;
+  yPad0 = 13;
+  xPad1 = 334;
+  yPad1 = 13;
+  wIcon = 40;
+  hIcon = 40;
+  wText = 300;
+  hText = 256;
+  xText0 = 14;
+  yText0 = 154;
+  xText1 = 326;
+  yText1 = 154;
+  xNationPicture0 = 20;
+  xNationPicture1 = 556;
+  yNationPicture = 40;
+  yAttitude = 148;
+  xCred0 = 42;
+  yCred0 = 92;
+  xCred1 = 578;
+  yCred1 = 92;
+  PaperShade = 3;
+  PaperBorder_Left = 12;
+  PaperBorder_Right = 8;
+  ListIndent = 24;
+
+  opLowTreaty = $FE000000;
+
+  RomanNo: array [0 .. 15] of string = ('I', 'II', 'III', 'IV', 'V', 'VI',
+    'VII', 'VIII', 'IX', 'X', 'XI', 'XII', 'XIII', 'XIV', 'XV', 'XVI');
+
+  ButtonPrice: array [0 .. 11] of cardinal = (opChoose, opCivilReport,
+    opMilReport, opMap, opAllTech, opAllTech, opAllModel, opMoney, opTreaty,
+    opLowTreaty, opShipParts, opShipParts);
 
 procedure TNegoDlg.FormCreate(Sender: TObject);
 var
-cix: integer;
-begin
-InitButtons();
-for cix:=0 to ComponentCount-1 do
-  if Components[cix] is TButtonN then with TButtonN(Components[cix]) do
-    begin
-    Graphic:=GrExt[HGrSystem].Data;
-    Mask:=GrExt[HGrSystem].Mask;
-    BackGraphic:=GrExt[HGrSystem2].Data;
-    case Tag shr 8 of
-      1: SmartHint:=Phrases.Lookup('WANT', ButtonIndex-6);
-      2: SmartHint:=Phrases.Lookup('OFFER', ButtonIndex-6);
+  cix: integer;
+begin
+  InitButtons();
+  for cix := 0 to ComponentCount - 1 do
+    if Components[cix] is TButtonN then
+      with TButtonN(Components[cix]) do
+      begin
+        Graphic := GrExt[HGrSystem].Data;
+        Mask := GrExt[HGrSystem].Mask;
+        BackGraphic := GrExt[HGrSystem2].Data;
+        case Tag shr 8 of
+          1:
+            SmartHint := Phrases.Lookup('WANT', ButtonIndex - 6);
+          2:
+            SmartHint := Phrases.Lookup('OFFER', ButtonIndex - 6);
+        end;
       end;
+
+  fillchar(History, sizeof(History), 0);
+  RomanFont := TFont.Create;
+  RomanFont.Name := 'Times New Roman';
+  RomanFont.Size := Round(144 * 72 / RomanFont.PixelsPerInch);
+  RomanFont.Color := Colors.Canvas.Pixels[clkMisc, cliPaper];
+  HelpContext := 'DIPLOMACY';
+  OkBtn.Caption := Phrases.Lookup('BTN_OK');
+  AcceptBtn.SmartHint := Phrases.Lookup('BTN_ACCEPT');
+  ExitBtn.SmartHint := Phrases.Lookup('BTN_BREAK');
+  CancelTreatyBtn.SmartHint := Phrases.Lookup('BTN_CNTREATY');
+end;
+
+procedure TNegoDlg.FormShow(Sender: TObject);
+begin
+  OffscreenPaint;
+end;
+
+procedure TNegoDlg.ResetCurrentOffer;
+var
+  i: integer;
+begin
+  CurrentOffer.nDeliver := 0;
+  CurrentOffer.nCost := 0;
+  for i := 0 to 11 do
+    Costs[i] := $FFFFFFFF;
+  for i := 0 to 11 do
+    Delivers[i] := $FFFFFFFF;
+end;
+
+procedure TNegoDlg.ShowNewContent(NewMode: integer);
+begin
+  inherited ShowNewContent(NewMode);
+  SetButtonStates;
+  if (ClientMode = scDipCancelTreaty) or (ClientMode = scDipBreak) then
+    PassBtn.SmartHint := Phrases.Lookup('BTN_NOTICE')
+  else
+    PassBtn.SmartHint := Phrases.Lookup('BTN_PASS');
+  case MyRO.Treaty[DipMem[me].pContact] of
+    trNone:
+      begin
+        WantHiTreatyBtn.SmartHint := Phrases.Lookup('BTN_WANTPEACE');
+        OfferHiTreatyBtn.SmartHint := Phrases.Lookup('BTN_OFFERPEACE');
+        // WantLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTCEASEFIRE');
+        // OfferLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERCEASEFIRE');
+      end;
+    { trCeasefire:
+      begin
+      WantHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTPEACE');
+      OfferHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERPEACE');
+      end; }
+    trPeace:
+      begin
+        WantHiTreatyBtn.SmartHint := Phrases.Lookup('BTN_WANTFRIENDLY');
+        OfferHiTreatyBtn.SmartHint := Phrases.Lookup('BTN_OFFERFRIENDLY');
+        // WantLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTENDPEACE');
+        // OfferLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERENDPEACE');
+      end;
+    trFriendlyContact:
+      begin
+        WantHiTreatyBtn.SmartHint := Phrases.Lookup('BTN_WANTALLIANCE');
+        OfferHiTreatyBtn.SmartHint := Phrases.Lookup('BTN_OFFERALLIANCE');
+      end;
+    { trAlliance:
+      begin
+      WantLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTENDALLIANCE');
+      OfferLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERENDALLIANCE');
+      end; }
+  end;
+end;
+
+procedure TNegoDlg.Start;
+begin
+  if ClientMode <> scDipStart then
+    with History[me] do
+    begin
+      if n = MaxHistory then
+      begin
+        move(Text[2], Text[0], (MaxHistory - 2) * sizeof(integer));
+        dec(n, 2);
+      end;
+      Text[n] := copy(DipCommandToString(DipMem[me].pContact, me,
+        DipMem[me].FormerTreaty, DipMem[me].SentCommand, ClientMode,
+        DipMem[me].SentOffer, ReceivedOffer), 1, 255);
+      inc(n);
     end;
-
-fillchar(History, sizeof(History), 0);
-RomanFont:=TFont.Create;
-RomanFont.Name:='Times New Roman';
-RomanFont.Size:=Round(144 * 72/RomanFont.PixelsPerInch);
-RomanFont.Color:=Colors.Canvas.Pixels[clkMisc,cliPaper];
-HelpContext:='DIPLOMACY';
-OkBtn.Caption:=Phrases.Lookup('BTN_OK');
-AcceptBtn.SmartHint:=Phrases.Lookup('BTN_ACCEPT');
-ExitBtn.SmartHint:=Phrases.Lookup('BTN_BREAK');
-CancelTreatyBtn.SmartHint:=Phrases.Lookup('BTN_CNTREATY');
-end;
-
-procedure TNegoDlg.FormShow(Sender: TObject);
-begin
-OffscreenPaint;
-end;
-
-procedure TNegoDlg.ResetCurrentOffer;
-var
-i: integer;
-begin
-CurrentOffer.nDeliver:=0;
-CurrentOffer.nCost:=0;
-for i:=0 to 11 do
-  Costs[i]:=$FFFFFFFF;
-for i:=0 to 11 do
-  Delivers[i]:=$FFFFFFFF;
-end;
-
-procedure TNegoDlg.ShowNewContent(NewMode: integer);
-begin
-inherited ShowNewContent(NewMode);
-SetButtonStates;
-if (ClientMode=scDipCancelTreaty) or (ClientMode=scDipBreak) then
-  PassBtn.SmartHint:=Phrases.Lookup('BTN_NOTICE')
-else PassBtn.SmartHint:=Phrases.Lookup('BTN_PASS');
-case MyRO.Treaty[DipMem[me].pContact] of
-  trNone:
-    begin
-    WantHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTPEACE');
-    OfferHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERPEACE');
-    //WantLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTCEASEFIRE');
-    //OfferLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERCEASEFIRE');
-    end;
-  {trCeasefire:
-    begin
-    WantHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTPEACE');
-    OfferHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERPEACE');
-    end;}
-  trPeace:
-    begin
-    WantHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTFRIENDLY');
-    OfferHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERFRIENDLY');
-    //WantLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTENDPEACE');
-    //OfferLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERENDPEACE');
-    end;
-  trFriendlyContact:
-    begin
-    WantHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTALLIANCE');
-    OfferHiTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERALLIANCE');
-    end;
-  {trAlliance:
-    begin
-    WantLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_WANTENDALLIANCE');
-    OfferLoTreatyBtn.SmartHint:=Phrases.Lookup('BTN_OFFERENDALLIANCE');
-    end;}
-  end;
-end;
-
-procedure TNegoDlg.Start;
-begin
-if ClientMode<>scDipStart then with History[me] do
-  begin
-  if n=MaxHistory then
-    begin
-    move(Text[2], Text[0], (MaxHistory-2)*sizeof(integer));
-    dec(n,2);
-    end;
-  Text[n]:=copy(DipCommandToString(DipMem[me].pContact,me,
-    DipMem[me].FormerTreaty, DipMem[me].SentCommand, ClientMode,
-    DipMem[me].SentOffer, ReceivedOffer),1,255);
-  inc(n);
-  end;
-assert(History[me].n mod 2=1);
-
-Page:=History[me].n;
-FindAllowed;
-ResetCurrentOffer;
-
-(*if (ClientMode=scDipOffer) and (ReceivedOffer.nDeliver=1)
-  and (ReceivedOffer.nCost=0) and (ReceivedOffer.Price[0] and opMask=opTreaty) then
-  begin // prepare to demand price for treaty
-  CurrentOffer.nDeliver:=1;
-  CurrentOffer.Price[0]:=ReceivedOffer.Price[0];
-  CurrentOffer.nCost:=0;
-  end
-else
-  begin
-  if (ClientMode=scDipOffer) and (ReceivedOffer.nCost>0) then
+  assert(History[me].n mod 2 = 1);
+
+  Page := History[me].n;
+  FindAllowed;
+  ResetCurrentOffer;
+
+  (* if (ClientMode=scDipOffer) and (ReceivedOffer.nDeliver=1)
+    and (ReceivedOffer.nCost=0) and (ReceivedOffer.Price[0] and opMask=opTreaty) then
+    begin // prepare to demand price for treaty
+    CurrentOffer.nDeliver:=1;
+    CurrentOffer.Price[0]:=ReceivedOffer.Price[0];
+    CurrentOffer.nCost:=0;
+    end
+    else
+    begin
+    if (ClientMode=scDipOffer) and (ReceivedOffer.nCost>0) then
     begin
     CurrentOffer.nDeliver:=1;
     CurrentOffer.Price[0]:=ReceivedOffer.Price[ReceivedOffer.nDeliver]
     end
-  else CurrentOffer.nDeliver:=0;
-  if (ClientMode=scDipOffer) and (ReceivedOffer.nDeliver>0) then
+    else CurrentOffer.nDeliver:=0;
+    if (ClientMode=scDipOffer) and (ReceivedOffer.nDeliver>0) then
     begin
     CurrentOffer.nCost:=1;
     CurrentOffer.Price[CurrentOffer.nDeliver]:=ReceivedOffer.Price[0]
     end
-  else CurrentOffer.nCost:=0
-  end;*)
-DipCommand:=-1;
-ShowNewContent(wmPersistent);
+    else CurrentOffer.nCost:=0
+    end; *)
+  DipCommand := -1;
+  ShowNewContent(wmPersistent);
 end;
 
 procedure TNegoDlg.SplitText(Text: string; Bounds: TRect);
 var
-nLines,Line,Start,Stop,OrdinaryStop,Indent,y: integer;
-s: string;
-preview, Dot: boolean;
-begin
-for preview:=true downto false do
-  begin
-  Start:=1;
-  Line:=0;
-  Indent:=0;
-  while Start<Length(Text) do
-    begin
-    Dot:=false;
-    if (Start=1) or (Text[Start-1]='\') then
-      if Text[Start]='-' then
+  nLines, Line, Start, Stop, OrdinaryStop, Indent, Y: integer;
+  s: string;
+  preview, Dot: boolean;
+begin
+  for preview := true downto false do
+  begin
+    Start := 1;
+    Line := 0;
+    Indent := 0;
+    while Start < Length(Text) do
+    begin
+      Dot := false;
+      if (Start = 1) or (Text[Start - 1] = '\') then
+        if Text[Start] = '-' then
         begin
-        Indent:=ListIndent;
-        inc(Start);
-        if Start=Length(Text) then break;
-        Dot:=true;
+          Indent := ListIndent;
+          inc(Start);
+          if Start = Length(Text) then
+            break;
+          Dot := true;
         end
-      else Indent:=0;
-    Stop:=Start;
-    while (Stop<Length(Text)) and (Text[Stop]<>'\') do
-      begin
-      inc(Stop);
-      if BiColorTextWidth(Offscreen.Canvas,Copy(Text,Start,Stop-Start+1))
-        >Bounds.Right-Bounds.Left-PaperBorder_Left-PaperBorder_Right-Indent then
-        begin dec(Stop); break end;
+        else
+          Indent := 0;
+      Stop := Start;
+      while (Stop < Length(Text)) and (Text[Stop] <> '\') do
+      begin
+        inc(Stop);
+        if BiColorTextWidth(Offscreen.Canvas,
+          copy(Text, Start, Stop - Start + 1)) > Bounds.Right - Bounds.Left -
+          PaperBorder_Left - PaperBorder_Right - Indent then
+        begin
+          dec(Stop);
+          break
+        end;
       end;
-    if Stop<>Length(Text) then
-      begin
-      OrdinaryStop:=Stop;
-      while (Text[OrdinaryStop+1]<>' ') and (Text[OrdinaryStop+1]<>'\') do
-        dec(OrdinaryStop);
-      if (OrdinaryStop+1-Start)*2>=Stop-Start then
-        Stop:=OrdinaryStop
+      if Stop <> Length(Text) then
+      begin
+        OrdinaryStop := Stop;
+        while (Text[OrdinaryStop + 1] <> ' ') and
+          (Text[OrdinaryStop + 1] <> '\') do
+          dec(OrdinaryStop);
+        if (OrdinaryStop + 1 - Start) * 2 >= Stop - Start then
+          Stop := OrdinaryStop
       end;
-    if not preview then
-      begin
-      y:=(Bounds.Top+Bounds.Bottom) div 2-10*nLines+20*Line-1;
-      if Dot then
-        Sprite(offscreen,HGrSystem,Bounds.Left+PaperBorder_Left+(ListIndent-14),
-          y+7,8,8,90,16);
-      s:=Copy(Text,Start,Stop-Start+1);
-      BiColorTextOut(Offscreen.Canvas,Colors.Canvas.Pixels[clkMisc,cliPaperText],
-        $7F007F,Bounds.Left+PaperBorder_Left+Indent,y,s);
+      if not preview then
+      begin
+        Y := (Bounds.Top + Bounds.Bottom) div 2 - 10 * nLines + 20 * Line - 1;
+        if Dot then
+          Sprite(Offscreen, HGrSystem, Bounds.Left + PaperBorder_Left +
+            (ListIndent - 14), Y + 7, 8, 8, 90, 16);
+        s := copy(Text, Start, Stop - Start + 1);
+        BiColorTextOut(Offscreen.Canvas, Colors.Canvas.Pixels[clkMisc,
+          cliPaperText], $7F007F, Bounds.Left + PaperBorder_Left +
+          Indent, Y, s);
       end;
-    inc(Line);
-    Start:=Stop+2;
+      inc(Line);
+      Start := Stop + 2;
     end;
-  nLines:=Line;
+    nLines := Line;
   end
 end;
@@ -318 +338 @@
 procedure TNegoDlg.FindAllowed;
 var
-i: integer;
-begin
-CommandAllowed:=[scDipOffer-scDipStart];
-if ClientMode<>scDipBreak then include(CommandAllowed,scDipBreak-scDipStart);
-if MyRO.Treaty[DipMem[me].pContact]>=trPeace then
-  include(CommandAllowed,scDipCancelTreaty-scDipStart);
-if (ClientMode=scDipOffer)
-  and (Server(scDipAccept-sExecute,me,0,nil^)>=rExecuted) then
-  include(CommandAllowed,scDipAccept-scDipStart);
-
-MyAllowed:=[opChoose shr 24, opMoney shr 24];
-OppoAllowed:=[opChoose shr 24, opMoney shr 24];
-if not IsCivilReportNew(DipMem[me].pContact) then
+  i: integer;
+begin
+  CommandAllowed := [scDipOffer - scDipStart];
+  if ClientMode <> scDipBreak then
+    include(CommandAllowed, scDipBreak - scDipStart);
+  if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
+    include(CommandAllowed, scDipCancelTreaty - scDipStart);
+  if (ClientMode = scDipOffer) and (Server(scDipAccept - sExecute, me, 0, nil^)
+    >= rExecuted) then
+    include(CommandAllowed, scDipAccept - scDipStart);
+
+  MyAllowed := [opChoose shr 24, opMoney shr 24];
+  OppoAllowed := [opChoose shr 24, opMoney shr 24];
+  if not IsCivilReportNew(DipMem[me].pContact) then
   begin // no up-to-date civil report
-  MyAllowed:=MyAllowed+[opCivilReport shr 24];
-  for i:=0 to nAdv-1 do if MyRO.Tech[i]>=tsApplicable then
-    begin MyAllowed:=MyAllowed+[opAllTech shr 24]; break end;
-  OppoAllowed:=OppoAllowed+[opCivilReport shr 24,opAllTech shr 24];
+    MyAllowed := MyAllowed + [opCivilReport shr 24];
+    for i := 0 to nAdv - 1 do
+      if MyRO.Tech[i] >= tsApplicable then
+      begin
+        MyAllowed := MyAllowed + [opAllTech shr 24];
+        break
+      end;
+    OppoAllowed := OppoAllowed + [opCivilReport shr 24, opAllTech shr 24];
   end
-else
+  else
   begin // check techs
-  for i:=0 to nAdv-1 do if not (i in FutureTech) then
-    if (MyRO.Tech[i]<tsSeen)
-      and (MyRO.EnemyReport[DipMem[me].pContact].Tech[i]>=tsApplicable) then
-      OppoAllowed:=OppoAllowed+[opAllTech shr 24]
-    else if (MyRO.EnemyReport[DipMem[me].pContact].Tech[i]<tsSeen)
-      and (MyRO.Tech[i]>=tsApplicable) then
-      MyAllowed:=MyAllowed+[opAllTech shr 24];
-  end;
-if not IsMilReportNew(DipMem[me].pContact) then
+    for i := 0 to nAdv - 1 do
+      if not(i in FutureTech) then
+        if (MyRO.Tech[i] < tsSeen) and
+          (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] >= tsApplicable) then
+          OppoAllowed := OppoAllowed + [opAllTech shr 24]
+        else if (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] < tsSeen) and
+          (MyRO.Tech[i] >= tsApplicable) then
+          MyAllowed := MyAllowed + [opAllTech shr 24];
+  end;
+  if not IsMilReportNew(DipMem[me].pContact) then
   begin // no up-to-date military report
-  MyAllowed:=MyAllowed+[opMilReport shr 24];
-  if MyRO.nModel>3 then
-    MyAllowed:=MyAllowed+[opAllModel shr 24];
-  OppoAllowed:=OppoAllowed+[opMilReport shr 24,opAllModel shr 24];
+    MyAllowed := MyAllowed + [opMilReport shr 24];
+    if MyRO.nModel > 3 then
+      MyAllowed := MyAllowed + [opAllModel shr 24];
+    OppoAllowed := OppoAllowed + [opMilReport shr 24, opAllModel shr 24];
   end
-else
-  begin
-  if ModalSelectDlg.OnlyChoice(kChooseModel)<>mixAll then
-    MyAllowed:=MyAllowed+[opAllModel shr 24];
-  if ModalSelectDlg.OnlyChoice(kChooseEModel)<>mixAll then
-    OppoAllowed:=OppoAllowed+[opAllModel shr 24];
-  end;
-if MyRO.Treaty[DipMem[me].pContact]<trAlliance then
-  begin
-  MyAllowed:=MyAllowed+[opTreaty shr 24,opMap shr 24];
-  OppoAllowed:=OppoAllowed+[opTreaty shr 24,opMap shr 24];
-  end;
-{if MyRO.Treaty[DipMem[me].pContact] in [trNone,trPeace,trAlliance] then
-  begin
-  MyAllowed:=MyAllowed+[opLowTreaty shr 24];
-  OppoAllowed:=OppoAllowed+[opLowTreaty shr 24];
-  end;}
-for i:=0 to nShipPart-1 do
-  begin
-  if MyRO.Ship[me].Parts[i]>0 then
-    include(MyAllowed, opShipParts shr 24);
-  if MyRO.Ship[DipMem[me].pContact].Parts[i]>0 then
-    include(OppoAllowed, opShipParts shr 24);
-  end;
-MyAllowed:=MyAllowed-DipMem[me].DeliveredPrices*[opAllTech shr 24,opAllModel shr 24,opCivilReport shr 24,opMilReport shr 24,opMap shr 24];
-OppoAllowed:=OppoAllowed-DipMem[me].ReceivedPrices*[opAllTech shr 24,opAllModel shr 24,opCivilReport shr 24,opMilReport shr 24,opMap shr 24];
-end;
-
-procedure TNegoDlg.PaintNationPicture(x,y,p: integer);
-begin
-with Offscreen.Canvas do
-  begin
-  Pen.Color:=$000000;
-  Brush.Color:=Tribe[p].Color;
-  Rectangle(x-6,y-1,x+70,y+49);
-  Brush.Color:=$000000;
-  Tribe[p].InitAge(GetAge(p));
-  if Tribe[p].faceHGr>=0 then
-    Dump(offscreen,Tribe[p].faceHGr,x,y,64,48,
-      1+Tribe[p].facepix mod 10 *65,1+Tribe[p].facepix div 10 *49)
-  else FillRect(Rect(x,y,x+64,y+48));
-  Brush.Style:=bsClear;
-  Frame(Offscreen.Canvas,x-1,y-1,x+64,y+48,$000000,$000000);
+  else
+  begin
+    if ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
+      MyAllowed := MyAllowed + [opAllModel shr 24];
+    if ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
+      OppoAllowed := OppoAllowed + [opAllModel shr 24];
+  end;
+  if MyRO.Treaty[DipMem[me].pContact] < trAlliance then
+  begin
+    MyAllowed := MyAllowed + [opTreaty shr 24, opMap shr 24];
+    OppoAllowed := OppoAllowed + [opTreaty shr 24, opMap shr 24];
+  end;
+  { if MyRO.Treaty[DipMem[me].pContact] in [trNone,trPeace,trAlliance] then
+    begin
+    MyAllowed:=MyAllowed+[opLowTreaty shr 24];
+    OppoAllowed:=OppoAllowed+[opLowTreaty shr 24];
+    end; }
+  for i := 0 to nShipPart - 1 do
+  begin
+    if MyRO.Ship[me].Parts[i] > 0 then
+      include(MyAllowed, opShipParts shr 24);
+    if MyRO.Ship[DipMem[me].pContact].Parts[i] > 0 then
+      include(OppoAllowed, opShipParts shr 24);
+  end;
+  MyAllowed := MyAllowed - DipMem[me].DeliveredPrices *
+    [opAllTech shr 24, opAllModel shr 24, opCivilReport shr 24,
+    opMilReport shr 24, opMap shr 24];
+  OppoAllowed := OppoAllowed - DipMem[me].ReceivedPrices *
+    [opAllTech shr 24, opAllModel shr 24, opCivilReport shr 24,
+    opMilReport shr 24, opMap shr 24];
+end;
+
+procedure TNegoDlg.PaintNationPicture(X, Y, p: integer);
+begin
+  with Offscreen.Canvas do
+  begin
+    Pen.Color := $000000;
+    Brush.Color := Tribe[p].Color;
+    Rectangle(X - 6, Y - 1, X + 70, Y + 49);
+    Brush.Color := $000000;
+    Tribe[p].InitAge(GetAge(p));
+    if Tribe[p].faceHGr >= 0 then
+      Dump(Offscreen, Tribe[p].faceHGr, X, Y, 64, 48,
+        1 + Tribe[p].facepix mod 10 * 65, 1 + Tribe[p].facepix div 10 * 49)
+    else
+      FillRect(Rect(X, Y, X + 64, Y + 48));
+    Brush.Style := bsClear;
+    Frame(Offscreen.Canvas, X - 1, Y - 1, X + 64, Y + 48, $000000, $000000);
   end
 end;
@@ -402 +433 @@
 procedure TNegoDlg.SetButtonStates;
 var
-cix: integer;
-IsActionPage: boolean;
-begin
-IsActionPage:= Page=History[me].n;
-
-AcceptBtn.Possible:= IsActionPage and (scDipAccept-scDipStart in CommandAllowed);
-AcceptBtn.Lit:= DipCommand=scDipAccept;
-PassBtn.Possible:= IsActionPage and (scDipOffer-scDipStart in CommandAllowed);
-PassBtn.Lit:= (DipCommand=scDipNotice)
-  or (DipCommand=scDipOffer) and (CurrentOffer.nDeliver=0) and (CurrentOffer.nCost=0);
-ExitBtn.Possible:= IsActionPage and (scDipBreak-scDipStart in CommandAllowed);
-ExitBtn.Lit:= DipCommand=scDipBreak;
-CancelTreatyBtn.Possible:= IsActionPage and (scDipCancelTreaty-scDipStart in CommandAllowed);
-CancelTreatyBtn.Lit:= DipCommand=scDipCancelTreaty;
-
-for cix:=0 to ComponentCount-1 do
-  if Components[cix] is TButtonN then
-    with TButtonN(Components[cix]) do
-      case Tag shr 8 of
-        1: // Costs
-          begin
-          Possible:= IsActionPage and (ButtonPrice[Tag and $FF] shr 24 in OppoAllowed);
-          Lit:=Costs[Tag and $FF]<>$FFFFFFFF;
-          end;
-        2: // Delivers
-          begin
-          Possible:= IsActionPage and (ButtonPrice[Tag and $FF] shr 24 in MyAllowed);
-          Lit:=Delivers[Tag and $FF]<>$FFFFFFFF;
-          end
+  cix: integer;
+  IsActionPage: boolean;
+begin
+  IsActionPage := Page = History[me].n;
+
+  AcceptBtn.Possible := IsActionPage and
+    (scDipAccept - scDipStart in CommandAllowed);
+  AcceptBtn.Lit := DipCommand = scDipAccept;
+  PassBtn.Possible := IsActionPage and
+    (scDipOffer - scDipStart in CommandAllowed);
+  PassBtn.Lit := (DipCommand = scDipNotice) or (DipCommand = scDipOffer) and
+    (CurrentOffer.nDeliver = 0) and (CurrentOffer.nCost = 0);
+  ExitBtn.Possible := IsActionPage and
+    (scDipBreak - scDipStart in CommandAllowed);
+  ExitBtn.Lit := DipCommand = scDipBreak;
+  CancelTreatyBtn.Possible := IsActionPage and
+    (scDipCancelTreaty - scDipStart in CommandAllowed);
+  CancelTreatyBtn.Lit := DipCommand = scDipCancelTreaty;
+
+  for cix := 0 to ComponentCount - 1 do
+    if Components[cix] is TButtonN then
+      with TButtonN(Components[cix]) do
+        case Tag shr 8 of
+          1: // Costs
+            begin
+              Possible := IsActionPage and
+                (ButtonPrice[Tag and $FF] shr 24 in OppoAllowed);
+              Lit := Costs[Tag and $FF] <> $FFFFFFFF;
+            end;
+          2: // Delivers
+            begin
+              Possible := IsActionPage and
+                (ButtonPrice[Tag and $FF] shr 24 in MyAllowed);
+              Lit := Delivers[Tag and $FF] <> $FFFFFFFF;
+            end
         end;
 end;
@@ -436 +473 @@
 procedure TNegoDlg.OffscreenPaint;
 var
-i,cred: integer;
-s: string;
-OkEnabled: boolean;
-begin
-if (OffscreenUser<>nil) and (OffscreenUser<>self) then OffscreenUser.Update;
+  i, cred: integer;
+  s: string;
+  OkEnabled: boolean;
+begin
+  if (OffscreenUser <> nil) and (OffscreenUser <> self) then
+    OffscreenUser.Update;
   // complete working with old owner to prevent rebound
-OffscreenUser:=self;
-
-if (DipCommand>=0) and (Page=History[me].n) then
-  History[me].Text[History[me].n]:=copy(DipCommandToString(me,DipMem[me].pContact,
-    MyRO.Treaty[DipMem[me].pContact],ClientMode, DipCommand, ReceivedOffer, CurrentOffer),1,255);
-
-FwdBtn.Visible:= Page<History[me].n;
-BwdBtn.Visible:= Page>=2;
-if Page<History[me].n then OkEnabled:=false
-else if DipCommand=scDipOffer then
-  OkEnabled:= Server(scDipOffer-sExecute,me,0,CurrentOffer)>=rExecuted
-else OkEnabled:= DipCommand>=0;
-OkBtn.Visible:=OkEnabled;
-
-Fill(Offscreen.Canvas,3,3,ClientWidth-6,ClientHeight-6,
-  (wMaintexture-ClientWidth) div 2,(hMaintexture-ClientHeight) div 2);
-Frame(Offscreen.Canvas,0,0,ClientWidth-1,ClientHeight-1,0,0);
-Frame(Offscreen.Canvas,1,1,ClientWidth-2,ClientHeight-2,MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(Offscreen.Canvas,2,2,ClientWidth-3,ClientHeight-3,MainTexture.clBevelLight,MainTexture.clBevelShade);
-Corner(Offscreen.Canvas,1,1,0,MainTexture);
-Corner(Offscreen.Canvas,ClientWidth-9,1,1,MainTexture);
-Corner(Offscreen.Canvas,1,ClientHeight-9,2,MainTexture);
-Corner(Offscreen.Canvas,ClientWidth-9,ClientHeight-9,3,MainTexture);
-
-BtnFrame(Offscreen.Canvas,OkBtn.BoundsRect,MainTexture);
-BtnFrame(Offscreen.Canvas,BwdBtn.BoundsRect,MainTexture);
-BtnFrame(Offscreen.Canvas,FwdBtn.BoundsRect,MainTexture);
-BtnFrame(Offscreen.Canvas,CloseBtn.BoundsRect,MainTexture);
-
-RFrame(Offscreen.Canvas,xPadC-2, yPadC-2, xPadC+41+42*3,yPadC+41,
-  $FFFFFF,$B0B0B0);
-RFrame(Offscreen.Canvas,xPad0-2, yPad0-2,xPad0+41+42*3,
-  yPad0+41+42*2,$FFFFFF,$B0B0B0);
-RFrame(Offscreen.Canvas,xPad1-2, yPad1-2,xPad1+41+42*3,
-  yPad1+41+42*2,$FFFFFF,$B0B0B0);
-
-PaintNationPicture(xNationPicture0,yNationPicture,DipMem[me].pContact);
-PaintNationPicture(xNationPicture1,yNationPicture,me);
-
-if History[me].Text[Page-1]<>'' then
-  begin
-  FillSeamless(Offscreen.Canvas, xText0, yText0, wText, hText, 0, 0, Paper);
-  i:=Page-1;
-  if History[me].Text[0]='' then dec(i);
-  if i<16 then
-    begin
+  OffscreenUser := self;
+
+  if (DipCommand >= 0) and (Page = History[me].n) then
+    History[me].Text[History[me].n] :=
+      copy(DipCommandToString(me, DipMem[me].pContact,
+      MyRO.Treaty[DipMem[me].pContact], ClientMode, DipCommand, ReceivedOffer,
+      CurrentOffer), 1, 255);
+
+  FwdBtn.Visible := Page < History[me].n;
+  BwdBtn.Visible := Page >= 2;
+  if Page < History[me].n then
+    OkEnabled := false
+  else if DipCommand = scDipOffer then
+    OkEnabled := Server(scDipOffer - sExecute, me, 0, CurrentOffer) >= rExecuted
+  else
+    OkEnabled := DipCommand >= 0;
+  OkBtn.Visible := OkEnabled;
+
+  Fill(Offscreen.Canvas, 3, 3, ClientWidth - 6, ClientHeight - 6,
+    (wMaintexture - ClientWidth) div 2, (hMaintexture - ClientHeight) div 2);
+  Frame(Offscreen.Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
+  Frame(Offscreen.Canvas, 1, 1, ClientWidth - 2, ClientHeight - 2,
+    MainTexture.clBevelLight, MainTexture.clBevelShade);
+  Frame(Offscreen.Canvas, 2, 2, ClientWidth - 3, ClientHeight - 3,
+    MainTexture.clBevelLight, MainTexture.clBevelShade);
+  Corner(Offscreen.Canvas, 1, 1, 0, MainTexture);
+  Corner(Offscreen.Canvas, ClientWidth - 9, 1, 1, MainTexture);
+  Corner(Offscreen.Canvas, 1, ClientHeight - 9, 2, MainTexture);
+  Corner(Offscreen.Canvas, ClientWidth - 9, ClientHeight - 9, 3, MainTexture);
+
+  BtnFrame(Offscreen.Canvas, OkBtn.BoundsRect, MainTexture);
+  BtnFrame(Offscreen.Canvas, BwdBtn.BoundsRect, MainTexture);
+  BtnFrame(Offscreen.Canvas, FwdBtn.BoundsRect, MainTexture);
+  BtnFrame(Offscreen.Canvas, CloseBtn.BoundsRect, MainTexture);
+
+  RFrame(Offscreen.Canvas, xPadC - 2, yPadC - 2, xPadC + 41 + 42 * 3,
+    yPadC + 41, $FFFFFF, $B0B0B0);
+  RFrame(Offscreen.Canvas, xPad0 - 2, yPad0 - 2, xPad0 + 41 + 42 * 3,
+    yPad0 + 41 + 42 * 2, $FFFFFF, $B0B0B0);
+  RFrame(Offscreen.Canvas, xPad1 - 2, yPad1 - 2, xPad1 + 41 + 42 * 3,
+    yPad1 + 41 + 42 * 2, $FFFFFF, $B0B0B0);
+
+  PaintNationPicture(xNationPicture0, yNationPicture, DipMem[me].pContact);
+  PaintNationPicture(xNationPicture1, yNationPicture, me);
+
+  if History[me].Text[Page - 1] <> '' then
+  begin
+    FillSeamless(Offscreen.Canvas, xText0, yText0, wText, hText, 0, 0, Paper);
+    i := Page - 1;
+    if History[me].Text[0] = '' then
+      dec(i);
+    if i < 16 then
+    begin
+      Offscreen.Canvas.Font.Assign(RomanFont);
+      Offscreen.Canvas.TextOut
+        (xText0 + (wText - Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
+        yText0 + (hText - Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,
+        RomanNo[i]);
+    end
+  end;
+  FillSeamless(Offscreen.Canvas, xText1, yText1, wText, hText, 0, 0, Paper);
+  i := Page;
+  if History[me].Text[0] = '' then
+    dec(i);
+  if i < 16 then
+  begin
     Offscreen.Canvas.Font.Assign(RomanFont);
-    Offscreen.Canvas.TextOut(xText0+(wText-Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
-      yText0+(hText-Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,RomanNo[i]);
-    end
-  end;
-FillSeamless(Offscreen.Canvas, xText1, yText1, wText, hText, 0, 0, Paper);
-i:=Page;
-if History[me].Text[0]='' then dec(i);
-if i<16 then
-  begin
-  Offscreen.Canvas.Font.Assign(RomanFont);
-  Offscreen.Canvas.TextOut(xText1+(wText-Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
-    yText1+(hText-Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,RomanNo[i]);
-  end;
-with Offscreen.Canvas do
-  begin
-  Brush.Color:=MainTexture.clBevelShade;
-  if History[me].Text[Page-1]<>'' then
-    begin
-    FillRect(Rect(xText0+wText, yText0+PaperShade, xText0+wText+PaperShade,
-      yText0+hText+PaperShade));
-    FillRect(Rect(xText0+PaperShade, yText0+hText, xText0+wText+PaperShade,
-      yText0+hText+PaperShade));
+    Offscreen.Canvas.TextOut
+      (xText1 + (wText - Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
+      yText1 + (hText - Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,
+      RomanNo[i]);
+  end;
+  with Offscreen.Canvas do
+  begin
+    Brush.Color := MainTexture.clBevelShade;
+    if History[me].Text[Page - 1] <> '' then
+    begin
+      FillRect(Rect(xText0 + wText, yText0 + PaperShade,
+        xText0 + wText + PaperShade, yText0 + hText + PaperShade));
+      FillRect(Rect(xText0 + PaperShade, yText0 + hText,
+        xText0 + wText + PaperShade, yText0 + hText + PaperShade));
     end;
-  FillRect(Rect(xText1+wText, yText1+PaperShade, xText1+wText+PaperShade,
-    yText1+hText+PaperShade));
-  FillRect(Rect(xText1+PaperShade, yText1+hText, xText1+wText+PaperShade,
-    yText1+hText+PaperShade));
-  Brush.Style:=bsClear;
-  end;
-
-Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-
-{if Page=History[me].n then
-  begin // show attitude
-  s:=Phrases.Lookup('ATTITUDE',MyRO.EnemyReport[DipMem[me].pContact].Attitude);
-  //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
-  RisedTextOut(Offscreen.Canvas,xText0+wText div 2-
+    FillRect(Rect(xText1 + wText, yText1 + PaperShade,
+      xText1 + wText + PaperShade, yText1 + hText + PaperShade));
+    FillRect(Rect(xText1 + PaperShade, yText1 + hText,
+      xText1 + wText + PaperShade, yText1 + hText + PaperShade));
+    Brush.Style := bsClear;
+  end;
+
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+
+  { if Page=History[me].n then
+    begin // show attitude
+    s:=Phrases.Lookup('ATTITUDE',MyRO.EnemyReport[DipMem[me].pContact].Attitude);
+    //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
+    RisedTextOut(Offscreen.Canvas,xText0+wText div 2-
     BiColorTextWidth(Offscreen.Canvas,s) div 2,yAttitude,s);
-  s:=Phrases.Lookup('ATTITUDE',MyRO.Attitude[DipMem[me].pContact]);
-  //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
-  RisedTextOut(Offscreen.Canvas,xText1+wText div 2-
+    s:=Phrases.Lookup('ATTITUDE',MyRO.Attitude[DipMem[me].pContact]);
+    //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
+    RisedTextOut(Offscreen.Canvas,xText1+wText div 2-
     BiColorTextWidth(Offscreen.Canvas,s) div 2,yAttitude,s);
-  end;}
-
-if History[me].Text[Page-1]<>'' then
-  SplitText(History[me].Text[Page-1],
-    Rect(xText0, yText0, xText0+wText, yText0+hText));
-if (Page<History[me].n) or OkEnabled then
-  SplitText(History[me].Text[Page], Rect(xText1, yText1, xText1+wText, yText1+hText));
-
-// show credibility
-Offscreen.Canvas.Font.Assign(UniFont[ftTiny]);
-cred:=MyRO.EnemyReport[DipMem[me].pContact].Credibility;
-case cred of
-  0..49: i:= 3; 50..90: i:=0; 91..100: i:=1; end;
-PaintProgressBar(Offscreen.Canvas,i,xCred0,yCred0+17,(cred+2) div 5,0,20,MainTexture);
-s:=IntToStr(cred);
-RisedTextOut(Offscreen.Canvas,xCred0+10-(BiColorTextWidth(Offscreen.Canvas,s)+1) div 2,yCred0,s);
-case MyRO.Credibility of
-  0..49: i:= 3; 50..90: i:=0; 91..100: i:=1; end;
-PaintProgressBar(Offscreen.Canvas,i,xCred1,yCred1+17,(MyRO.Credibility+2) div 5,0,20,MainTexture);
-s:=IntToStr(MyRO.Credibility);
-RisedTextOut(Offscreen.Canvas,xCred1+10-(BiColorTextWidth(Offscreen.Canvas,s)+1) div 2,yCred1,s);
-
-MarkUsedOffscreen(ClientWidth,ClientHeight);
-end; {OffscreenPaint}
+    end; }
+
+  if History[me].Text[Page - 1] <> '' then
+    SplitText(History[me].Text[Page - 1], Rect(xText0, yText0, xText0 + wText,
+      yText0 + hText));
+  if (Page < History[me].n) or OkEnabled then
+    SplitText(History[me].Text[Page], Rect(xText1, yText1, xText1 + wText,
+      yText1 + hText));
+
+  // show credibility
+  Offscreen.Canvas.Font.Assign(UniFont[ftTiny]);
+  cred := MyRO.EnemyReport[DipMem[me].pContact].Credibility;
+  case cred of
+    0 .. 49:
+      i := 3;
+    50 .. 90:
+      i := 0;
+    91 .. 100:
+      i := 1;
+  end;
+  PaintProgressBar(Offscreen.Canvas, i, xCred0, yCred0 + 17, (cred + 2) div 5,
+    0, 20, MainTexture);
+  s := IntToStr(cred);
+  RisedTextOut(Offscreen.Canvas, xCred0 + 10 -
+    (BiColorTextWidth(Offscreen.Canvas, s) + 1) div 2, yCred0, s);
+  case MyRO.Credibility of
+    0 .. 49:
+      i := 3;
+    50 .. 90:
+      i := 0;
+    91 .. 100:
+      i := 1;
+  end;
+  PaintProgressBar(Offscreen.Canvas, i, xCred1, yCred1 + 17,
+    (MyRO.Credibility + 2) div 5, 0, 20, MainTexture);
+  s := IntToStr(MyRO.Credibility);
+  RisedTextOut(Offscreen.Canvas, xCred1 + 10 -
+    (BiColorTextWidth(Offscreen.Canvas, s) + 1) div 2, yCred1, s);
+
+  MarkUsedOffscreen(ClientWidth, ClientHeight);
+end; { OffscreenPaint }
 
 procedure TNegoDlg.Initiate;
 begin
-History[me].n:=1;
-History[me].Text[0]:='';
+  History[me].n := 1;
+  History[me].Text[0] := '';
 end;
 
 procedure TNegoDlg.Respond;
 begin
-History[me].n:=0;
+  History[me].n := 0;
 end;
 
 procedure TNegoDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; X, Y: Integer);
-begin
-if (x>=xNationPicture0) and (x<xNationPicture0+64)
-  and (y>=yNationPicture) and (y<yNationPicture+48) then
-  NatStatDlg.ShowNewContent(FWindowMode or wmPersistent, DipMem[me].pContact)
-else if (x>=xNationPicture1) and (x<xNationPicture1+64)
-  and (y>=yNationPicture) and (y<yNationPicture+48) then
-  NatStatDlg.ShowNewContent(FWindowMode or wmPersistent,me)
+  Shift: TShiftState; X, Y: integer);
+begin
+  if (X >= xNationPicture0) and (X < xNationPicture0 + 64) and
+    (Y >= yNationPicture) and (Y < yNationPicture + 48) then
+    NatStatDlg.ShowNewContent(FWindowMode or wmPersistent, DipMem[me].pContact)
+  else if (X >= xNationPicture1) and (X < xNationPicture1 + 64) and
+    (Y >= yNationPicture) and (Y < yNationPicture + 48) then
+    NatStatDlg.ShowNewContent(FWindowMode or wmPersistent, me)
 end;
 
 procedure TNegoDlg.BwdBtnClick(Sender: TObject);
 begin
-dec(Page,2);
-SetButtonStates;
-SmartUpdateContent;
+  dec(Page, 2);
+  SetButtonStates;
+  SmartUpdateContent;
 end;
 
 procedure TNegoDlg.FwdBtnClick(Sender: TObject);
 begin
-inc(Page,2);
-SetButtonStates;
-SmartUpdateContent;
+  inc(Page, 2);
+  SetButtonStates;
+  SmartUpdateContent;
 end;
 
 procedure TNegoDlg.OkBtnClick(Sender: TObject);
 begin
-inc(History[me].n);
-if DipCommand=scDipOffer then
-  MainScreen.OfferCall(CurrentOffer)
-else MainScreen.DipCall(DipCommand);
+  inc(History[me].n);
+  if DipCommand = scDipOffer then
+    MainScreen.OfferCall(CurrentOffer)
+  else
+    MainScreen.DipCall(DipCommand);
 end;
 
 procedure TNegoDlg.CloseBtnClick(Sender: TObject);
 begin
-Close
+  Close
 end;
 
@@ -608 +676 @@
   Shift: TShiftState);
 begin
-if Key=VK_RETURN then
-  begin
-  if OkBtn.Visible then OkBtnClick(nil)
+  if Key = VK_RETURN then
+  begin
+    if OkBtn.Visible then
+      OkBtnClick(nil)
   end
-else inherited
+  else
+    inherited
 end;
 
 procedure TNegoDlg.BuildCurrentOffer;
 var
-i: integer;
-begin
-CurrentOffer.nDeliver:=0;
-CurrentOffer.nCost:=0;
-for i:=0 to 11 do if Delivers[i]<>$FFFFFFFF then
-  begin
-  CurrentOffer.Price[CurrentOffer.nDeliver]:=Delivers[i];
-  inc(CurrentOffer.nDeliver);
-  end;
-for i:=0 to 11 do if Costs[i]<>$FFFFFFFF then
-  begin
-  CurrentOffer.Price[CurrentOffer.nDeliver+CurrentOffer.nCost]:=Costs[i];
-  inc(CurrentOffer.nCost);
-  end;
+  i: integer;
+begin
+  CurrentOffer.nDeliver := 0;
+  CurrentOffer.nCost := 0;
+  for i := 0 to 11 do
+    if Delivers[i] <> $FFFFFFFF then
+    begin
+      CurrentOffer.Price[CurrentOffer.nDeliver] := Delivers[i];
+      inc(CurrentOffer.nDeliver);
+    end;
+  for i := 0 to 11 do
+    if Costs[i] <> $FFFFFFFF then
+    begin
+      CurrentOffer.Price[CurrentOffer.nDeliver + CurrentOffer.nCost] :=
+        Costs[i];
+      inc(CurrentOffer.nCost);
+    end;
 end;
 
 procedure TNegoDlg.WantClick(Sender: TObject);
 var
-a,i,max: integer;
-Price: cardinal;
-begin
-if (Page<>History[me].n)
-  or (ClientMode=scDipCancelTreaty) or (ClientMode=scDipBreak) then
-  exit;
-if Costs[TButtonN(Sender).Tag and $FF]<>$FFFFFFFF then
-  Price:=$FFFFFFFF // toggle off
-else
-  begin
-  if CurrentOffer.nCost>=2 then
-    begin
-    SimpleMessage(Phrases.Lookup('MAX2WANTS'));
-    exit
+  a, i, max: integer;
+  Price: cardinal;
+begin
+  if (Page <> History[me].n) or (ClientMode = scDipCancelTreaty) or
+    (ClientMode = scDipBreak) then
+    exit;
+  if Costs[TButtonN(Sender).Tag and $FF] <> $FFFFFFFF then
+    Price := $FFFFFFFF // toggle off
+  else
+  begin
+    if CurrentOffer.nCost >= 2 then
+    begin
+      SimpleMessage(Phrases.Lookup('MAX2WANTS'));
+      exit
     end;
-  Price:=ButtonPrice[TButtonN(Sender).Tag and $FF];
-  if not (Price shr 24 in OppoAllowed) then exit;
-  case Price of
-    opCivilReport, opMilReport:
-      inc(Price,DipMem[me].pContact shl 16+MyRO.Turn); // !!! choose player and year!
-    opMoney:
-      begin // choose amount
-      InputDlg.Caption:=Phrases.Lookup('TITLE_AMOUNT');
-      InputDlg.EInput.Text:='';
-      InputDlg.CenterToRect(BoundsRect);
-      InputDlg.ShowModal;
-      if InputDlg.ModalResult<>mrOK then exit;
-      val(InputDlg.EInput.Text,a,i);
-      if (i<>0) or (a<=0) or (a>=MaxMoneyPrice) then exit;
-      inc(Price,a);
-      end;
-    opShipParts:
-      begin // choose type and number
-      if MyRO.NatBuilt[imSpacePort]=0 then with MessgExDlg do
+    Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
+    if not(Price shr 24 in OppoAllowed) then
+      exit;
+    case Price of
+      opCivilReport, opMilReport:
+        inc(Price, DipMem[me].pContact shl 16 + MyRO.Turn);
+        // !!! choose player and year!
+      opMoney:
+        begin // choose amount
+          InputDlg.Caption := Phrases.Lookup('TITLE_AMOUNT');
+          InputDlg.EInput.Text := '';
+          InputDlg.CenterToRect(BoundsRect);
+          InputDlg.ShowModal;
+          if InputDlg.ModalResult <> mrOK then
+            exit;
+          val(InputDlg.EInput.Text, a, i);
+          if (i <> 0) or (a <= 0) or (a >= MaxMoneyPrice) then
+            exit;
+          inc(Price, a);
+        end;
+      opShipParts:
+        begin // choose type and number
+          if MyRO.NatBuilt[imSpacePort] = 0 then
+            with MessgExDlg do
+            begin
+              OpenSound := 'WARNING_LOWSUPPORT';
+              MessgText := Phrases.Lookup('NOSPACEPORT');
+              Kind := mkYesNo;
+              IconKind := mikImp;
+              IconIndex := imSpacePort;
+              ShowModal;
+              if ModalResult <> mrOK then
+                exit
+            end;
+          ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
+          if ModalSelectDlg.result < 0 then
+            exit;
+          inc(Price, ModalSelectDlg.result shl 16);
+          max := MyRO.Ship[DipMem[me].pContact].Parts[ModalSelectDlg.result];
+          InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
+          InputDlg.EInput.Text := '';
+          InputDlg.CenterToRect(BoundsRect);
+          InputDlg.ShowModal;
+          if InputDlg.ModalResult <> mrOK then
+            exit;
+          val(InputDlg.EInput.Text, a, i);
+          if (i <> 0) or (a <= 0) then
+            exit;
+          if a > max then
+            a := max;
+          if a > MaxShipPartPrice then
+            a := MaxShipPartPrice;
+          inc(Price, a)
+        end;
+      opAllTech:
+        begin // choose technology
+          ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
+          if ModalSelectDlg.result < 0 then
+            exit;
+          if ModalSelectDlg.result = adAll then
+            Price := opAllTech
+          else
+            Price := OpTech + ModalSelectDlg.result;
+        end;
+      opAllModel:
+        begin // choose model
+          ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
+          if ModalSelectDlg.result < 0 then
+            exit;
+          if ModalSelectDlg.result = mixAll then
+            Price := opAllModel
+          else
+            Price := OpModel + MyRO.EnemyModel[ModalSelectDlg.result].mix;
+        end;
+      opTreaty:
         begin
-        OpenSound:='WARNING_LOWSUPPORT';
-        MessgText:=Phrases.Lookup('NOSPACEPORT');
-        Kind:=mkYesNo;
-        IconKind:=mikImp;
-        IconIndex:=imSpacePort;
-        ShowModal;
-        if ModalResult<>mrOK then exit
-        end;
-      ModalSelectDlg.ShowNewContent(wmModal,kEShipPart);
-      if ModalSelectDlg.result<0 then exit;
-      inc(Price, ModalSelectDlg.result shl 16);
-      max:=MyRO.Ship[DipMem[me].pContact].Parts[ModalSelectDlg.result];
-      InputDlg.Caption:=Phrases.Lookup('TITLE_NUMBER');
-      InputDlg.EInput.Text:='';
-      InputDlg.CenterToRect(BoundsRect);
-      InputDlg.ShowModal;
-      if InputDlg.ModalResult<>mrOK then exit;
-      val(InputDlg.EInput.Text,a,i);
-      if (i<>0) or (a<=0) then exit;
-      if a>max then a:=max;
-      if a>MaxShipPartPrice then a:=MaxShipPartPrice;
-      inc(Price,a)
-      end;
-    opAllTech:
-      begin // choose technology
-      ModalSelectDlg.ShowNewContent(wmModal,kChooseETech);
-      if ModalSelectDlg.result<0 then exit;
-      if ModalSelectDlg.result=adAll then Price:=opAllTech
-      else Price:=OpTech+ModalSelectDlg.result;
-      end;
-    opAllModel:
-      begin // choose model
-      ModalSelectDlg.ShowNewContent(wmModal,kChooseEModel);
-      if ModalSelectDlg.result<0 then exit;
-      if ModalSelectDlg.result=mixAll then Price:=opAllModel
-      else Price:=OpModel+MyRO.EnemyModel[ModalSelectDlg.result].mix;
-      end;
-    opTreaty:
-      begin
-      if MyRO.Treaty[DipMem[me].pContact]<trPeace then Price:=opTreaty+trPeace
-      else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]+1;
-      end;
-{    opLowTreaty:
-      begin
-      if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
-      else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
-      end}
+          if MyRO.Treaty[DipMem[me].pContact] < trPeace then
+            Price := opTreaty + trPeace
+          else
+            Price := opTreaty + MyRO.Treaty[DipMem[me].pContact] + 1;
+        end;
+      { opLowTreaty:
+        begin
+        if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
+        else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
+        end }
     end;
   end;
 
-Costs[TButtonN(Sender).Tag and $FF]:=Price;
-BuildCurrentOffer;
-DipCommand:=scDipOffer;
-SetButtonStates;
-SmartUpdateContent;
+  Costs[TButtonN(Sender).Tag and $FF] := Price;
+  BuildCurrentOffer;
+  DipCommand := scDipOffer;
+  SetButtonStates;
+  SmartUpdateContent;
 end;
 
 procedure TNegoDlg.OfferClick(Sender: TObject);
 var
-a,i,max: integer;
-Price: cardinal;
-begin
-if (Page<>History[me].n)
-  or (ClientMode=scDipCancelTreaty) or (ClientMode=scDipBreak) then
-  exit;
-if Delivers[TButtonN(Sender).Tag and $FF]<>$FFFFFFFF then
-  Price:=$FFFFFFFF // toggle off
-else
-  begin
-  if CurrentOffer.nDeliver>=2 then
-    begin
-    SimpleMessage(Phrases.Lookup('MAX2OFFERS'));
-    exit
+  a, i, max: integer;
+  Price: cardinal;
+begin
+  if (Page <> History[me].n) or (ClientMode = scDipCancelTreaty) or
+    (ClientMode = scDipBreak) then
+    exit;
+  if Delivers[TButtonN(Sender).Tag and $FF] <> $FFFFFFFF then
+    Price := $FFFFFFFF // toggle off
+  else
+  begin
+    if CurrentOffer.nDeliver >= 2 then
+    begin
+      SimpleMessage(Phrases.Lookup('MAX2OFFERS'));
+      exit
     end;
-  Price:=ButtonPrice[TButtonN(Sender).Tag and $FF];
-  if not (Price shr 24 in MyAllowed) then exit;
-  case Price of
-    opCivilReport, opMilReport:
-      inc(Price,me shl 16+MyRO.Turn); // !!! choose player and year!
-    opMoney:
-      begin // choose amount
-      InputDlg.Caption:=Phrases.Lookup('TITLE_AMOUNT');
-      InputDlg.EInput.Text:='';
-      InputDlg.CenterToRect(BoundsRect);
-      InputDlg.ShowModal;
-      if InputDlg.ModalResult<>mrOK then exit;
-      val(InputDlg.EInput.Text,a,i);
-      if (i<>0) or (a<=0) or (a>=MaxMoneyPrice) then exit;
-      if (Price=opMoney) and (a>MyRO.Money) then
-        a:=MyRO.Money;
-      inc(Price,a);
-      end;
-    opShipParts:
-      begin // choose type and number
-      ModalSelectDlg.ShowNewContent(wmModal,kShipPart);
-      if ModalSelectDlg.result<0 then exit;
-      inc(Price, ModalSelectDlg.result shl 16);
-      max:=MyRO.Ship[me].Parts[ModalSelectDlg.result];
-      InputDlg.Caption:=Phrases.Lookup('TITLE_NUMBER');
-      InputDlg.EInput.Text:='';
-      InputDlg.CenterToRect(BoundsRect);
-      InputDlg.ShowModal;
-      if InputDlg.ModalResult<>mrOK then exit;
-      val(InputDlg.EInput.Text,a,i);
-      if (i<>0) or (a<=0) then exit;
-      if a>max then a:=max;
-      if a>MaxShipPartPrice then a:=MaxShipPartPrice;
-      inc(Price,a)
-      end;
-    opAllTech:
-      begin // choose technology
-      ModalSelectDlg.ShowNewContent(wmModal,kChooseTech);
-      if ModalSelectDlg.result<0 then exit;
-      if ModalSelectDlg.result=adAll then Price:=opAllTech
-      else Price:=OpTech+ModalSelectDlg.result;
-      end;
-    opAllModel:
-      begin // choose model
-      ModalSelectDlg.ShowNewContent(wmModal,kChooseModel);
-      if ModalSelectDlg.result<0 then exit;
-      if ModalSelectDlg.result=mixAll then Price:=opAllModel
-      else Price:=opModel+ModalSelectDlg.result
-      end;
-    opTreaty:
-      begin
-      if MyRO.Treaty[DipMem[me].pContact]<trPeace then Price:=opTreaty+trPeace
-      else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]+1;
-      end;
-{    opLowTreaty:
-      begin
-      if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
-      else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
-      end}
+    Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
+    if not(Price shr 24 in MyAllowed) then
+      exit;
+    case Price of
+      opCivilReport, opMilReport:
+        inc(Price, me shl 16 + MyRO.Turn); // !!! choose player and year!
+      opMoney:
+        begin // choose amount
+          InputDlg.Caption := Phrases.Lookup('TITLE_AMOUNT');
+          InputDlg.EInput.Text := '';
+          InputDlg.CenterToRect(BoundsRect);
+          InputDlg.ShowModal;
+          if InputDlg.ModalResult <> mrOK then
+            exit;
+          val(InputDlg.EInput.Text, a, i);
+          if (i <> 0) or (a <= 0) or (a >= MaxMoneyPrice) then
+            exit;
+          if (Price = opMoney) and (a > MyRO.Money) then
+            a := MyRO.Money;
+          inc(Price, a);
+        end;
+      opShipParts:
+        begin // choose type and number
+          ModalSelectDlg.ShowNewContent(wmModal, kShipPart);
+          if ModalSelectDlg.result < 0 then
+            exit;
+          inc(Price, ModalSelectDlg.result shl 16);
+          max := MyRO.Ship[me].Parts[ModalSelectDlg.result];
+          InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
+          InputDlg.EInput.Text := '';
+          InputDlg.CenterToRect(BoundsRect);
+          InputDlg.ShowModal;
+          if InputDlg.ModalResult <> mrOK then
+            exit;
+          val(InputDlg.EInput.Text, a, i);
+          if (i <> 0) or (a <= 0) then
+            exit;
+          if a > max then
+            a := max;
+          if a > MaxShipPartPrice then
+            a := MaxShipPartPrice;
+          inc(Price, a)
+        end;
+      opAllTech:
+        begin // choose technology
+          ModalSelectDlg.ShowNewContent(wmModal, kChooseTech);
+          if ModalSelectDlg.result < 0 then
+            exit;
+          if ModalSelectDlg.result = adAll then
+            Price := opAllTech
+          else
+            Price := OpTech + ModalSelectDlg.result;
+        end;
+      opAllModel:
+        begin // choose model
+          ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
+          if ModalSelectDlg.result < 0 then
+            exit;
+          if ModalSelectDlg.result = mixAll then
+            Price := opAllModel
+          else
+            Price := OpModel + ModalSelectDlg.result
+        end;
+      opTreaty:
+        begin
+          if MyRO.Treaty[DipMem[me].pContact] < trPeace then
+            Price := opTreaty + trPeace
+          else
+            Price := opTreaty + MyRO.Treaty[DipMem[me].pContact] + 1;
+        end;
+      { opLowTreaty:
+        begin
+        if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
+        else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
+        end }
     end;
   end;
 
-Delivers[TButtonN(Sender).Tag and $FF]:=Price;
-BuildCurrentOffer;
-DipCommand:=scDipOffer;
-SetButtonStates;
-SmartUpdateContent;
+  Delivers[TButtonN(Sender).Tag and $FF] := Price;
+  BuildCurrentOffer;
+  DipCommand := scDipOffer;
+  SetButtonStates;
+  SmartUpdateContent;
 end;
 
 procedure TNegoDlg.FastBtnClick(Sender: TObject);
 var
-NewCommand: cardinal;
-begin
-if Page<>History[me].n then exit;
-NewCommand:=TButtonN(Sender).Tag and $FF+scDipStart;
-if not (NewCommand-scDipStart in CommandAllowed) then exit;
-if (NewCommand=scDipCancelTreaty)
-  and (MyRO.Turn<MyRO.LastCancelTreaty[DipMem[me].pContact]+CancelTreatyTurns) then
-  begin
-  SimpleMessage(Phrases.Lookup('CANCELTREATYRUSH'));
-  exit;
-  end;
-if (NewCommand=scDipOffer)
-  and ((ClientMode=scDipCancelTreaty) or (ClientMode=scDipBreak)) then
-  DipCommand:=scDipNotice
-else DipCommand:=NewCommand;
-ResetCurrentOffer;
-SetButtonStates;
-SmartUpdateContent;
+  NewCommand: cardinal;
+begin
+  if Page <> History[me].n then
+    exit;
+  NewCommand := TButtonN(Sender).Tag and $FF + scDipStart;
+  if not(NewCommand - scDipStart in CommandAllowed) then
+    exit;
+  if (NewCommand = scDipCancelTreaty) and
+    (MyRO.Turn < MyRO.LastCancelTreaty[DipMem[me].pContact] + CancelTreatyTurns)
+  then
+  begin
+    SimpleMessage(Phrases.Lookup('CANCELTREATYRUSH'));
+    exit;
+  end;
+  if (NewCommand = scDipOffer) and ((ClientMode = scDipCancelTreaty) or
+    (ClientMode = scDipBreak)) then
+    DipCommand := scDipNotice
+  else
+    DipCommand := NewCommand;
+  ResetCurrentOffer;
+  SetButtonStates;
+  SmartUpdateContent;
 end;
 
 end.
-

trunk/LocalPlayer/PVSB.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit PVSB;
 
@@ -6 +5 @@
 
 uses
-  Windows,Messages,SysUtils;
+  Windows, Messages, SysUtils;
 
 type
-TPVScrollbar=record h:integer;si:TScrollInfo end;
+  TPVScrollbar = record
+    h: integer;
+    si: TScrollInfo end;
 
-procedure CreatePVSB(var sb:TPVScrollbar;Handle,y0,x1,y1:integer);
-procedure InitPVSB(var sb:TPVScrollbar;max,Page:integer);
-function ProcessPVSB(var sb:TPVScrollbar;const m:TMessage):boolean;
-function ProcessMouseWheel(var sb:TPVScrollbar;const m:TMessage):boolean;
-procedure ShowPVSB(var sb:TPVScrollbar; Visible: boolean);
-procedure EndPVSB(var sb:TPVScrollbar);
+    procedure CreatePVSB(var sb: TPVScrollbar; Handle, y0, x1, y1: integer);
+    procedure InitPVSB(var sb: TPVScrollbar; max, Page: integer);
+    function ProcessPVSB(var sb: TPVScrollbar; const m: TMessage): boolean;
+    function ProcessMouseWheel(var sb: TPVScrollbar; const m: TMessage)
+      : boolean;
+    procedure ShowPVSB(var sb: TPVScrollbar; Visible: boolean);
+    procedure EndPVSB(var sb: TPVScrollbar);
 
 implementation
 
 const
-Count:integer= 0;
+  Count: integer = 0;
 
 procedure CreatePVSB;
 begin
-inc(Count);
-sb.h:=CreateWindowEx(0,'SCROLLBAR',pchar('PVSB'+IntToStr(Count)),
-  SBS_VERT or WS_CHILD or SBS_RIGHTALIGN,x1-100,y0,100,y1-y0,Handle,0,0,nil);
-sb.si.cbSize:=28;
+  inc(Count);
+  sb.h := CreateWindowEx(0, 'SCROLLBAR', pchar('PVSB' + IntToStr(Count)),
+    SBS_VERT or WS_CHILD or SBS_RIGHTALIGN, x1 - 100, y0, 100, y1 - y0,
+    Handle, 0, 0, nil);
+  sb.si.cbSize := 28;
 end;
 
 procedure InitPVSB;
 begin
-with sb.si do
+  with sb.si do
   begin
-  nMin:=0;nMax:=max;npos:=0;nPage:=Page;
-  FMask:=SIF_PAGE or SIF_POS or SIF_RANGE;
+    nMin := 0;
+    nMax := max;
+    npos := 0;
+    nPage := Page;
+    FMask := SIF_PAGE or SIF_POS or SIF_RANGE;
   end;
-SetScrollInfo(sb.h,SB_CTL,sb.si,true);
-if max<Page then ShowWindow(sb.h,SW_HIDE) else ShowWindow(sb.h,SW_SHOW)
+  SetScrollInfo(sb.h, SB_CTL, sb.si, true);
+  if max < Page then
+    ShowWindow(sb.h, SW_HIDE)
+  else
+    ShowWindow(sb.h, SW_SHOW)
 end;
 
 function ProcessPVSB;
 var
-NewPos:integer;
+  NewPos: integer;
 begin
-with sb.si do
-  if nMax<integer(nPage) then result:=false
-  else
+  with sb.si do
+    if nMax < integer(nPage) then
+      result := false
+    else
     begin
-    if m.wParamLo in[SB_THUMBPOSITION,SB_THUMBTRACK] then
-      begin result:=m.wParamHi<>npos;npos:=m.wParamHi;end
-    else
+      if m.wParamLo in [SB_THUMBPOSITION, SB_THUMBTRACK] then
       begin
-      case m.wParamLo of
-        SB_LINEUP:NewPos:=npos-1;SB_LINEDOWN:NewPos:=npos+1;
-        SB_PAGEUP:NewPos:=npos-integer(nPage);SB_PAGEDOWN:NewPos:=npos+integer(nPage);
-        else NewPos:=npos
+        result := m.wParamHi <> npos;
+        npos := m.wParamHi;
+      end
+      else
+      begin
+        case m.wParamLo of
+          SB_LINEUP:
+            NewPos := npos - 1;
+          SB_LINEDOWN:
+            NewPos := npos + 1;
+          SB_PAGEUP:
+            NewPos := npos - integer(nPage);
+          SB_PAGEDOWN:
+            NewPos := npos + integer(nPage);
+        else
+          NewPos := npos
         end;
-      if NewPos<0 then NewPos:=0;
-      if NewPos>nMax-integer(nPage)+1 then NewPos:=nMax-integer(nPage)+1;
-      result:=NewPos<>npos;
-      if (NewPos<>npos) or (m.wParamLo=SB_ENDSCROLL) then
+        if NewPos < 0 then
+          NewPos := 0;
+        if NewPos > nMax - integer(nPage) + 1 then
+          NewPos := nMax - integer(nPage) + 1;
+        result := NewPos <> npos;
+        if (NewPos <> npos) or (m.wParamLo = SB_ENDSCROLL) then
         begin
-        npos:=NewPos;FMask:=SIF_POS;
-        SetScrollInfo(sb.h,SB_CTL,sb.si,true);
+          npos := NewPos;
+          FMask := SIF_POS;
+          SetScrollInfo(sb.h, SB_CTL, sb.si, true);
         end;
       end
@@ -73 +96 @@
 function ProcessMouseWheel;
 var
-NewPos:integer;
+  NewPos: integer;
 begin
-with sb.si do
-  if nMax<integer(nPage) then result:=false
-  else
+  with sb.si do
+    if nMax < integer(nPage) then
+      result := false
+    else
     begin
-    NewPos:=npos-m.wParam div (1 shl 16*40);
-    if NewPos<0 then NewPos:=0;
-    if NewPos>nMax-integer(nPage)+1 then NewPos:=nMax-integer(nPage)+1;
-    result:=NewPos<>npos;
-    if NewPos<>npos then
+      NewPos := npos - m.wParam div (1 shl 16 * 40);
+      if NewPos < 0 then
+        NewPos := 0;
+      if NewPos > nMax - integer(nPage) + 1 then
+        NewPos := nMax - integer(nPage) + 1;
+      result := NewPos <> npos;
+      if NewPos <> npos then
       begin
-      npos:=NewPos;FMask:=SIF_POS;
-      SetScrollInfo(sb.h,SB_CTL,sb.si,true);
+        npos := NewPos;
+        FMask := SIF_POS;
+        SetScrollInfo(sb.h, SB_CTL, sb.si, true);
       end
     end
 end;
 
-procedure ShowPVSB(var sb:TPVScrollbar; Visible: boolean);
+procedure ShowPVSB(var sb: TPVScrollbar; Visible: boolean);
 begin
-if not Visible or (sb.si.nMax<integer(sb.si.nPage)) then
-  ShowWindow(sb.h,SW_HIDE)
-else ShowWindow(sb.h,SW_SHOW)
+  if not Visible or (sb.si.nMax < integer(sb.si.nPage)) then
+    ShowWindow(sb.h, SW_HIDE)
+  else
+    ShowWindow(sb.h, SW_SHOW)
 end;
 
-procedure EndPVSB(var sb:TPVScrollbar);
+procedure EndPVSB(var sb: TPVScrollbar);
 begin
-with sb.si do
+  with sb.si do
   begin
-  if nMax<integer(nPage) then npos:=0 // hidden
-  else
+    if nMax < integer(nPage) then
+      npos := 0 // hidden
+    else
     begin
-    sb.si.npos:=nMax-integer(nPage)+1;
-    sb.si.FMask:=SIF_POS;
-    SetScrollInfo(sb.h,SB_CTL,sb.si,true);
+      sb.si.npos := nMax - integer(nPage) + 1;
+      sb.si.FMask := SIF_POS;
+      SetScrollInfo(sb.h, SB_CTL, sb.si, true);
     end
   end
@@ -113 +142 @@
 
 end.
-

trunk/LocalPlayer/Rates.pas

@@ -5 +5 @@
 
 uses
-  Protocol,ScreenTools,BaseWin,
+  Protocol, ScreenTools, BaseWin,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
@@ -32 +32 @@
 
 uses
-  ClientTools,Term,Tribes;
+  ClientTools, Term, Tribes;
 
 {$R *.DFM}
 
 const
-MessageLineSpacing=20;
-
+  MessageLineSpacing = 20;
 
 procedure TRatesDlg.FormCreate(Sender: TObject);
 begin
-TitleHeight:=Screen.Height;
-InitButtons();
+  TitleHeight := Screen.Height;
+  InitButtons();
 end;
 
 procedure TRatesDlg.OffscreenPaint;
 var
-p,x,y,current,max,i: integer;
-s,s1: string;
-begin
-if (OffscreenUser<>nil) and (OffscreenUser<>self) then OffscreenUser.Update;
+  p, x, y, current, max, i: integer;
+  s, s1: string;
+begin
+  if (OffscreenUser <> nil) and (OffscreenUser <> self) then
+    OffscreenUser.Update;
   // complete working with old owner to prevent rebound
-OffscreenUser:=self;
-
-Fill(Offscreen.Canvas, 0,0,ClientWidth,ClientHeight,
-  (wMaintexture-ClientWidth) div 2,(hMaintexture-ClientHeight) div 2);
-Frame(Offscreen.Canvas,0,0,ClientWidth-1,ClientHeight-1,0,0);
-Frame(Offscreen.Canvas,1,1,ClientWidth-2,ClientHeight-2,MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(Offscreen.Canvas,2,2,ClientWidth-3,ClientHeight-3,MainTexture.clBevelLight,MainTexture.clBevelShade);
-
-BtnFrame(Offscreen.Canvas,CloseBtn.BoundsRect,MainTexture);
-Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-s:=Phrases.Lookup('TITLE_RATES');
-RisedTextOut(Offscreen.Canvas,(ClientWidth-BiColorTextWidth(Offscreen.Canvas,s)) div 2-1,7,s);
-
-if MyRO.Wonder[woLiberty].EffectiveOwner=me then
-  s:=Phrases.Lookup('NORATES')
-else s:=Phrases.Lookup('RATES');
-Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-p:=pos('\',s);
-if p=0 then
-  RisedTextout(Offscreen.Canvas,(ClientWidth-BiColorTextWidth(Canvas,s)) div 2, 114, s)
-else
-  begin
-  s1:=copy(s,1,p-1);
-  RisedTextout(Offscreen.Canvas,(ClientWidth-BiColorTextWidth(Offscreen.Canvas,s1)) div 2,
-    114-MessageLineSpacing div 2, s1);
-  s1:=copy(s,p+1,255);
-  RisedTextout(Offscreen.Canvas,(ClientWidth-BiColorTextWidth(Offscreen.Canvas,s1)) div 2,
-    114+(MessageLineSpacing-MessageLineSpacing div 2), s1);
-  end;
-Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-
-if MyRO.Wonder[woLiberty].EffectiveOwner=me then
-  begin
-  GlowFrame(Offscreen, ClientWidth div 2-xSizeBig div 2,
-    52,xSizeBig, ySizeBig, Tribe[me].Color);
-  BitBlt(Offscreen.Canvas.Handle, ClientWidth div 2-xSizeBig div 2,
-    52, xSizeBig, ySizeBig,BigImp.Canvas.Handle,
-    (woLiberty mod 7)*xSizeBig, (woLiberty div 7+SystemIconLines)*ySizeBig, SRCCOPY);
-  end
-else
-  begin
-//  ImageOp_CBC(Offscreen,Templates,260,40,145,112,36,36,$404000,$8B8BEB);
-
-  s:=Phrases.Lookup('SCIENCE');
-  RisedTextOut(Offscreen.Canvas,16+120-BiColorTextWidth(Offscreen.Canvas,s),44,s);
-  s:=Format('%d%%',[100-MyRO.TaxRate-MyRO.LuxRate]);
-  RisedTextOut(Offscreen.Canvas,16+120-BiColorTextWidth(Offscreen.Canvas,s),60,s);
-  //PaintProgressBar(Offscreen.Canvas,2,16,81,(100-MyRO.LuxRate-MyRO.TaxRate)*120 div 100,0,120,MainTexture);
-
-  // reverse progress bar for science
-  x:=16;
-  y:=81;
-  current:=(100-MyRO.LuxRate-MyRO.TaxRate)*120 div 100;
-  max:=120;
-  Frame(Offscreen.Canvas,x-1,y-1,x+max,y+7,$000000,$000000);
-  RFrame(Offscreen.Canvas,x-2,y-2,x+max+1,y+8,MainTexture.clBevelShade,MainTexture.clBevelLight);
-  with Offscreen.Canvas do
+  OffscreenUser := self;
+
+  Fill(Offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+    (wMaintexture - ClientWidth) div 2, (hMaintexture - ClientHeight) div 2);
+  Frame(Offscreen.Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
+  Frame(Offscreen.Canvas, 1, 1, ClientWidth - 2, ClientHeight - 2,
+    MainTexture.clBevelLight, MainTexture.clBevelShade);
+  Frame(Offscreen.Canvas, 2, 2, ClientWidth - 3, ClientHeight - 3,
+    MainTexture.clBevelLight, MainTexture.clBevelShade);
+
+  BtnFrame(Offscreen.Canvas, CloseBtn.BoundsRect, MainTexture);
+  Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  s := Phrases.Lookup('TITLE_RATES');
+  RisedTextOut(Offscreen.Canvas,
+    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s)) div 2 - 1, 7, s);
+
+  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
+    s := Phrases.Lookup('NORATES')
+  else
+    s := Phrases.Lookup('RATES');
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  p := pos('\', s);
+  if p = 0 then
+    RisedTextOut(Offscreen.Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
+      div 2, 114, s)
+  else
+  begin
+    s1 := copy(s, 1, p - 1);
+    RisedTextOut(Offscreen.Canvas,
+      (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
+      114 - MessageLineSpacing div 2, s1);
+    s1 := copy(s, p + 1, 255);
+    RisedTextOut(Offscreen.Canvas,
+      (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
+      114 + (MessageLineSpacing - MessageLineSpacing div 2), s1);
+  end;
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+
+  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
+  begin
+    GlowFrame(Offscreen, ClientWidth div 2 - xSizeBig div 2, 52, xSizeBig,
+      ySizeBig, Tribe[me].Color);
+    BitBlt(Offscreen.Canvas.Handle, ClientWidth div 2 - xSizeBig div 2, 52,
+      xSizeBig, ySizeBig, BigImp.Canvas.Handle, (woLiberty mod 7) * xSizeBig,
+      (woLiberty div 7 + SystemIconLines) * ySizeBig, SRCCOPY);
+  end
+  else
+  begin
+    // ImageOp_CBC(Offscreen,Templates,260,40,145,112,36,36,$404000,$8B8BEB);
+
+    s := Phrases.Lookup('SCIENCE');
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 44, s);
+    s := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 60, s);
+    // PaintProgressBar(Offscreen.Canvas,2,16,81,(100-MyRO.LuxRate-MyRO.TaxRate)*120 div 100,0,120,MainTexture);
+
+    // reverse progress bar for science
+    x := 16;
+    y := 81;
+    current := (100 - MyRO.LuxRate - MyRO.TaxRate) * 120 div 100;
+    max := 120;
+    Frame(Offscreen.Canvas, x - 1, y - 1, x + max, y + 7, $000000, $000000);
+    RFrame(Offscreen.Canvas, x - 2, y - 2, x + max + 1, y + 8,
+      MainTexture.clBevelShade, MainTexture.clBevelLight);
+    with Offscreen.Canvas do
     begin
-    for i:=0 to current div 8-1 do
-      BitBlt(Handle,x+max-8-i*8,y,8,7,GrExt[HGrSystem].Data.Canvas.Handle,104,
-        9+8*2,SRCCOPY);
-    BitBlt(Handle,x+max-current,y,
-      current-8*(current div 8),7,GrExt[HGrSystem].Data.Canvas.Handle,104,9+8*2,SRCCOPY);
-    Brush.Color:=$000000;
-    FillRect(Rect(x,y,x+max-current,y+7));
-    Brush.Style:=bsClear;
+      for i := 0 to current div 8 - 1 do
+        BitBlt(Handle, x + max - 8 - i * 8, y, 8, 7,
+          GrExt[HGrSystem].Data.Canvas.Handle, 104, 9 + 8 * 2, SRCCOPY);
+      BitBlt(Handle, x + max - current, y, current - 8 * (current div 8), 7,
+        GrExt[HGrSystem].Data.Canvas.Handle, 104, 9 + 8 * 2, SRCCOPY);
+      Brush.Color := $000000;
+      FillRect(Rect(x, y, x + max - current, y + 7));
+      Brush.Style := bsClear;
     end;
 
-  RisedTextOut(Offscreen.Canvas,16+160,44,Phrases.Lookup('LUX'));
-  s:=Format('%d%%',[MyRO.LuxRate]);
-  RisedTextOut(Offscreen.Canvas,16+160{+120-BiColorTextWidth(Offscreen.Canvas,s)},60,s);
-  PaintProgressBar(Offscreen.Canvas,5,16+160,81,MyRO.LuxRate*120 div 100,0,120,MainTexture);
-  RFrame(Offscreen.Canvas,ScienceBtn.Left-1,LuxBtn.Top-1,LuxBtn.Left+12,
-    LuxBtn.Top+12,MainTexture.clBevelShade,MainTexture.clBevelLight);
-  end;
-
-DLine(Offscreen.Canvas,1,ClientWidth-2,154, MainTexture.clBevelShade, MainTexture.clBevelLight);
-RisedTextOut(Offscreen.Canvas,16+80,164,Phrases.Lookup('TAXRATE'));
-s:=Format('%d%%',[MyRO.TaxRate]);
-RisedTextOut(Offscreen.Canvas,16+80{+120-BiColorTextWidth(Offscreen.Canvas,s)},180,s);
-PaintProgressBar(Offscreen.Canvas,0,16+80,201,MyRO.TaxRate*120 div 100,0,120,MainTexture);
-RFrame(Offscreen.Canvas,TaxUpBtn.Left-1,TaxUpBtn.Top-1,TaxUpBtn.Left+12,
-  TaxDownBtn.Top+12,MainTexture.clBevelShade,MainTexture.clBevelLight);
-
-MarkUsedOffscreen(ClientWidth,ClientHeight);
+    RisedTextOut(Offscreen.Canvas, 16 + 160, 44, Phrases.Lookup('LUX'));
+    s := Format('%d%%', [MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, s);
+    PaintProgressBar(Offscreen.Canvas, 5, 16 + 160, 81,
+      MyRO.LuxRate * 120 div 100, 0, 120, MainTexture);
+    RFrame(Offscreen.Canvas, ScienceBtn.Left - 1, LuxBtn.Top - 1,
+      LuxBtn.Left + 12, LuxBtn.Top + 12, MainTexture.clBevelShade,
+      MainTexture.clBevelLight);
+  end;
+
+  DLine(Offscreen.Canvas, 1, ClientWidth - 2, 154, MainTexture.clBevelShade,
+    MainTexture.clBevelLight);
+  RisedTextOut(Offscreen.Canvas, 16 + 80, 164, Phrases.Lookup('TAXRATE'));
+  s := Format('%d%%', [MyRO.TaxRate]);
+  RisedTextOut(Offscreen.Canvas,
+    16 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, s);
+  PaintProgressBar(Offscreen.Canvas, 0, 16 + 80, 201,
+    MyRO.TaxRate * 120 div 100, 0, 120, MainTexture);
+  RFrame(Offscreen.Canvas, TaxUpBtn.Left - 1, TaxUpBtn.Top - 1,
+    TaxUpBtn.Left + 12, TaxDownBtn.Top + 12, MainTexture.clBevelShade,
+    MainTexture.clBevelLight);
+
+  MarkUsedOffscreen(ClientWidth, ClientHeight);
 end;
 
 procedure TRatesDlg.ShowNewContent(NewMode: integer);
 begin
-inherited ShowNewContent(NewMode);
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TRatesDlg.FormShow(Sender: TObject);
 begin
-if MyRO.Wonder[woLiberty].EffectiveOwner=me then
-  begin
-  ScienceBtn.Visible:=false;
-  LuxBtn.Visible:=false;
-  end
-else
-  begin
-  ScienceBtn.Visible:=true;
-  LuxBtn.Visible:=true;
-  end;
-OffscreenPaint;
+  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
+  begin
+    ScienceBtn.Visible := false;
+    LuxBtn.Visible := false;
+  end
+  else
+  begin
+    ScienceBtn.Visible := true;
+    LuxBtn.Visible := true;
+  end;
+  OffscreenPaint;
 end;
 
 procedure TRatesDlg.CloseBtnClick(Sender: TObject);
 begin
-Close;
+  Close;
 end;
 
 procedure TRatesDlg.TaxLuxBtnClick(Sender: TObject);
 var
-NewTax, NewLux: integer;
-begin
-NewTax:=MyRO.TaxRate div 10;
-NewLux:=MyRO.LuxRate div 10;
-if Sender=TaxUpBtn then
-  begin
-  if NewTax<10 then inc(NewTax);
-  if NewTax+NewLux>10 then dec(NewLux);
-  end
-else if (Sender=TaxDownBtn) and (NewTax>0) then
-  dec(NewTax)
-else if (Sender=ScienceBtn) and (NewLux>0) then
-  dec(NewLux)
-else if (Sender=LuxBtn) and (NewLux+NewTax<100) then
-  inc(NewLux);
-if Server(sSetRates,me,NewTax+NewLux shl 4,nil^)<>eNotChanged then
-  begin
-  CityOptimizer_BeginOfTurn;
-  SmartUpdateContent;
-  MainScreen.UpdateViews(true);
+  NewTax, NewLux: integer;
+begin
+  NewTax := MyRO.TaxRate div 10;
+  NewLux := MyRO.LuxRate div 10;
+  if Sender = TaxUpBtn then
+  begin
+    if NewTax < 10 then
+      inc(NewTax);
+    if NewTax + NewLux > 10 then
+      dec(NewLux);
+  end
+  else if (Sender = TaxDownBtn) and (NewTax > 0) then
+    dec(NewTax)
+  else if (Sender = ScienceBtn) and (NewLux > 0) then
+    dec(NewLux)
+  else if (Sender = LuxBtn) and (NewLux + NewTax < 100) then
+    inc(NewLux);
+  if Server(sSetRates, me, NewTax + NewLux shl 4, nil^) <> eNotChanged then
+  begin
+    CityOptimizer_BeginOfTurn;
+    SmartUpdateContent;
+    MainScreen.UpdateViews(true);
   end
 end;
 
 end.
-

trunk/LocalPlayer/Select.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Select;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ClientTools,Term,ScreenTools,IsoEngine,PVSB,BaseWin,
-
-  Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms,
-  ExtCtrls,ButtonB, ButtonBase, Menus;
+  Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
+
+  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  ExtCtrls, ButtonB, ButtonBase, Menus;
 
 const
-MaxLayer=3;
+  MaxLayer = 3;
 
 type
-  TListKind=(kProject,kAdvance,kFarAdvance,kCities,kCityEvents,kModels,kEModels,
-    kAllEModels,kTribe,kScience,kShipPart,kEShipPart,kChooseTech,
-    kChooseETech,kChooseModel,kChooseEModel,kChooseCity,kChooseECity,
-    kStealTech,kGov,kMission);
+  TListKind = (kProject, kAdvance, kFarAdvance, kCities, kCityEvents, kModels,
+    kEModels, kAllEModels, kTribe, kScience, kShipPart, kEShipPart, kChooseTech,
+    kChooseETech, kChooseModel, kChooseEModel, kChooseCity, kChooseECity,
+    kStealTech, kGov, kMission);
 
   TListDlg = class(TFramedDlg)
@@ -27 +26 @@
     ToggleBtn: TButtonB;
     Popup: TPopupMenu;
-    procedure PaintBox1MouseMove(Sender:TObject;Shift:TShiftState;x,
-      y:integer);
-    procedure FormCreate(Sender:TObject);
-    procedure PaintBox1MouseDown(Sender:TObject;Button:TMouseButton;
-      Shift:TShiftState;x,y:integer);
-    procedure FormPaint(Sender:TObject);
-    procedure CloseBtnClick(Sender:TObject);
+    procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
+      x, y: integer);
+    procedure FormCreate(Sender: TObject);
+    procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    procedure FormPaint(Sender: TObject);
+    procedure CloseBtnClick(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure FormShow(Sender: TObject);
     procedure ModeBtnClick(Sender: TObject);
     procedure ToggleBtnClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
     procedure PlayerClick(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -45 +43 @@
   public
     result: integer;
-    function OnlyChoice(TestKind: TListKind): integer; // -2=empty, -1=ambiguous, other=only choice
+    function OnlyChoice(TestKind: TListKind): integer;
+    // -2=empty, -1=ambiguous, other=only choice
     procedure OffscreenPaint; override;
     procedure ShowNewContent(NewMode: integer; ListKind: TListKind);
@@ -57 +56 @@
   private
     Kind: TListKind;
-    LineDistance,MaxLines,cixProject,pView,Sel,DispLines,Layer,nColumn,
-      TechNameSpace,ScienceNation: integer;
-    sb:TPVScrollbar;
-    Lines, FirstShrinkedLine: array[0..MaxLayer-1] of integer;
-    code: array[0..MaxLayer-1,0..4095] of integer;
-    Column: array[0..nPl-1] of integer;
-    Closable,MultiPage: boolean;
+    LineDistance, MaxLines, cixProject, pView, Sel, DispLines, Layer, nColumn,
+      TechNameSpace, ScienceNation: integer;
+    sb: TPVScrollbar;
+    Lines, FirstShrinkedLine: array [0 .. MaxLayer - 1] of integer;
+    code: array [0 .. MaxLayer - 1, 0 .. 4095] of integer;
+    Column: array [0 .. nPl - 1] of integer;
+    Closable, MultiPage: boolean;
     ScienceNationDot: TBitmap;
     procedure InitLines;
@@ -69 +68 @@
     function RenameCity(cix: integer): boolean;
     function RenameModel(mix: integer): boolean;
-    procedure OnScroll(var m:TMessage); message WM_VSCROLL;
-    procedure OnMouseWheel(var m:TMessage); message WM_MOUSEWHEEL;
-    procedure OnMouseLeave(var Msg:TMessage); message CM_MOUSELEAVE;
-  end;
-
-  TModalSelectDlg=TListDlg;
+    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
+    procedure OnMouseWheel(var m: TMessage); message WM_MOUSEWHEEL;
+    procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
+  end;
+
+  TModalSelectDlg = TListDlg;
 
 const
-cpType=$10000;
-mixAll=$10000;
-adAll=$10000;
+  cpType = $10000;
+  mixAll = $10000;
+  adAll = $10000;
 
 var
@@ -88 +87 @@
 
 uses
-CityScreen, Help, UnitStat, Tribes, Inp;
+  CityScreen, Help, UnitStat, Tribes, Inp;
 
 {$R *.DFM}
 
 const
-CityNameSpace=127;
-
-MustChooseKind=[kTribe,kStealTech,kGov];
-
-
-procedure TListDlg.FormCreate(Sender:TObject);
-begin
-inherited;
-Canvas.Font.Assign(UniFont[ftNormal]);
-CreatePVSB(sb,Handle,2,361,2+422);
-InitButtons();
-Kind:=kMission;
-Layer0Btn.Hint:=Phrases.Lookup('BTN_IMPRS');
-Layer1Btn.Hint:=Phrases.Lookup('BTN_WONDERS');
-Layer2Btn.Hint:=Phrases.Lookup('BTN_CLASSES');
-ScienceNationDot:=TBitmap.Create;
-ScienceNationDot.PixelFormat:=pf24bit;
-ScienceNationDot.Width:=17; ScienceNationDot.Height:=17;
+  CityNameSpace = 127;
+
+  MustChooseKind = [kTribe, kStealTech, kGov];
+
+procedure TListDlg.FormCreate(Sender: TObject);
+begin
+  inherited;
+  Canvas.Font.Assign(UniFont[ftNormal]);
+  CreatePVSB(sb, Handle, 2, 361, 2 + 422);
+  InitButtons();
+  Kind := kMission;
+  Layer0Btn.Hint := Phrases.Lookup('BTN_IMPRS');
+  Layer1Btn.Hint := Phrases.Lookup('BTN_WONDERS');
+  Layer2Btn.Hint := Phrases.Lookup('BTN_CLASSES');
+  ScienceNationDot := TBitmap.Create;
+  ScienceNationDot.PixelFormat := pf24bit;
+  ScienceNationDot.Width := 17;
+  ScienceNationDot.Height := 17;
 end;
 
 procedure TListDlg.FormDestroy(Sender: TObject);
 begin
-ScienceNationDot.Free;
-end;
-
-procedure TListDlg.CloseBtnClick(Sender:TObject);
-begin
-Closable:=true; Close
-end;
-
-procedure TListDlg.FormCloseQuery(Sender: TObject;
-  var CanClose: boolean);
-begin
-CanClose:=Closable or not(Kind in MustChooseKind)
-end;
-
-procedure TListDlg.OnScroll(var m:TMessage);
-begin
-if ProcessPVSB(sb,m) then
-  begin Sel:=-2; SmartUpdateContent(true) end
-end;
-
-procedure TListDlg.OnMouseWheel(var m:TMessage);
-begin
-if ProcessMouseWheel(sb,m) then
-  begin
-  Sel:=-2;
-  SmartUpdateContent(true);
-  PaintBox1MouseMove(nil, [], m.lParam and $FFFF-Left, m.lParam shr 16-Top);
+  ScienceNationDot.Free;
+end;
+
+procedure TListDlg.CloseBtnClick(Sender: TObject);
+begin
+  Closable := true;
+  Close
+end;
+
+procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+begin
+  CanClose := Closable or not(Kind in MustChooseKind)
+end;
+
+procedure TListDlg.OnScroll(var m: TMessage);
+begin
+  if ProcessPVSB(sb, m) then
+  begin
+    Sel := -2;
+    SmartUpdateContent(true)
   end
 end;
 
-procedure TListDlg.OnMouseLeave(var Msg:TMessage);
-begin
-if not Closable and (Sel<>-2) then
-  begin
-  line(Canvas,Sel,false,false);
-  Sel:=-2;
+procedure TListDlg.OnMouseWheel(var m: TMessage);
+begin
+  if ProcessMouseWheel(sb, m) then
+  begin
+    Sel := -2;
+    SmartUpdateContent(true);
+    PaintBox1MouseMove(nil, [], m.lParam and $FFFF - Left,
+      m.lParam shr 16 - Top);
   end
 end;
 
-procedure TListDlg.FormPaint(Sender:TObject);
+procedure TListDlg.OnMouseLeave(var Msg: TMessage);
+begin
+  if not Closable and (Sel <> -2) then
+  begin
+    line(Canvas, Sel, false, false);
+    Sel := -2;
+  end
+end;
+
+procedure TListDlg.FormPaint(Sender: TObject);
 var
-s: string;
-begin
-inherited;
-Canvas.Font.Assign(UniFont[ftNormal]);
-if Sel<>-2 then line(Canvas,Sel,false,true);
-s:='';
-if (Kind=kAdvance) and (MyData.FarTech<>adNone) then
-  s:=Format(Phrases.Lookup('TECHFOCUS'),
-    [Phrases.Lookup('ADVANCES',MyData.FarTech)])
-else if Kind=kModels then s:=Tribe[me].TPhrase('SHORTNAME')
-else if Kind=kEModels then
-  s:=Tribe[pView].TPhrase('SHORTNAME')
-    +' ('+TurnToString(MyRO.EnemyReport[pView].TurnOfMilReport)+')';
-if s<>'' then
-  LoweredTextOut(Canvas, -1, MainTexture,
-    (ClientWidth-BiColorTextWidth(Canvas,s)) div 2, 31, s);
-if not MultiPage and (Kind in [kProject,kAdvance,kFarAdvance])
-  and not Phrases2FallenBackToEnglish then
-  begin
-  s:=Phrases2.Lookup('SHIFTCLICK');
-  LoweredTextOut(Canvas, -2, MainTexture,
-    (ClientWidth-BiColorTextWidth(Canvas,s)) div 2, ClientHeight-29, s);
+  s: string;
+begin
+  inherited;
+  Canvas.Font.Assign(UniFont[ftNormal]);
+  if Sel <> -2 then
+    line(Canvas, Sel, false, true);
+  s := '';
+  if (Kind = kAdvance) and (MyData.FarTech <> adNone) then
+    s := Format(Phrases.Lookup('TECHFOCUS'),
+      [Phrases.Lookup('ADVANCES', MyData.FarTech)])
+  else if Kind = kModels then
+    s := Tribe[me].TPhrase('SHORTNAME')
+  else if Kind = kEModels then
+    s := Tribe[pView].TPhrase('SHORTNAME') + ' (' +
+      TurnToString(MyRO.EnemyReport[pView].TurnOfMilReport) + ')';
+  if s <> '' then
+    LoweredTextOut(Canvas, -1, MainTexture,
+      (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, 31, s);
+  if not MultiPage and (Kind in [kProject, kAdvance, kFarAdvance]) and not Phrases2FallenBackToEnglish
+  then
+  begin
+    s := Phrases2.Lookup('SHIFTCLICK');
+    LoweredTextOut(Canvas, -2, MainTexture,
+      (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, ClientHeight - 29, s);
   end
 end;
@@ -184 +189 @@
 // paint a line
 
-  procedure DisplayProject(x,y,pix: integer);
-  begin
-  if pix and (cpType or cpImp)=0 then
-    with Tribe[me].ModelPicture[pix and cpIndex] do
-      Sprite(offscreen,HGr,x,y,64,48,pix mod 10*65+1, pix div 10 *49+1)
-  else
+  procedure DisplayProject(x, y, pix: integer);
+  begin
+    if pix and (cpType or cpImp) = 0 then
+      with Tribe[me].ModelPicture[pix and cpIndex] do
+        Sprite(offscreen, HGr, x, y, 64, 48, pix mod 10 * 65 + 1,
+          pix div 10 * 49 + 1)
+    else
     begin
-    Frame(offscreen.Canvas,x+(16-1),y+(16-2),x+(16+xSizeSmall),
-      y+(16-1+ySizeSmall),MainTexture.clBevelLight,MainTexture.clBevelShade);
-    if pix and cpType=0 then
-      if (pix and cpIndex=imPalace) and (MyRO.Government<>gAnarchy) then
-        BitBlt(offscreen.Canvas.Handle,x+16,y+(16-1),xSizeSmall,ySizeSmall,
-          SmallImp.Canvas.Handle,(MyRO.Government-1)*xSizeSmall,
-          ySizeSmall,SRCCOPY)
-      else BitBlt(offscreen.Canvas.Handle,x+16,y+(16-1),xSizeSmall,ySizeSmall,
-        SmallImp.Canvas.Handle,pix and cpIndex mod 7*xSizeSmall,
-        (pix and cpIndex+SystemIconLines*7) div 7*ySizeSmall,SRCCOPY)
-    else BitBlt(offscreen.Canvas.Handle,x+16,y+(16-1),xSizeSmall,ySizeSmall,
-      SmallImp.Canvas.Handle,(3+pix and cpIndex)*xSizeSmall, 0,SRCCOPY)
+      Frame(offscreen.Canvas, x + (16 - 1), y + (16 - 2), x + (16 + xSizeSmall),
+        y + (16 - 1 + ySizeSmall), MainTexture.clBevelLight,
+        MainTexture.clBevelShade);
+      if pix and cpType = 0 then
+        if (pix and cpIndex = imPalace) and (MyRO.Government <> gAnarchy) then
+          BitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
+            ySizeSmall, SmallImp.Canvas.Handle, (MyRO.Government - 1) *
+            xSizeSmall, ySizeSmall, SRCCOPY)
+        else
+          BitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
+            ySizeSmall, SmallImp.Canvas.Handle, pix and cpIndex mod 7 *
+            xSizeSmall, (pix and cpIndex + SystemIconLines * 7) div 7 *
+            ySizeSmall, SRCCOPY)
+      else
+        BitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
+          ySizeSmall, SmallImp.Canvas.Handle, (3 + pix and cpIndex) *
+          xSizeSmall, 0, SRCCOPY)
     end;
   end;
 
-  procedure ReplaceText(x,y,Color: integer; s: string);
+  procedure ReplaceText(x, y, Color: integer; s: string);
   var
-  TextSize: TSize;
-  begin
-  if ca=Canvas then
+    TextSize: TSize;
+  begin
+    if ca = Canvas then
     begin
-    TextSize.cx:=BiColorTextWidth(ca,s);
-    TextSize.cy:=ca.TextHeight(s);
-    if y+TextSize.cy>=TitleHeight+InnerHeight then
-      TextSize.cy:=TitleHeight+InnerHeight-y;
-    Fill(ca,x,y,TextSize.cx,TextSize.cy,(wMaintexture-ClientWidth) div 2,
-      (hMaintexture-ClientHeight) div 2);
+      TextSize.cx := BiColorTextWidth(ca, s);
+      TextSize.cy := ca.TextHeight(s);
+      if y + TextSize.cy >= TitleHeight + InnerHeight then
+        TextSize.cy := TitleHeight + InnerHeight - y;
+      Fill(ca, x, y, TextSize.cx, TextSize.cy, (wMaintexture - ClientWidth)
+        div 2, (hMaintexture - ClientHeight) div 2);
     end;
-  LoweredTextOut(ca,Color,MainTexture,x,y,s);
+    LoweredTextOut(ca, Color, MainTexture, x, y, s);
   end;
 
 var
-icon,ofs,x,y,y0,lix,i,j,TextColor,Available,first,test,FutureCount,
-  growth,TrueFood,TrueProd:integer;
-CityReport: TCityReportNew;
-mox: ^TModelInfo;
-s,number: string;
-CanGrow: boolean;
-begin
-lix:=code[Layer,sb.si.npos+l];
-y0:=2+(l+1)*LineDistance;
-if sb.si.npos+l>=FirstShrinkedLine[Layer] then
-  ofs:=(sb.si.npos+l-FirstShrinkedLine[Layer]) and 1 *33
-else {if FirstShrinkedLine[Layer]<Lines[Layer] then} ofs:=33;
-
-if Kind in [kCities,kCityEvents] then with MyCity[lix] do
-  begin
-  x:=104-76; y:=y0;
-  if ca=Canvas then
-    begin x:=x+SideFrame; y:=y+TitleHeight end;
-  if lit then TextColor:=MainTexture.clLitText else TextColor:=-1;
-  s:=CityName(ID);
-  while BiColorTextWidth(ca,s)>CityNameSpace do
-    delete(s,length(s),1);
-  ReplaceText(x+15,y,TextColor,s);
-
-  if NonText then with offscreen.canvas do
-    begin // city size
-    brush.color:=$000000;
-    fillrect(rect(x-4-11,y+1,x-4+13,y+21));
-    brush.color:=$FFFFFF;
-    fillrect(rect(x-4-12,y,x-4+12,y+20));
-    brush.style:=bsClear;
-    font.color:=$000000;
-    s:=inttostr(MyCity[lix].Size);
-    TextOut(x-4-textwidth(s) div 2, y, s);
-    end;
-
-  if Kind=kCityEvents then
+  icon, ofs, x, y, y0, lix, i, j, TextColor, Available, first, test,
+    FutureCount, growth, TrueFood, TrueProd: integer;
+  CityReport: TCityReportNew;
+  mox: ^TModelInfo;
+  s, number: string;
+  CanGrow: boolean;
+begin
+  lix := code[Layer, sb.si.npos + l];
+  y0 := 2 + (l + 1) * LineDistance;
+  if sb.si.npos + l >= FirstShrinkedLine[Layer] then
+    ofs := (sb.si.npos + l - FirstShrinkedLine[Layer]) and 1 * 33
+  else { if FirstShrinkedLine[Layer]<Lines[Layer] then }
+    ofs := 33;
+
+  if Kind in [kCities, kCityEvents] then
+    with MyCity[lix] do
     begin
-    first:=-1;
-    for j:=0 to nCityEventPriority-1 do
-      if (Flags and CityRepMask and CityEventPriority[j]<>0) then
-        begin first:=j; Break end;
-    if first>=0 then
-      begin
-      i:=0;
-      test:=1;
-      while test<CityEventPriority[first] do
-        begin inc(i); inc(test,test) end;
-      s:=CityEventName(i);
-{      if CityEventPriority[first]=chNoGrowthWarning then
-        if Built[imAqueduct]=0 then
-          s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-        else begin s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); i:=17 end;}
-      ReplaceText(x+(CityNameSpace+4+40+18+8),y,TextColor,s);
+      x := 104 - 76;
+      y := y0;
+      if ca = Canvas then
+      begin
+        x := x + SideFrame;
+        y := y + TitleHeight
+      end;
+      if lit then
+        TextColor := MainTexture.clLitText
+      else
+        TextColor := -1;
+      s := CityName(ID);
+      while BiColorTextWidth(ca, s) > CityNameSpace do
+        delete(s, length(s), 1);
+      ReplaceText(x + 15, y, TextColor, s);
+
       if NonText then
-        begin
-        Sprite(offscreen,HGrSystem,105-76+CityNameSpace+4+40,y0+1,18,18,
-          1+i mod 3 *19,1+i div 3 *19);
-        x:=InnerWidth-26;
-        for j:=nCityEventPriority-1 downto first+1 do
-          if (Flags and CityRepMask and CityEventPriority[j]<>0) then
-            begin
-            i:=0;
-            test:=1;
-            while test<CityEventPriority[j] do
-              begin inc(i); inc(test,test) end;
-            if (CityEventPriority[j]=chNoGrowthWarning)
-              and (Built[imAqueduct]>0) then
-              i:=17;
-            Sprite(offscreen,HGrSystem,x,y0+1,18,18,1+i mod 3 *19,
-              1+i div 3 *19);
-            dec(x,20)
-            end
+        with offscreen.Canvas do
+        begin // city size
+          brush.Color := $000000;
+          fillrect(rect(x - 4 - 11, y + 1, x - 4 + 13, y + 21));
+          brush.Color := $FFFFFF;
+          fillrect(rect(x - 4 - 12, y, x - 4 + 12, y + 20));
+          brush.style := bsClear;
+          Font.Color := $000000;
+          s := inttostr(MyCity[lix].Size);
+          TextOut(x - 4 - textwidth(s) div 2, y, s);
+        end;
+
+      if Kind = kCityEvents then
+      begin
+        first := -1;
+        for j := 0 to nCityEventPriority - 1 do
+          if (Flags and CityRepMask and CityEventPriority[j] <> 0) then
+          begin
+            first := j;
+            Break
+          end;
+        if first >= 0 then
+        begin
+          i := 0;
+          test := 1;
+          while test < CityEventPriority[first] do
+          begin
+            inc(i);
+            inc(test, test)
+          end;
+          s := CityEventName(i);
+          { if CityEventPriority[first]=chNoGrowthWarning then
+            if Built[imAqueduct]=0 then
+            s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
+            else begin s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); i:=17 end; }
+          ReplaceText(x + (CityNameSpace + 4 + 40 + 18 + 8), y, TextColor, s);
+          if NonText then
+          begin
+            Sprite(offscreen, HGrSystem, 105 - 76 + CityNameSpace + 4 + 40,
+              y0 + 1, 18, 18, 1 + i mod 3 * 19, 1 + i div 3 * 19);
+            x := InnerWidth - 26;
+            for j := nCityEventPriority - 1 downto first + 1 do
+              if (Flags and CityRepMask and CityEventPriority[j] <> 0) then
+              begin
+                i := 0;
+                test := 1;
+                while test < CityEventPriority[j] do
+                begin
+                  inc(i);
+                  inc(test, test)
+                end;
+                if (CityEventPriority[j] = chNoGrowthWarning) and
+                  (Built[imAqueduct] > 0) then
+                  i := 17;
+                Sprite(offscreen, HGrSystem, x, y0 + 1, 18, 18,
+                  1 + i mod 3 * 19, 1 + i div 3 * 19);
+                dec(x, 20)
+              end
+          end
         end
       end
+      else
+      begin
+        CityReport.HypoTiles := -1;
+        CityReport.HypoTaxRate := -1;
+        CityReport.HypoLuxuryRate := -1;
+        Server(sGetCityReportNew, me, lix, CityReport);
+        TrueFood := Food;
+        TrueProd := Prod;
+        if supervising then
+        begin // normalize city from after-turn state
+          dec(TrueFood, CityReport.FoodSurplus);
+          if TrueFood < 0 then
+            TrueFood := 0; // shouldn't happen
+          dec(TrueProd, CityReport.Production);
+          if TrueProd < 0 then
+            TrueProd := 0; // shouldn't happen
+        end;
+
+        s := ''; // disorder info
+        if Flags and chCaptured <> 0 then
+          s := Phrases.Lookup('CITYEVENTS', 14)
+        else if CityReport.HappinessBalance < 0 then
+          s := Phrases.Lookup('CITYEVENTS', 0);
+        if s <> '' then
+        begin { disorder }
+          if NonText then
+          begin
+            DarkGradient(offscreen.Canvas, 99 + 31 + CityNameSpace + 4,
+              y0 + 2, 131, 3);
+            ca.Font.Assign(UniFont[ftSmall]);
+            RisedTextout(offscreen.Canvas, 103 + CityNameSpace + 4 + 31,
+              y0 + 1, s);
+            ca.Font.Assign(UniFont[ftNormal]);
+          end
+        end
+        else
+        begin
+          { s:=IntToStr(CityReport.FoodSurplus);
+            ReplaceText(x+(CityNameSpace+4+48)-BiColorTextWidth(ca,s),y,TextColor,s); }
+          s := inttostr(CityReport.Science);
+          ReplaceText(x + CityNameSpace + 4 + 370 + 48 - BiColorTextWidth(ca,
+            s), y, TextColor, s);
+          s := inttostr(CityReport.Production);
+          ReplaceText(x + CityNameSpace + 4 + 132 - BiColorTextWidth(ca, s), y,
+            TextColor, s);
+          if NonText then
+          begin
+            // Sprite(offscreen,HGrSystem,x+CityNameSpace+4+333+1,y+6,10,10,66,115);
+            Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 370 + 48 + 1,
+              y + 6, 10, 10, 77, 126);
+            Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 132 + 1, y + 6,
+              10, 10, 88, 115);
+          end
+        end;
+        s := inttostr(CityTaxBalance(lix, CityReport));
+        ReplaceText(x + CityNameSpace + 4 + 370 - BiColorTextWidth(ca, s), y,
+          TextColor, s);
+        // if Project and (cpImp+cpIndex)<>cpImp+imTrGoods then
+        // ReplaceText(x+CityNameSpace+4+333+1,y,TextColor,Format('%d/%d',[TrueProd,CityReport.ProjectCost]));
+        if NonText then
+        begin
+          Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 370 + 1, y + 6,
+            10, 10, 132, 115);
+
+          // food progress
+          CanGrow := (Size < MaxCitySize) and (MyRO.Government <> gFuture) and
+            (CityReport.FoodSurplus > 0) and
+            ((Size < NeedAqueductSize) or (Built[imAqueduct] = 1) and
+            (Size < NeedSewerSize) or (Built[imSewer] = 1));
+          PaintRelativeProgressBar(offscreen.Canvas, 1, x + 15 + CityNameSpace +
+            4, y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
+            (MyRO.Government <> gAnarchy) and (Flags and chCaptured = 0),
+            MyRO.Government, Size), CityReport.Storage, CanGrow, MainTexture);
+
+          if Project <> cpImp + imTrGoods then
+          begin
+            DisplayProject(ofs + 104 - 76 + x - 28 + CityNameSpace + 4 + 206 -
+              60, y0 - 15, Project);
+
+            // production progress
+            growth := CityReport.Production;
+            if (growth < 0) or (MyRO.Government = gAnarchy) or
+              (Flags and chCaptured <> 0) then
+              growth := 0;
+            PaintRelativeProgressBar(offscreen.Canvas, 4,
+              x + CityNameSpace + 4 + 304 - 60 + 9, y + 7, 68, TrueProd, growth,
+              CityReport.ProjectCost, true, MainTexture);
+          end;
+        end
+      end;
     end
+  else if Kind in [kModels, kEModels] then
+  begin
+    x := 104;
+    y := y0;
+    if ca = Canvas then
+    begin
+      x := x + SideFrame;
+      y := y + TitleHeight
+    end;
+    if lit then
+      TextColor := MainTexture.clLitText
+    else
+      TextColor := -1;
+    if Kind = kModels then
+    begin
+      Available := 0;
+      for j := 0 to MyRO.nUn - 1 do
+        if (MyUn[j].Loc >= 0) and (MyUn[j].mix = lix) then
+          inc(Available);
+      if MainScreen.mNames.Checked then
+        s := Tribe[me].ModelName[lix]
+      else
+        s := Format(Tribe[me].TPhrase('GENMODEL'), [lix]);
+      if NonText then
+        DisplayProject(8 + ofs, y0 - 15, lix);
+    end
+    else
+    begin
+      Available := MyRO.EnemyReport[pView].UnCount[lix];
+      if MainScreen.mNames.Checked then
+        s := Tribe[pView].ModelName[lix]
+      else
+        s := Format(Tribe[pView].TPhrase('GENMODEL'), [lix]);
+      if NonText then
+        with Tribe[pView].ModelPicture[lix] do
+          Sprite(offscreen, HGr, 8 + ofs, y0 - 15, 64, 48, pix mod 10 * 65 + 1,
+            pix div 10 * 49 + 1);
+    end;
+    if Available > 0 then
+      ReplaceText(x + 32 - BiColorTextWidth(ca, inttostr(Available)), y,
+        TextColor, inttostr(Available));
+    ReplaceText(x + 40, y, TextColor, s);
+  end
   else
-    begin
-    CityReport.HypoTiles:=-1;
-    CityReport.HypoTaxRate:=-1;
-    CityReport.HypoLuxuryRate:=-1;
-    Server(sGetCityReportNew,me,lix,CityReport);
-    TrueFood:=Food;
-    TrueProd:=Prod;
-    if supervising then
-      begin // normalize city from after-turn state
-      dec(TrueFood,CityReport.FoodSurplus);
-      if TrueFood<0 then
-        TrueFood:=0; // shouldn't happen
-      dec(TrueProd,CityReport.Production);
-      if TrueProd<0 then
-        TrueProd:=0; // shouldn't happen
-      end;
-
-    s:=''; // disorder info
-    if Flags and chCaptured<>0 then
-      s:=Phrases.Lookup('CITYEVENTS',14)
-    else if CityReport.HappinessBalance<0 then
-      s:=Phrases.Lookup('CITYEVENTS',0);
-    if s<>'' then
-      begin {disorder}
-      if NonText then
-        begin
-        DarkGradient(offscreen.Canvas,99+31+CityNameSpace+4,y0+2,131,3);
-        ca.Font.Assign(UniFont[ftSmall]);
-        RisedTextout(offscreen.canvas,103+CityNameSpace+4+31,y0+1,s);
-        ca.Font.Assign(UniFont[ftNormal]);
-        end
-      end
-    else
-      begin
-{      s:=IntToStr(CityReport.FoodSurplus);
-      ReplaceText(x+(CityNameSpace+4+48)-BiColorTextWidth(ca,s),y,TextColor,s);}
-      s:=IntToStr(CityReport.Science);
-      ReplaceText(x+CityNameSpace+4+370+48-BiColorTextWidth(ca,s),y,TextColor,s);
-      s:=IntToStr(CityReport.Production);
-      ReplaceText(x+CityNameSpace+4+132-BiColorTextWidth(ca,s),y,TextColor,s);
-      if NonText then
-        begin
-        //Sprite(offscreen,HGrSystem,x+CityNameSpace+4+333+1,y+6,10,10,66,115);
-        Sprite(offscreen,HGrSystem,x+CityNameSpace+4+370+48+1,y+6,10,10,77,126);
-        Sprite(offscreen,HGrSystem,x+CityNameSpace+4+132+1,y+6,10,10,88,115);
-        end
-      end;
-    s:=IntToStr(CityTaxBalance(lix, CityReport));
-    ReplaceText(x+CityNameSpace+4+370-BiColorTextWidth(ca,s),y,TextColor,s);
-    //if Project and (cpImp+cpIndex)<>cpImp+imTrGoods then
-    //  ReplaceText(x+CityNameSpace+4+333+1,y,TextColor,Format('%d/%d',[TrueProd,CityReport.ProjectCost]));
-    if NonText then
-      begin
-      Sprite(offscreen,HGrSystem,x+CityNameSpace+4+370+1,y+6,10,10,132,115);
-
-      // food progress
-      CanGrow:=(Size<MaxCitySize) and (MyRO.Government<>gFuture)
-        and (CityReport.FoodSurplus>0)
-        and ((Size<NeedAqueductSize)
-          or (Built[imAqueduct]=1) and (Size<NeedSewerSize)
-          or (Built[imSewer]=1));
-      PaintRelativeProgressBar(offscreen.canvas,1,x+15+CityNameSpace+4,y+7,68,TrueFood,
-        CutCityFoodSurplus(CityReport.FoodSurplus,
-        (MyRO.Government<>gAnarchy) and (Flags and chCaptured=0),
-        MyRO.Government,Size),CityReport.Storage,CanGrow,MainTexture);
-
-      if Project<>cpImp+imTrGoods then
-        begin
-        DisplayProject(ofs+104-76+x-28+CityNameSpace+4+206-60,y0-15,Project);
-
-        // production progress
-        growth:=CityReport.Production;
-        if (growth<0) or (MyRO.Government=gAnarchy)
-          or (Flags and chCaptured<>0) then
-          growth:=0;
-        PaintRelativeProgressBar(offscreen.canvas,4,x+CityNameSpace+4+304-60+9,y+7,68,
-          TrueProd,growth,CityReport.ProjectCost,true,MainTexture);
-        end;
-      end
-    end;
-  end
-else if Kind in [kModels,kEModels] then
-  begin
-  x:=104; y:=y0;
-  if ca=Canvas then
-    begin x:=x+SideFrame; y:=y+TitleHeight end;
-  if lit then TextColor:=MainTexture.clLitText else TextColor:=-1;
-  if Kind=kModels then
-    begin
-    Available:=0;
-    for j:=0 to MyRO.nUn-1 do
-      if (MyUn[j].Loc>=0) and (MyUn[j].mix=lix) then inc(Available);
-    if MainScreen.mNames.Checked then
-      s:=Tribe[me].ModelName[lix]
-    else s:=Format(Tribe[me].TPhrase('GENMODEL'),[lix]);
-    if NonText then DisplayProject(8+ofs,y0-15,lix);
-    end
-  else
-    begin
-    Available:=MyRO.EnemyReport[pView].UnCount[lix];
-    if MainScreen.mNames.Checked then
-      s:=Tribe[pView].ModelName[lix]
-    else s:=Format(Tribe[pView].TPhrase('GENMODEL'),[lix]);
-    if NonText then
-      with Tribe[pView].ModelPicture[lix] do
-        Sprite(offscreen,HGr,8+ofs,y0-15,64,48,pix mod 10*65+1, pix div 10 *49+1);
-    end;
-  if Available>0 then
-    ReplaceText(x+32-BiColorTextWidth(ca,IntToStr(Available)),y,TextColor,
-      IntToStr(Available));
-  ReplaceText(x+40,y,TextColor,s);
-  end
-else
-  begin
-  case Kind of
-    kAllEModels, kChooseEModel:
-      if lix=mixAll then s:=Phrases.Lookup('PRICECAT_ALLMODEL')
-      else
-        begin
-        mox:=@MyRO.EnemyModel[lix];
-        if MainScreen.mNames.Checked then
-          begin
-          s:=Tribe[mox.Owner].ModelName[mox.mix];
-          if (Kind=kAllEModels) and (code[1,sb.si.npos+l]=0) then
-            s:=Format(Tribe[mox.Owner].TPhrase('OWNED'), [s]);
+  begin
+    case Kind of
+      kAllEModels, kChooseEModel:
+        if lix = mixAll then
+          s := Phrases.Lookup('PRICECAT_ALLMODEL')
+        else
+        begin
+          mox := @MyRO.EnemyModel[lix];
+          if MainScreen.mNames.Checked then
+          begin
+            s := Tribe[mox.Owner].ModelName[mox.mix];
+            if (Kind = kAllEModels) and (code[1, sb.si.npos + l] = 0) then
+              s := Format(Tribe[mox.Owner].TPhrase('OWNED'), [s]);
           end
-        else s:=Format(Tribe[mox.Owner].TPhrase('GENMODEL'),[mox.mix]);
-        if NonText then
-          with Tribe[mox.Owner].ModelPicture[mox.mix] do
-            Sprite(offscreen,HGr,8+ofs,y0-15,64,48,pix mod 10*65+1, pix div 10 *49+1);
-        end;
-    kChooseModel:
-      if lix=mixAll then s:=Phrases.Lookup('PRICECAT_ALLMODEL')
-      else
-        begin
-        s:=Tribe[me].ModelName[lix];
-        if NonText then DisplayProject(8+ofs,y0-15,lix);
-        end;
-    kProject:
-      begin
-      if lix and cpType<>0 then s:=Phrases.Lookup('CITYTYPE',lix and cpIndex)
-      else if lix and cpImp=0 then with MyModel[lix and cpIndex] do
-        begin
-        s:=Tribe[me].ModelName[lix and cpIndex];
-        if lix and cpConscripts<>0 then
-          s:=Format(Phrases.Lookup('CONSCRIPTS'),[s]);
-        end
-      else
-        begin
-        s:=Phrases.Lookup('IMPROVEMENTS',lix and cpIndex);
-        if (Imp[lix and cpIndex].Kind in [ikNatLocal,ikNatGlobal])
-            and (MyRO.NatBuilt[lix and cpIndex]>0)
-          or (lix and cpIndex in [imPower,imHydro,imNuclear])
-            and (MyCity[cixProject].Built[imPower]
-              +MyCity[cixProject].Built[imHydro]
-              +MyCity[cixProject].Built[imNuclear]>0) then
-          s:=Format(Phrases.Lookup('NATEXISTS'),[s]);
-        end;
-      if NonText then DisplayProject(8+ofs,y0-15,lix);
-      end;
-    kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
-      begin
-      if lix=adAll then s:=Phrases.Lookup('PRICECAT_ALLTECH')
-      else
-        begin
-        if lix=adNexus then s:=Phrases.Lookup('NEXUS')
-        else if lix=adNone then s:=Phrases.Lookup('NOFARTECH')
-        else if lix=adMilitary then s:=Phrases.Lookup('INITUNIT')
+          else
+            s := Format(Tribe[mox.Owner].TPhrase('GENMODEL'), [mox.mix]);
+          if NonText then
+            with Tribe[mox.Owner].ModelPicture[mox.mix] do
+              Sprite(offscreen, HGr, 8 + ofs, y0 - 15, 64, 48,
+                pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
+        end;
+      kChooseModel:
+        if lix = mixAll then
+          s := Phrases.Lookup('PRICECAT_ALLMODEL')
         else
-          begin
-          s:=Phrases.Lookup('ADVANCES',lix);
-          if (Kind=kAdvance) and (lix in FutureTech) then
-            if MyRO.Tech[lix]<tsApplicable then s:=s+' 1'
-            else s:=s+' '+IntToStr(MyRO.Tech[lix]+1);
-          end;
-        if BiColorTextWidth(ca,s)>TechNameSpace+8 then
-          begin
-          repeat
-            delete(s,length(s),1);
-          until BiColorTextWidth(ca,s)<=TechNameSpace+5;
-          s:=s+'.';
-          end;
-
-        if NonText then
-          begin // show tech icon
-          if lix=adNexus then
+        begin
+          s := Tribe[me].ModelName[lix];
+          if NonText then
+            DisplayProject(8 + ofs, y0 - 15, lix);
+        end;
+      kProject:
+        begin
+          if lix and cpType <> 0 then
+            s := Phrases.Lookup('CITYTYPE', lix and cpIndex)
+          else if lix and cpImp = 0 then
+            with MyModel[lix and cpIndex] do
             begin
-            Frame(offscreen.Canvas,(8+16-1),y0-1,(8+16+36),
-              y0+20,MainTexture.clBevelLight,MainTexture.clBevelShade);
-            Dump(offscreen,HGrSystem,(8+16),y0,36,20,223,295)
-            end
-          else if lix=adNone then
-            begin
-            Frame(offscreen.Canvas,(8+16-1),y0-1,(8+16+36),
-              y0+20,MainTexture.clBevelLight,MainTexture.clBevelShade);
-            Dump(offscreen,HGrSystem,(8+16),y0,36,20,260,295)
-            end
-          else if lix=adMilitary then
-            begin
-            Frame(offscreen.Canvas,(8+16-1),y0-1,(8+16+36),
-              y0+20,MainTexture.clBevelLight,MainTexture.clBevelShade);
-            Dump(offscreen,HGrSystem,(8+16),y0,36,20,38,295)
+              s := Tribe[me].ModelName[lix and cpIndex];
+              if lix and cpConscripts <> 0 then
+                s := Format(Phrases.Lookup('CONSCRIPTS'), [s]);
             end
           else
+          begin
+            s := Phrases.Lookup('IMPROVEMENTS', lix and cpIndex);
+            if (Imp[lix and cpIndex].Kind in [ikNatLocal, ikNatGlobal]) and
+              (MyRO.NatBuilt[lix and cpIndex] > 0) or
+              (lix and cpIndex in [imPower, imHydro, imNuclear]) and
+              (MyCity[cixProject].Built[imPower] + MyCity[cixProject].Built
+              [imHydro] + MyCity[cixProject].Built[imNuclear] > 0) then
+              s := Format(Phrases.Lookup('NATEXISTS'), [s]);
+          end;
+          if NonText then
+            DisplayProject(8 + ofs, y0 - 15, lix);
+        end;
+      kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
+        begin
+          if lix = adAll then
+            s := Phrases.Lookup('PRICECAT_ALLTECH')
+          else
+          begin
+            if lix = adNexus then
+              s := Phrases.Lookup('NEXUS')
+            else if lix = adNone then
+              s := Phrases.Lookup('NOFARTECH')
+            else if lix = adMilitary then
+              s := Phrases.Lookup('INITUNIT')
+            else
             begin
-            Frame(offscreen.Canvas,(8+16-1),y0-1,(8+16+xSizeSmall),
-              y0+ySizeSmall,MainTexture.clBevelLight,MainTexture.clBevelShade);
-            if AdvIcon[lix]<84 then
-              BitBlt(offscreen.Canvas.Handle,(8+16),y0,xSizeSmall,ySizeSmall,
-                SmallImp.Canvas.Handle,(AdvIcon[lix]+SystemIconLines*7) mod 7*xSizeSmall,
-                (AdvIcon[lix]+SystemIconLines*7) div 7*ySizeSmall,SRCCOPY)
-            else Dump(offscreen,HGrSystem,(8+16),y0,36,20,
-              1+(AdvIcon[lix]-84) mod 8*37,295+(AdvIcon[lix]-84) div 8*21);
-            j:=AdvValue[lix] div 1000;
-            BitBlt(Handle,(8+16-4),y0+2,14,14,
-              GrExt[HGrSystem].Mask.Canvas.Handle,127+j*15,85,SRCAND);
-            Sprite(offscreen,HGrSystem,(8+16-5),y0+1,14,14,
-              127+j*15,85);
+              s := Phrases.Lookup('ADVANCES', lix);
+              if (Kind = kAdvance) and (lix in FutureTech) then
+                if MyRO.Tech[lix] < tsApplicable then
+                  s := s + ' 1'
+                else
+                  s := s + ' ' + inttostr(MyRO.Tech[lix] + 1);
             end;
-          end;
-        end;
-
-      if NonText and (Kind in [kAdvance, kScience]) then
-        begin // show research state
-        for j:=0 to nColumn-1 do
-          begin
-          FutureCount:=0;
-          if j=0 then // own science
-            if lix=MyRO.ResearchTech then
+            if BiColorTextWidth(ca, s) > TechNameSpace + 8 then
+            begin
+              repeat
+                delete(s, length(s), 1);
+              until BiColorTextWidth(ca, s) <= TechNameSpace + 5;
+              s := s + '.';
+            end;
+
+            if NonText then
+            begin // show tech icon
+              if lix = adNexus then
               begin
-              Server(sGetTechCost,me,0,icon);
-              icon:=4+MyRO.Research*4 div icon;
-              if icon>4+3 then icon:=4+3
+                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 223, 295)
               end
-            else if (lix>=adMilitary) then
-              icon:=-1
-            else if lix in FutureTech then
+              else if lix = adNone then
               begin
-              icon:=-1;
-              FutureCount:=MyRO.Tech[lix];
+                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 260, 295)
               end
-            else if MyRO.Tech[lix]=tsSeen then icon:=1
-            else if MyRO.Tech[lix]>=tsApplicable then icon:=2
-            else icon:=-1
-          else with MyRO.EnemyReport[Column[j]]^ do // enemy science
-            if (MyRO.Alive and (1 shl Column[j])<>0)
-              and (TurnOfCivilReport>=0) and (lix=ResearchTech)
-              and ((lix=adMilitary) or (lix in FutureTech)
-                or (Tech[lix]<tsApplicable)) then
+              else if lix = adMilitary then
               begin
-              icon:=4+ResearchDone div 25;
-              if icon>4+3 then icon:=4+3
+                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                  y0 + 20, MainTexture.clBevelLight, MainTexture.clBevelShade);
+                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 38, 295)
               end
-            else if lix=adMilitary then
-              icon:=-1
-            else if lix in FutureTech then
+              else
               begin
-              icon:=-1;
-              FutureCount:=Tech[lix]
+                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1,
+                  (8 + 16 + xSizeSmall), y0 + ySizeSmall,
+                  MainTexture.clBevelLight, MainTexture.clBevelShade);
+                if AdvIcon[lix] < 84 then
+                  BitBlt(offscreen.Canvas.Handle, (8 + 16), y0, xSizeSmall,
+                    ySizeSmall, SmallImp.Canvas.Handle,
+                    (AdvIcon[lix] + SystemIconLines * 7) mod 7 * xSizeSmall,
+                    (AdvIcon[lix] + SystemIconLines * 7) div 7 *
+                    ySizeSmall, SRCCOPY)
+                else
+                  Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20,
+                    1 + (AdvIcon[lix] - 84) mod 8 * 37,
+                    295 + (AdvIcon[lix] - 84) div 8 * 21);
+                j := AdvValue[lix] div 1000;
+                BitBlt(Handle, (8 + 16 - 4), y0 + 2, 14, 14,
+                  GrExt[HGrSystem].Mask.Canvas.Handle, 127 + j * 15,
+                  85, SRCAND);
+                Sprite(offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
+                  127 + j * 15, 85);
+              end;
+            end;
+          end;
+
+          if NonText and (Kind in [kAdvance, kScience]) then
+          begin // show research state
+            for j := 0 to nColumn - 1 do
+            begin
+              FutureCount := 0;
+              if j = 0 then // own science
+                if lix = MyRO.ResearchTech then
+                begin
+                  Server(sGetTechCost, me, 0, icon);
+                  icon := 4 + MyRO.Research * 4 div icon;
+                  if icon > 4 + 3 then
+                    icon := 4 + 3
+                end
+                else if (lix >= adMilitary) then
+                  icon := -1
+                else if lix in FutureTech then
+                begin
+                  icon := -1;
+                  FutureCount := MyRO.Tech[lix];
+                end
+                else if MyRO.Tech[lix] = tsSeen then
+                  icon := 1
+                else if MyRO.Tech[lix] >= tsApplicable then
+                  icon := 2
+                else
+                  icon := -1
+              else
+                with MyRO.EnemyReport[Column[j]]^ do // enemy science
+                  if (MyRO.Alive and (1 shl Column[j]) <> 0) and
+                    (TurnOfCivilReport >= 0) and (lix = ResearchTech) and
+                    ((lix = adMilitary) or (lix in FutureTech) or
+                    (Tech[lix] < tsApplicable)) then
+                  begin
+                    icon := 4 + ResearchDone div 25;
+                    if icon > 4 + 3 then
+                      icon := 4 + 3
+                  end
+                  else if lix = adMilitary then
+                    icon := -1
+                  else if lix in FutureTech then
+                  begin
+                    icon := -1;
+                    FutureCount := Tech[lix]
+                  end
+                  else if Tech[lix] >= tsApplicable then
+                    icon := 2
+                  else if Tech[lix] = tsSeen then
+                    icon := 1
+                  else
+                    icon := -1;
+              if icon >= 0 then
+                Sprite(offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
+                  24 * j, y0 + 3, 14, 14, 67 + icon * 15, 85)
+              else if (Kind = kScience) and (FutureCount > 0) then
+              begin
+                number := inttostr(FutureCount);
+                RisedTextout(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * j -
+                  BiColorTextWidth(ca, number) div 2, y0, number);
               end
-            else if Tech[lix]>=tsApplicable then
-              icon:=2
-            else if Tech[lix]=tsSeen then
-              icon:=1
-            else icon:=-1;
-          if icon>=0 then
-            Sprite(offscreen,HGrSystem,104-33+15+3+TechNameSpace+24*j,y0+3,
-              14,14,67+icon*15,85)
-          else if (Kind=kScience) and (FutureCount>0) then
-            begin
-            number:=inttostr(FutureCount);
-            RisedTextOut(ca,104-33+15+10+TechNameSpace+24*j
-              -BiColorTextWidth(ca,number) div 2,y0,number);
             end
+          end;
+        end; // kAdvance, kScience
+      kTribe:
+        s := TribeNames[lix];
+      kShipPart:
+        begin
+          s := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
+            inttostr(MyRO.Ship[me].Parts[lix]) + ')';
+          if NonText then
+            DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
+        end;
+      kEShipPart:
+        begin
+          s := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
+            inttostr(MyRO.Ship[DipMem[me].pContact].Parts[lix]) + ')';
+          if NonText then
+            DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
+        end;
+      kGov:
+        begin
+          s := Phrases.Lookup('GOVERNMENT', lix);
+          if NonText then
+          begin
+            Frame(offscreen.Canvas, 8 + 16 - 1, y0 - 15 + (16 - 2),
+              8 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
+              MainTexture.clBevelLight, MainTexture.clBevelShade);
+            BitBlt(offscreen.Canvas.Handle, 8 + 16, y0 - 15 + (16 - 1),
+              xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+              (lix - 1) * xSizeSmall, ySizeSmall, SRCCOPY);
           end
         end;
-      end; // kAdvance, kScience
-    kTribe:
-      s:=TribeNames[lix];
-    kShipPart:
-      begin
-      s:=Phrases.Lookup('IMPROVEMENTS',imShipComp+lix)
-        +' ('+inttostr(MyRO.Ship[me].Parts[lix])+')';
-      if NonText then DisplayProject(8+ofs,y0-15,cpImp+imShipComp+lix);
-      end;
-    kEShipPart:
-      begin
-      s:=Phrases.Lookup('IMPROVEMENTS',imShipComp+lix)
-        +' ('+inttostr(MyRO.Ship[DipMem[me].pContact].Parts[lix])+')';
-      if NonText then DisplayProject(8+ofs,y0-15,cpImp+imShipComp+lix);
-      end;
-    kGov:
-      begin
-      s:=Phrases.Lookup('GOVERNMENT',lix);
-      if NonText then
-        begin
-        Frame(offscreen.Canvas,8+16-1,y0-15+(16-2),8+16+xSizeSmall,
-          y0-15+(16-1+ySizeSmall),MainTexture.clBevelLight,MainTexture.clBevelShade);
-        BitBlt(offscreen.Canvas.Handle,8+16,y0-15+(16-1),xSizeSmall,ySizeSmall,
-          SmallImp.Canvas.Handle,(lix-1)*xSizeSmall,ySizeSmall,SRCCOPY);
-        end
-      end;
-    kMission:
-      s:=Phrases.Lookup('SPYMISSION',lix);
+      kMission:
+        s := Phrases.Lookup('SPYMISSION', lix);
     end;
-  case Kind of
-    kTribe,kMission: // center text
-      if Lines[0]>MaxLines then
-        x:=(InnerWidth-GetSystemMetrics(SM_CXVSCROLL)) div 2-BiColorTextWidth(ca,s) div 2
-      else x:=InnerWidth div 2-BiColorTextWidth(ca,s) div 2;
-    kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech, kGov:
-      x:=104-33;
-    kAllEModels: x:=104;
-    else x:=104+15;
+    case Kind of
+      kTribe, kMission: // center text
+        if Lines[0] > MaxLines then
+          x := (InnerWidth - GetSystemMetrics(SM_CXVSCROLL)) div 2 -
+            BiColorTextWidth(ca, s) div 2
+        else
+          x := InnerWidth div 2 - BiColorTextWidth(ca, s) div 2;
+      kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech,
+        kStealTech, kGov:
+        x := 104 - 33;
+      kAllEModels:
+        x := 104;
+    else
+      x := 104 + 15;
     end;
-  y:=y0;
-  if ca=Canvas then
-    begin x:=x+SideFrame; y:=y+TitleHeight end;
-  if lit then TextColor:=MainTexture.clLitText
-  else TextColor:=-1;
-{  if Kind=kTribe then ReplaceText_Tribe(x,y,TextColor,
-    integer(TribeNames.Objects[lix]),s)
-  else} ReplaceText(x,y,TextColor,s);
+    y := y0;
+    if ca = Canvas then
+    begin
+      x := x + SideFrame;
+      y := y + TitleHeight
+    end;
+    if lit then
+      TextColor := MainTexture.clLitText
+    else
+      TextColor := -1;
+    { if Kind=kTribe then ReplaceText_Tribe(x,y,TextColor,
+      integer(TribeNames.Objects[lix]),s)
+      else } ReplaceText(x, y, TextColor, s);
   end
 end;
@@ -628 +719 @@
 procedure TListDlg.OffscreenPaint;
 var
-i,j: integer;
-begin
-case Kind of
-  kCities: Caption:=Tribe[me].TPhrase('TITLE_CITIES');
-  kCityEvents: Caption:=Format(Phrases.Lookup('TITLE_EVENTS'),[TurnToString(MyRO.Turn)]);
-  end;
-
-inherited;
-offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-FillOffscreen(0,0,InnerWidth,InnerHeight);
-with offscreen.Canvas do
-  begin
-  if Kind=kScience then
-    for i:=1 to nColumn-1 do
-      begin
-      Pen.Color:=$000000;
-      MoveTo(104-33+15+TechNameSpace+24*i,0);
-      LineTo(104-33+15+TechNameSpace+24*i,InnerHeight);
-      MoveTo(104-33+15+TechNameSpace+9*2+24*i,0);
-      LineTo(104-33+15+TechNameSpace+9*2+24*i,InnerHeight);
-      if MyRO.EnemyReport[Column[i]].TurnOfCivilReport>=MyRO.Turn-1 then
-        begin
-        brush.color:=Tribe[Column[i]].Color;
-        FillRect(Rect(104-33+14+TechNameSpace+24*i+1*2,0,
-          104-33+17+TechNameSpace+24*i+8*2,InnerHeight));
-        brush.style:=bsClear;
+  i, j: integer;
+begin
+  case Kind of
+    kCities:
+      Caption := Tribe[me].TPhrase('TITLE_CITIES');
+    kCityEvents:
+      Caption := Format(Phrases.Lookup('TITLE_EVENTS'),
+        [TurnToString(MyRO.Turn)]);
+  end;
+
+  inherited;
+  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  FillOffscreen(0, 0, InnerWidth, InnerHeight);
+  with offscreen.Canvas do
+  begin
+    if Kind = kScience then
+      for i := 1 to nColumn - 1 do
+      begin
+        Pen.Color := $000000;
+        MoveTo(104 - 33 + 15 + TechNameSpace + 24 * i, 0);
+        LineTo(104 - 33 + 15 + TechNameSpace + 24 * i, InnerHeight);
+        MoveTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * i, 0);
+        LineTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * i, InnerHeight);
+        if MyRO.EnemyReport[Column[i]].TurnOfCivilReport >= MyRO.Turn - 1 then
+        begin
+          brush.Color := Tribe[Column[i]].Color;
+          fillrect(rect(104 - 33 + 14 + TechNameSpace + 24 * i + 1 * 2, 0,
+            104 - 33 + 17 + TechNameSpace + 24 * i + 8 * 2, InnerHeight));
+          brush.style := bsClear;
         end
-      else
+        else
         begin // colored player columns
-        Pen.Color:=Tribe[Column[i]].Color;
-        for j:=1 to 8 do
-          begin
-          MoveTo(104-33+15+TechNameSpace+24*i+j*2,0);
-          LineTo(104-33+15+TechNameSpace+24*i+j*2,InnerHeight);
+          Pen.Color := Tribe[Column[i]].Color;
+          for j := 1 to 8 do
+          begin
+            MoveTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, 0);
+            LineTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, InnerHeight);
           end
         end;
       end;
-  for i:=-1 to DispLines do if (i+sb.si.npos>=0) and (i+sb.si.npos<Lines[Layer]) then
-    line(offscreen.Canvas,i,true,false)
-  end;
-MarkUsedOffscreen(InnerWidth,8+48+DispLines*LineDistance);
-end;
-
-procedure TListDlg.PaintBox1MouseMove(Sender:TObject;
-  Shift:TShiftState;x,y:integer);
+    for i := -1 to DispLines do
+      if (i + sb.si.npos >= 0) and (i + sb.si.npos < Lines[Layer]) then
+        line(offscreen.Canvas, i, true, false)
+  end;
+  MarkUsedOffscreen(InnerWidth, 8 + 48 + DispLines * LineDistance);
+end;
+
+procedure TListDlg.PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
+  x, y: integer);
 var
-i0,Sel0,iColumn,OldScienceNation,xScreen: integer;
-s: string;
-begin
-y:=y-TitleHeight;
-i0:=sb.si.npos;
-Sel0:=Sel;
-if (x>=SideFrame) and (x<SideFrame+InnerWidth) and (y>=0) and (y<InnerHeight)
-  and (y mod LineDistance>=4) and (y mod LineDistance<20) then
-  Sel:=y div LineDistance-1
-else Sel:=-2;
-if (Sel<-1) or (Sel>DispLines) or (Sel+i0<0) or (Sel+i0>=Lines[Layer]) then
-  Sel:=-2;
-if Sel<>Sel0 then
-  begin
-  if Sel0<>-2 then line(Canvas,Sel0,false,false);
-  if Sel<>-2 then line(Canvas,Sel,false,true)
-  end;
-
-if Kind=kScience then
+  i0, Sel0, iColumn, OldScienceNation, xScreen: integer;
+  s: string;
+begin
+  y := y - TitleHeight;
+  i0 := sb.si.npos;
+  Sel0 := Sel;
+  if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
+    (y < InnerHeight) and (y mod LineDistance >= 4) and (y mod LineDistance < 20)
+  then
+    Sel := y div LineDistance - 1
+  else
+    Sel := -2;
+  if (Sel < -1) or (Sel > DispLines) or (Sel + i0 < 0) or
+    (Sel + i0 >= Lines[Layer]) then
+    Sel := -2;
+  if Sel <> Sel0 then
+  begin
+    if Sel0 <> -2 then
+      line(Canvas, Sel0, false, false);
+    if Sel <> -2 then
+      line(Canvas, Sel, false, true)
+  end;
+
+  if Kind = kScience then
   begin // show nation under cursor position
-  OldScienceNation:=ScienceNation;
-  ScienceNation:=-1;
-  if (x>=SideFrame+(104-33+15+TechNameSpace)) and ((x-SideFrame-(104-33+15+TechNameSpace)) mod 24<=18)
-    and (y>=0) and (y<InnerHeight) then
+    OldScienceNation := ScienceNation;
+    ScienceNation := -1;
+    if (x >= SideFrame + (104 - 33 + 15 + TechNameSpace)) and
+      ((x - SideFrame - (104 - 33 + 15 + TechNameSpace)) mod 24 <= 18) and
+      (y >= 0) and (y < InnerHeight) then
     begin
-    iColumn:=(x-SideFrame-(104-33+15+TechNameSpace)) div 24;
-    if (iColumn>=1) and (iColumn<nColumn) then
-      ScienceNation:=Column[iColumn];
+      iColumn := (x - SideFrame - (104 - 33 + 15 + TechNameSpace)) div 24;
+      if (iColumn >= 1) and (iColumn < nColumn) then
+        ScienceNation := Column[iColumn];
     end;
-  if ScienceNation<>OldScienceNation then
+    if ScienceNation <> OldScienceNation then
     begin
-    Fill(Canvas,9,ClientHeight-29,ClientWidth-18,24,
-      (wMaintexture-ClientWidth) div 2,(hMaintexture-ClientHeight) div 2);
-    if ScienceNation>=0 then
-      begin
-      s:=Tribe[ScienceNation].TPhrase('SHORTNAME');
-      if MyRO.Alive and (1 shl ScienceNation)=0 then
-        s:=Format(Phrases.Lookup('SCIENCEREPORT_EXTINCT'),[s]) // extinct
-      else if MyRO.EnemyReport[ScienceNation].TurnOfCivilReport<MyRO.Turn-1 then
-        s:=s+' ('+TurnToString(MyRO.EnemyReport[ScienceNation].TurnOfCivilReport)+')'; // old report
-      xScreen:=(ClientWidth-BiColorTextWidth(Canvas,s)) div 2;
-      LoweredTextOut(Canvas, -1, MainTexture, xScreen+10, ClientHeight-29, s);
-      BitBlt(ScienceNationDot.Canvas.Handle,0,0,17,17,Canvas.Handle,xScreen-10,
-        ClientHeight-27,SRCCOPY);
-      ImageOp_BCC(ScienceNationDot,Templates,0,0,114,211,17,17,
-        MainTexture.clBevelShade,Tribe[ScienceNation].Color);
-      BitBlt(Canvas.Handle,xScreen-10,ClientHeight-27,17,17,
-        ScienceNationDot.Canvas.Handle,0,0,SRCCOPY);
+      Fill(Canvas, 9, ClientHeight - 29, ClientWidth - 18, 24,
+        (wMaintexture - ClientWidth) div 2,
+        (hMaintexture - ClientHeight) div 2);
+      if ScienceNation >= 0 then
+      begin
+        s := Tribe[ScienceNation].TPhrase('SHORTNAME');
+        if MyRO.Alive and (1 shl ScienceNation) = 0 then
+          s := Format(Phrases.Lookup('SCIENCEREPORT_EXTINCT'), [s]) // extinct
+        else if MyRO.EnemyReport[ScienceNation].TurnOfCivilReport < MyRO.Turn - 1
+        then
+          s := s + ' (' + TurnToString(MyRO.EnemyReport[ScienceNation]
+            .TurnOfCivilReport) + ')'; // old report
+        xScreen := (ClientWidth - BiColorTextWidth(Canvas, s)) div 2;
+        LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
+          ClientHeight - 29, s);
+        BitBlt(ScienceNationDot.Canvas.Handle, 0, 0, 17, 17, Canvas.Handle,
+          xScreen - 10, ClientHeight - 27, SRCCOPY);
+        ImageOp_BCC(ScienceNationDot, Templates, 0, 0, 114, 211, 17, 17,
+          MainTexture.clBevelShade, Tribe[ScienceNation].Color);
+        BitBlt(Canvas.Handle, xScreen - 10, ClientHeight - 27, 17, 17,
+          ScienceNationDot.Canvas.Handle, 0, 0, SRCCOPY);
       end;
     end
@@ -729 +834 @@
 function TListDlg.RenameCity(cix: integer): boolean;
 var
-CityNameInfo: TCityNameInfo;
-begin
-InputDlg.Caption:=Phrases.Lookup('TITLE_CITYNAME');
-InputDlg.EInput.Text:=CityName(MyCity[cix].ID);
-InputDlg.CenterToRect(BoundsRect);
-InputDlg.ShowModal;
-if (InputDlg.ModalResult=mrOK) and (InputDlg.EInput.Text<>'')
-  and (InputDlg.EInput.Text<>CityName(MyCity[cix].ID)) then
-  begin
-  CityNameInfo.ID:=MyCity[cix].ID;
-  CityNameInfo.NewName:=InputDlg.EInput.Text;
-  Server(cSetCityName+(Length(CityNameInfo.NewName)+8) div 4,me,0,CityNameInfo);
-  if CityDlg.Visible then begin CityDlg.FormShow(nil); CityDlg.Invalidate end;
-  result:=true
+  CityNameInfo: TCityNameInfo;
+begin
+  InputDlg.Caption := Phrases.Lookup('TITLE_CITYNAME');
+  InputDlg.EInput.Text := CityName(MyCity[cix].ID);
+  InputDlg.CenterToRect(BoundsRect);
+  InputDlg.ShowModal;
+  if (InputDlg.ModalResult = mrOK) and (InputDlg.EInput.Text <> '') and
+    (InputDlg.EInput.Text <> CityName(MyCity[cix].ID)) then
+  begin
+    CityNameInfo.ID := MyCity[cix].ID;
+    CityNameInfo.NewName := InputDlg.EInput.Text;
+    Server(cSetCityName + (length(CityNameInfo.NewName) + 8) div 4, me, 0,
+      CityNameInfo);
+    if CityDlg.Visible then
+    begin
+      CityDlg.FormShow(nil);
+      CityDlg.Invalidate
+    end;
+    result := true
   end
-else result:=false
+  else
+    result := false
 end;
 
 function TListDlg.RenameModel(mix: integer): boolean;
 var
-ModelNameInfo: TModelNameInfo;
-begin
-InputDlg.Caption:=Phrases.Lookup('TITLE_MODELNAME');
-InputDlg.EInput.Text:=Tribe[me].ModelName[mix];
-InputDlg.CenterToRect(BoundsRect);
-InputDlg.ShowModal;
-if (InputDlg.ModalResult=mrOK) and (InputDlg.EInput.Text<>'')
-  and (InputDlg.EInput.Text<>Tribe[me].ModelName[mix]) then
-  begin
-  ModelNameInfo.mix:=mix;
-  ModelNameInfo.NewName:=InputDlg.EInput.Text;
-  Server(cSetModelName+(Length(ModelNameInfo.NewName)+1+4+3) div 4,
-    me,0,ModelNameInfo);
-  if UnitStatDlg.Visible then begin UnitStatDlg.FormShow(nil); UnitStatDlg.Invalidate end;
-  result:=true
+  ModelNameInfo: TModelNameInfo;
+begin
+  InputDlg.Caption := Phrases.Lookup('TITLE_MODELNAME');
+  InputDlg.EInput.Text := Tribe[me].ModelName[mix];
+  InputDlg.CenterToRect(BoundsRect);
+  InputDlg.ShowModal;
+  if (InputDlg.ModalResult = mrOK) and (InputDlg.EInput.Text <> '') and
+    (InputDlg.EInput.Text <> Tribe[me].ModelName[mix]) then
+  begin
+    ModelNameInfo.mix := mix;
+    ModelNameInfo.NewName := InputDlg.EInput.Text;
+    Server(cSetModelName + (length(ModelNameInfo.NewName) + 1 + 4 + 3) div 4,
+      me, 0, ModelNameInfo);
+    if UnitStatDlg.Visible then
+    begin
+      UnitStatDlg.FormShow(nil);
+      UnitStatDlg.Invalidate
+    end;
+    result := true
   end
-else result:=false  
-end;
-
-procedure TListDlg.PaintBox1MouseDown(Sender:TObject;Button:TMouseButton;
-  Shift:TShiftState;x,y:integer);
+  else
+    result := false
+end;
+
+procedure TListDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; x, y: integer);
 var
-lix: integer;
-begin
-if sb.si.npos+Sel>=0 then lix:=code[Layer,sb.si.npos+Sel];
-if Kind in [kScience,kCities,kCityEvents,kModels,kEModels,kAllEModels] then
-  include(Shift, ssShift); // don't close list window
-if (ssLeft in Shift) and not(ssShift in Shift) then
-  begin
-  if Sel<>-2 then
-    begin result:=lix; Closable:=true; Close end
+  lix: integer;
+begin
+  if sb.si.npos + Sel >= 0 then
+    lix := code[Layer, sb.si.npos + Sel];
+  if Kind in [kScience, kCities, kCityEvents, kModels, kEModels, kAllEModels]
+  then
+    include(Shift, ssShift); // don't close list window
+  if (ssLeft in Shift) and not(ssShift in Shift) then
+  begin
+    if Sel <> -2 then
+    begin
+      result := lix;
+      Closable := true;
+      Close
+    end
   end
-else if (ssLeft in Shift) and (ssShift in Shift) then
+  else if (ssLeft in Shift) and (ssShift in Shift) then
   begin // show help/info popup
-  if Sel<>-2 then
-    case Kind of
-      kCities:
-        MainScreen.ZoomToCity(MyCity[lix].Loc);
-      kCityEvents:
-        MainScreen.ZoomToCity(MyCity[lix].Loc, false, MyCity[lix].Flags and CityRepMask);
-      kModels,kChooseModel:
-        if lix<>mixAll then
-          UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or wmPersistent, lix);
-      kEModels:
-        UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent, code[1,sb.si.npos+Sel]);
-      kAllEModels,kChooseEModel:
-        if lix<>mixAll then
-          UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent, lix);
-      kAdvance,kFarAdvance,kScience,kChooseTech,kChooseETech,kStealTech:
-        if lix=adMilitary then
-          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText, HelpDlg.TextIndex('MILRES'))
-        else if lix<adMilitary then
-          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkAdv, lix);
-      kProject:
-        if lix=cpImp+imTrGoods then
-          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,HelpDlg.TextIndex('TRADINGGOODS'))
-        else if lix and (cpImp+cpType)=0 then
-          UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or wmPersistent, lix and cpIndex)
-        else if (lix and cpType=0) and (lix<>cpImp+imTrGoods) then
-          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, lix and cpIndex);
-      kGov:
-        HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkMisc, miscGovList);
-      kShipPart,kEShipPart:;
+    if Sel <> -2 then
+      case Kind of
+        kCities:
+          MainScreen.ZoomToCity(MyCity[lix].Loc);
+        kCityEvents:
+          MainScreen.ZoomToCity(MyCity[lix].Loc, false, MyCity[lix].Flags and
+            CityRepMask);
+        kModels, kChooseModel:
+          if lix <> mixAll then
+            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or
+              wmPersistent, lix);
+        kEModels:
+          UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent,
+            code[1, sb.si.npos + Sel]);
+        kAllEModels, kChooseEModel:
+          if lix <> mixAll then
+            UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or
+              wmPersistent, lix);
+        kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
+          if lix = adMilitary then
+            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+              HelpDlg.TextIndex('MILRES'))
+          else if lix < adMilitary then
+            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkAdv, lix);
+        kProject:
+          if lix = cpImp + imTrGoods then
+            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+              HelpDlg.TextIndex('TRADINGGOODS'))
+          else if lix and (cpImp + cpType) = 0 then
+            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or wmPersistent,
+              lix and cpIndex)
+          else if (lix and cpType = 0) and (lix <> cpImp + imTrGoods) then
+            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp,
+              lix and cpIndex);
+        kGov:
+          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkMisc,
+            miscGovList);
+        kShipPart, kEShipPart:
+          ;
       end
   end
-else if ssRight in Shift then
-  begin
-  if Sel<>-2 then
-    case Kind of
-      kCities, kCityEvents:
-        if RenameCity(lix) then SmartUpdateContent;
-      kModels:
-        if RenameModel(lix) then SmartUpdateContent;
+  else if ssRight in Shift then
+  begin
+    if Sel <> -2 then
+      case Kind of
+        kCities, kCityEvents:
+          if RenameCity(lix) then
+            SmartUpdateContent;
+        kModels:
+          if RenameModel(lix) then
+            SmartUpdateContent;
       end
   end
@@ -828 +962 @@
 procedure TListDlg.InitLines;
 var
-required: array[0..nAdv-1] of integer;
-
-  procedure TryAddImpLine(Layer,Project: integer);
-  begin
-  if Server(sSetCityProject-sExecute,me,cixProject,Project)>=rExecuted then
-    begin code[Layer,Lines[Layer]]:=Project; inc(Lines[Layer]); end;
+  required: array [0 .. nAdv - 1] of integer;
+
+  procedure TryAddImpLine(Layer, Project: integer);
+  begin
+    if Server(sSetCityProject - sExecute, me, cixProject, Project) >= rExecuted
+    then
+    begin
+      code[Layer, Lines[Layer]] := Project;
+      inc(Lines[Layer]);
+    end;
   end;
 
   procedure SortTechs;
   var
-  i,j,swap: integer;
+    i, j, swap: integer;
   begin // sort by advancedness
-  for i:=0 to Lines[0]-2 do if code[0,i]<adMilitary then
-    for j:=i+1 to Lines[0]-1 do
-      if AdvValue[code[0,i]]*nAdv+code[0,i]<AdvValue[code[0,j]]*nAdv+code[0,j] then
-        begin swap:=code[0,i]; code[0,i]:=code[0,j]; code[0,j]:=swap end;
+    for i := 0 to Lines[0] - 2 do
+      if code[0, i] < adMilitary then
+        for j := i + 1 to Lines[0] - 1 do
+          if AdvValue[code[0, i]] * nAdv + code[0, i] < AdvValue[code[0, j]] *
+            nAdv + code[0, j] then
+          begin
+            swap := code[0, i];
+            code[0, i] := code[0, j];
+            code[0, j] := swap
+          end;
   end;
 
   procedure SortCities;
   var
-  i,j,swap: integer;
-  begin
-  for i:=0 to Lines[0]-2 do
-    for j:=i+1 to Lines[0]-1 do
-      if CityName(MyCity[code[0,i]].ID)>CityName(MyCity[code[0,j]].ID) then
-        begin swap:=code[0,i]; code[0,i]:=code[0,j]; code[0,j]:=swap end;
-  end;
-
-  function ModelSortValue(const mi: TModelInfo; MixPlayers: boolean = false): integer;
-  begin
-  result:=(mi.Domain+1) shl 28 -mi.mix;
-  if MixPlayers then dec(result, ModelCode(mi) shl 16);
+    i, j, swap: integer;
+  begin
+    for i := 0 to Lines[0] - 2 do
+      for j := i + 1 to Lines[0] - 1 do
+        if CityName(MyCity[code[0, i]].ID) > CityName(MyCity[code[0, j]].ID)
+        then
+        begin
+          swap := code[0, i];
+          code[0, i] := code[0, j];
+          code[0, j] := swap
+        end;
+  end;
+
+  function ModelSortValue(const mi: TModelInfo;
+    MixPlayers: boolean = false): integer;
+  begin
+    result := (mi.Domain + 1) shl 28 - mi.mix;
+    if MixPlayers then
+      dec(result, ModelCode(mi) shl 16);
   end;
 
   procedure SortModels;
   var
-  i,j,swap: integer;
+    i, j, swap: integer;
   begin // sort by code[2]
-  for i:=0 to Lines[0]-2 do for j:=i+1 to Lines[0]-1 do
-    if code[2,i]>code[2,j] then
-      begin
-      swap:=code[0,i]; code[0,i]:=code[0,j]; code[0,j]:=swap;
-      swap:=code[1,i]; code[1,i]:=code[1,j]; code[1,j]:=swap;
-      swap:=code[2,i]; code[2,i]:=code[2,j]; code[2,j]:=swap;
-      end;
+    for i := 0 to Lines[0] - 2 do
+      for j := i + 1 to Lines[0] - 1 do
+        if code[2, i] > code[2, j] then
+        begin
+          swap := code[0, i];
+          code[0, i] := code[0, j];
+          code[0, j] := swap;
+          swap := code[1, i];
+          code[1, i] := code[1, j];
+          code[1, j] := swap;
+          swap := code[2, i];
+          code[2, i] := code[2, j];
+          code[2, j] := swap;
+        end;
   end;
 
   procedure MarkPreqs(i: integer);
   begin
-  required[i]:=1;
-  if MyRO.Tech[i]<tsSeen then
+    required[i] := 1;
+    if MyRO.Tech[i] < tsSeen then
     begin
-    if (AdvPreq[i,0]>=0) then MarkPreqs(AdvPreq[i,0]);
-    if (AdvPreq[i,1]>=0) then MarkPreqs(AdvPreq[i,1]);
+      if (AdvPreq[i, 0] >= 0) then
+        MarkPreqs(AdvPreq[i, 0]);
+      if (AdvPreq[i, 1] >= 0) then
+        MarkPreqs(AdvPreq[i, 1]);
     end
   end;
 
 var
-Loc1,i,j,p1,dx,dy,mix,emix,EnemyType,TestEnemyType:integer;
-mi: TModelInfo;
-PPicture, PTestPicture: ^TModelPicture;
-ModelOk: array[0..4095] of boolean;
-ok: boolean;
-begin
-for i:=0 to MaxLayer-1 do
-  begin Lines[i]:=0; FirstShrinkedLine[i]:=MaxInt end;
-case Kind of
-  kProject:
-    begin
-    // improvements
-    code[0,0]:=cpImp+imTrGoods;
-    Lines[0]:=1;
-    for i:=28 to nImp-1 do
-      if Imp[i].Kind=ikCommon then
-        TryAddImpLine(0,i+cpImp);
-    for i:=28 to nImp-1 do
-      if not (Imp[i].Kind in [ikCommon,ikTrGoods])
-        and ((MyRO.NatBuilt[i]=0) or (Imp[i].Kind=ikNatLocal)) then
-        TryAddImpLine(0,i+cpImp);
-    for i:=0 to nCityType-1 do if MyData.ImpOrder[i,0]>=0 then
-      begin code[0,Lines[0]]:=cpType+i; inc(Lines[0]); end;
-
-    // wonders
-    for i:=0 to 27 do
-      TryAddImpLine(1,i+cpImp);
-
-    // units
-    for i:=0 to MyRO.nModel-1 do
-      begin
-{      if MyModel[i].Kind=mkSlaves then
-        ok:= MyRO.Wonder[woPyramids].EffectiveOwner=me
-      else} if MyModel[i].Domain=dSea then
-        begin
-        ok:=false;
-        for dx:=-2 to 2 do for dy:=-2 to 2 do if abs(dx)+abs(dy)=2 then
-          begin
-          Loc1:=dLoc(MyCity[cixProject].Loc,dx,dy);
-          if (Loc1>=0) and (Loc1<G.lx*G.ly)
-            and ((MyMap[Loc1] and fTerrain=fShore) or (MyMap[Loc1] and fCanal>0)) then
-            ok:=true;
+  Loc1, i, j, p1, dx, dy, mix, emix, EnemyType, TestEnemyType: integer;
+  mi: TModelInfo;
+  PPicture, PTestPicture: ^TModelPicture;
+  ModelOk: array [0 .. 4095] of boolean;
+  ok: boolean;
+begin
+  for i := 0 to MaxLayer - 1 do
+  begin
+    Lines[i] := 0;
+    FirstShrinkedLine[i] := MaxInt
+  end;
+  case Kind of
+    kProject:
+      begin
+        // improvements
+        code[0, 0] := cpImp + imTrGoods;
+        Lines[0] := 1;
+        for i := 28 to nImp - 1 do
+          if Imp[i].Kind = ikCommon then
+            TryAddImpLine(0, i + cpImp);
+        for i := 28 to nImp - 1 do
+          if not(Imp[i].Kind in [ikCommon, ikTrGoods]) and
+            ((MyRO.NatBuilt[i] = 0) or (Imp[i].Kind = ikNatLocal)) then
+            TryAddImpLine(0, i + cpImp);
+        for i := 0 to nCityType - 1 do
+          if MyData.ImpOrder[i, 0] >= 0 then
+          begin
+            code[0, Lines[0]] := cpType + i;
+            inc(Lines[0]);
+          end;
+
+        // wonders
+        for i := 0 to 27 do
+          TryAddImpLine(1, i + cpImp);
+
+        // units
+        for i := 0 to MyRO.nModel - 1 do
+        begin
+          { if MyModel[i].Kind=mkSlaves then
+            ok:= MyRO.Wonder[woPyramids].EffectiveOwner=me
+            else } if MyModel[i].Domain = dSea then
+          begin
+            ok := false;
+            for dx := -2 to 2 do
+              for dy := -2 to 2 do
+                if abs(dx) + abs(dy) = 2 then
+                begin
+                  Loc1 := dLoc(MyCity[cixProject].Loc, dx, dy);
+                  if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) and
+                    ((MyMap[Loc1] and fTerrain = fShore) or
+                    (MyMap[Loc1] and fCanal > 0)) then
+                    ok := true;
+                end
           end
+          else
+            ok := true;
+          if ok then
+          begin
+            if MyModel[i].Status and msObsolete = 0 then
+            begin
+              code[2, Lines[2]] := i;
+              inc(Lines[2])
+            end;
+            if MyModel[i].Status and msAllowConscripts <> 0 then
+            begin
+              code[2, Lines[2]] := i + cpConscripts;
+              inc(Lines[2])
+            end;
+          end;
+        end;
+        FirstShrinkedLine[2] := 0;
+      end;
+    kAdvance:
+      begin
+        nColumn := 1;
+        if MyData.FarTech <> adNone then
+        begin
+          FillChar(required, SizeOf(required), 0);
+          MarkPreqs(MyData.FarTech);
+        end;
+        for i := 0 to nAdv - 1 do
+          if ((i in FutureTech) or (MyRO.Tech[i] < tsApplicable)) and
+            (Server(sSetResearch - sExecute, me, i, nil^) >= rExecuted) and
+            ((MyData.FarTech = adNone) or (required[i] > 0)) then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+        SortTechs;
+        if Lines[0] = 0 then // no more techs -- offer nexus
+        begin
+          code[0, Lines[0]] := adNexus;
+          inc(Lines[0]);
+        end;
+        ok := false;
+        for i := 0 to nDomains - 1 do
+          if (upgrade[i, 0].Preq = preNone) or
+            (MyRO.Tech[upgrade[i, 0].Preq] >= tsApplicable) then
+            ok := true;
+        if ok then { new unit class }
+        begin
+          code[0, Lines[0]] := adMilitary;
+          inc(Lines[0])
+        end;
+      end;
+    kFarAdvance:
+      begin
+        code[0, Lines[0]] := adNone;
+        inc(Lines[0]);
+        for i := 0 to nAdv - 1 do
+          if not(i in FutureTech) and (MyRO.Tech[i] < tsApplicable) and
+            ((AdvValue[i] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
+            ((AdvValue[i] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+        SortTechs;
+      end;
+    kChooseTech:
+      begin
+        for i := 0 to nAdv - 1 do
+          if not(i in FutureTech) and (MyRO.Tech[i] >= tsApplicable) and
+            (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] < tsSeen) then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+        SortTechs;
+        // if Lines[0]>1 then
+        begin
+          code[0, Lines[0]] := adAll;
+          inc(Lines[0]);
+        end;
+      end;
+    kChooseETech:
+      begin
+        for i := 0 to nAdv - 1 do
+          if not(i in FutureTech) and (MyRO.Tech[i] < tsSeen) and
+            (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] >= tsApplicable) then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+        SortTechs;
+        // if Lines[0]>1 then
+        begin
+          code[0, Lines[0]] := adAll;
+          inc(Lines[0]);
+        end;
+      end;
+    kStealTech:
+      begin
+        for i := 0 to nAdv - 1 do
+          if Server(sStealTech - sExecute, me, i, nil^) >= rExecuted then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+        SortTechs;
+      end;
+    kScience:
+      begin
+        Column[0] := me;
+        nColumn := 1;
+        for EnemyType := 0 to 2 do
+          for p1 := 0 to nPl - 1 do
+            if (MyRO.EnemyReport[p1] <> nil) and
+              ((MyRO.EnemyReport[p1].TurnOfContact >= 0) or
+              (MyRO.EnemyReport[p1].TurnOfCivilReport >= 0)) then
+            begin
+              if MyRO.Alive and (1 shl p1) = 0 then
+                TestEnemyType := 2 // extinct enemy -- move to right end
+              else if MyRO.EnemyReport[p1].TurnOfCivilReport >= MyRO.Turn - 1
+              then
+                TestEnemyType := 0 // current report -- move to left end
+              else
+                TestEnemyType := 1;
+              if TestEnemyType = EnemyType then
+              begin
+                Column[nColumn] := p1;
+                inc(nColumn);
+              end;
+            end;
+        for i := 0 to nAdv - 1 do
+        begin
+          ok := (MyRO.Tech[i] <> tsNA) or (MyRO.ResearchTech = i);
+          for j := 1 to nColumn - 1 do
+            with MyRO.EnemyReport[Column[j]]^ do
+              if (Tech[i] <> tsNA) or (TurnOfCivilReport >= 0) and
+                (ResearchTech = i) then
+                ok := true;
+          if ok then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+        end;
+        SortTechs;
+
+        ok := MyRO.ResearchTech = adMilitary;
+        for j := 1 to nColumn - 1 do
+          with MyRO.EnemyReport[Column[j]]^ do
+            if (MyRO.Alive and (1 shl Column[j]) <> 0) and
+              (TurnOfCivilReport >= 0) and (ResearchTech = adMilitary) then
+              ok := true;
+        if ok then
+        begin
+          code[0, Lines[0]] := adMilitary;
+          inc(Lines[0]);
         end
-      else ok:=true;
-      if ok then
-        begin
-        if MyModel[i].Status and msObsolete=0 then
-          begin code[2,Lines[2]]:=i; inc(Lines[2]) end;
-        if MyModel[i].Status and msAllowConscripts<>0 then
-          begin code[2,Lines[2]]:=i+cpConscripts; inc(Lines[2]) end;
-        end;
-      end;
-    FirstShrinkedLine[2]:=0;
-    end;
-  kAdvance:
-    begin
-    nColumn:=1;
-    if MyData.FarTech<>adNone then
-      begin
-      FillChar(required,SizeOf(required),0);
-      MarkPreqs(MyData.FarTech);
-      end;
-    for i:=0 to nAdv-1 do
-      if ((i in FutureTech) or (MyRO.Tech[i]<tsApplicable))
-        and (Server(sSetResearch-sExecute,me,i,nil^)>=rExecuted)
-        and ((MyData.FarTech=adNone) or (required[i]>0)) then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    SortTechs;
-    if Lines[0]=0 then // no more techs -- offer nexus
-      begin code[0,Lines[0]]:=adNexus; inc(Lines[0]); end;
-    ok:=false;
-    for i:=0 to nDomains-1 do
-      if (upgrade[i,0].Preq=preNone)
-        or (MyRO.Tech[upgrade[i,0].Preq]>=tsApplicable) then
-        ok:=true;
-    if ok then {new unit class}
-      begin code[0,Lines[0]]:=adMilitary; inc(Lines[0]) end;
-    end;
-  kFarAdvance:
-    begin
-    code[0,Lines[0]]:=adNone; inc(Lines[0]);
-    for i:=0 to nAdv-1 do
-      if not (i in FutureTech) and (MyRO.Tech[i]<tsApplicable)
-        and ((AdvValue[i]<2000) or (MyRO.Tech[adMassProduction]>tsNA))
-        and ((AdvValue[i]<1000) or (MyRO.Tech[adScience]>tsNA)) then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    SortTechs;
-    end;
-  kChooseTech:
-    begin
-    for i:=0 to nAdv-1 do
-      if not (i in FutureTech) and (MyRO.Tech[i]>=tsApplicable)
-        and (MyRO.EnemyReport[DipMem[me].pContact].Tech[i]<tsSeen) then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    SortTechs;
-//    if Lines[0]>1 then
-      begin code[0,Lines[0]]:=adAll; inc(Lines[0]); end;
-    end;
-  kChooseETech:
-    begin
-    for i:=0 to nAdv-1 do
-      if not (i in FutureTech) and (MyRO.Tech[i]<tsSeen)
-        and (MyRO.EnemyReport[DipMem[me].pContact].Tech[i]>=tsApplicable) then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    SortTechs;
-//    if Lines[0]>1 then
-      begin code[0,Lines[0]]:=adAll; inc(Lines[0]); end;
-    end;
-  kStealTech:
-    begin
-    for i:=0 to nAdv-1 do
-      if Server(sStealTech-sExecute, me, i, nil^)>=rExecuted then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    SortTechs;
-    end;
-  kScience:
-    begin
-    Column[0]:=me;
-    nColumn:=1;
-    for EnemyType:=0 to 2 do
-      for p1:=0 to nPl-1 do
-        if (MyRO.EnemyReport[p1]<>nil)
-          and ((MyRO.EnemyReport[p1].TurnOfContact>=0)
-            or (MyRO.EnemyReport[p1].TurnOfCivilReport>=0)) then
-          begin
-          if MyRO.Alive and (1 shl p1)=0 then
-            TestEnemyType:=2 // extinct enemy -- move to right end
-          else if MyRO.EnemyReport[p1].TurnOfCivilReport>=MyRO.Turn-1 then
-            TestEnemyType:=0 // current report -- move to left end
-          else TestEnemyType:=1;
-          if TestEnemyType=EnemyType then
-            begin Column[nColumn]:=p1; inc(nColumn); end;
-          end;
-    for i:=0 to nAdv-1 do
-      begin
-      ok:= (MyRO.Tech[i]<>tsNA) or (MyRO.ResearchTech=i);
-      for j:=1 to nColumn-1 do with MyRO.EnemyReport[Column[j]]^ do
-        if (Tech[i]<>tsNA) or (TurnOfCivilReport>=0) and (ResearchTech=i) then
-          ok:=true;
-      if ok then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-      end;
-    SortTechs;
-
-    ok:= MyRO.ResearchTech=adMilitary;
-    for j:=1 to nColumn-1 do with MyRO.EnemyReport[Column[j]]^ do
-      if (MyRO.Alive and (1 shl Column[j])<>0)
-        and (TurnOfCivilReport>=0) and (ResearchTech=adMilitary) then
-        ok:=true;
-    if ok then
-      begin code[0,Lines[0]]:=adMilitary; inc(Lines[0]); end
-    end;
-  kCities{, kChooseCity}:
-    begin
-    if ClientMode<scContact then
-      for i:=0 to MyRO.nCity-1 do if MyCity[i].Loc>=0 then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]) end;
-    SortCities;
-    FirstShrinkedLine[0]:=0
-    end;
-  kCityEvents:
-    begin
-    for i:=0 to MyRO.nCity-1 do
-      if (MyCity[i].Loc>=0) and (MyCity[i].Flags and CityRepMask<>0) then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]) end;
-    SortCities;
-    FirstShrinkedLine[0]:=0
-    end;
-{  kChooseECity:
-    begin
-    for i:=0 to MyRO.nEnemyCity-1 do
+      end;
+    kCities { , kChooseCity } :
+      begin
+        if ClientMode < scContact then
+          for i := 0 to MyRO.nCity - 1 do
+            if MyCity[i].Loc >= 0 then
+            begin
+              code[0, Lines[0]] := i;
+              inc(Lines[0])
+            end;
+        SortCities;
+        FirstShrinkedLine[0] := 0
+      end;
+    kCityEvents:
+      begin
+        for i := 0 to MyRO.nCity - 1 do
+          if (MyCity[i].Loc >= 0) and (MyCity[i].Flags and CityRepMask <> 0)
+          then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0])
+          end;
+        SortCities;
+        FirstShrinkedLine[0] := 0
+      end;
+    { kChooseECity:
+      begin
+      for i:=0 to MyRO.nEnemyCity-1 do
       if (MyRO.EnemyCity[i].Loc>=0)
-        and (MyRO.EnemyCity[i].owner=DipMem[me].pContact) then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    FirstShrinkedLine:=0
-    end;}
-  kModels:
-    begin
-    for mix:=0 to MyRO.nModel-1 do
-      begin
-      code[0,mix]:=mix;
-      MakeModelInfo(me, mix, MyModel[mix], mi);
-      code[2,mix]:=ModelSortValue(mi);
-      end;
-    Lines[0]:=MyRO.nModel;
-    SortModels;
-    FirstShrinkedLine[0]:=0
-    end;
-  kChooseModel:
-    begin
-    for mix:=3 to MyRO.nModel-1 do
-      begin // check if opponent already has this model
-      MakeModelInfo(me,mix,MyModel[mix],mi);
-      ok:=true;
-      for emix:=0 to MyRO.nEnemyModel-1 do
-         if (MyRO.EnemyModel[emix].Owner=DipMem[me].pContact)
-           and IsSameModel(MyRO.EnemyModel[emix],mi) then
-           ok:=false;
-      if ok then
-        begin
-        code[0,Lines[0]]:=mix;
-        MakeModelInfo(me, mix, MyModel[mix], mi);
-        code[2,Lines[0]]:=ModelSortValue(mi);
-        inc(Lines[0]);
-        end;
-      end;
-    SortModels;
-//    if Lines[0]>1 then
-      begin code[0,Lines[0]]:=mixAll; inc(Lines[0]); end;
-    FirstShrinkedLine[0]:=0
-    end;
-  kChooseEModel:
-    begin
-    if MyRO.TestFlags and tfUncover<>0 then
-      Server(sGetModels,me,0,nil^);
-    for emix:=0 to MyRO.nEnemyModel-1 do
-      ModelOk[emix]:= MyRO.EnemyModel[emix].Owner=DipMem[me].pContact;
-    for mix:=0 to MyRO.nModel-1 do
-      begin // don't list models I already have
-      MakeModelInfo(me,mix,MyModel[mix],mi);
-      for emix:=0 to MyRO.nEnemyModel-1 do
-        ModelOk[emix]:=ModelOk[emix]
-          and not IsSameModel(MyRO.EnemyModel[emix],mi);
-      end;
-    for emix:=0 to MyRO.nEnemyModel-1 do if ModelOk[emix] then
-      begin
-      if Tribe[DipMem[me].pContact].ModelPicture[MyRO.EnemyModel[emix].mix].HGr=0 then
-        InitEnemyModel(emix);
-      code[0,Lines[0]]:=emix;
-      code[2,Lines[0]]:=ModelSortValue(MyRO.EnemyModel[emix]);
-      inc(Lines[0]);
-      end;
-    SortModels;
-//    if not IsMilReportNew(DipMem[me].pContact) or (Lines[0]>1) then
-      begin code[0,Lines[0]]:=mixAll; inc(Lines[0]); end;
-    FirstShrinkedLine[0]:=0
-    end;
-  kEModels:
-    begin
-    for i:=0 to MyRO.EnemyReport[pView].nModelCounted-1 do
-      begin
-      code[1,Lines[0]]:=MyRO.nEnemyModel-1;
-      while (code[1,Lines[0]]>=0)
-        and not ((MyRO.EnemyModel[code[1,Lines[0]]].Owner=pView)
-        and (MyRO.EnemyModel[code[1,Lines[0]]].mix=i)) do
-        dec(code[1,Lines[0]]);
-      if Tribe[pView].ModelPicture[i].HGr=0 then
-        InitEnemyModel(code[1,Lines[0]]);
-      code[0,Lines[0]]:=i;
-      code[2,Lines[0]]:=ModelSortValue(MyRO.EnemyModel[code[1,Lines[0]]]);
-      inc(Lines[0]);
-      end;
-    SortModels;
-    FirstShrinkedLine[0]:=0
-    end;
-  kAllEModels:
-    begin
-    if (MyRO.TestFlags and tfUncover<>0) or (G.Difficulty[me]=0) then
-      Server(sGetModels,me,0,nil^);
-    for emix:=0 to MyRO.nEnemyModel-1 do
-      if (MyRO.EnemyModel[emix].mix>=3)
-        and (MyRO.EnemyModel[emix].Kind in [mkSelfDeveloped,mkEnemyDeveloped]) then
-        begin
-        PPicture:=@Tribe[MyRO.EnemyModel[emix].Owner].ModelPicture[MyRO.EnemyModel[emix].mix];
-        if PPicture.HGr=0 then InitEnemyModel(emix);
-        ok:=true;
-        if MainScreen.mNames.Checked then
-          for j:=0 to Lines[0]-1 do
+      and (MyRO.EnemyCity[i].owner=DipMem[me].pContact) then
+      begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
+      FirstShrinkedLine:=0
+      end; }
+    kModels:
+      begin
+        for mix := 0 to MyRO.nModel - 1 do
+        begin
+          code[0, mix] := mix;
+          MakeModelInfo(me, mix, MyModel[mix], mi);
+          code[2, mix] := ModelSortValue(mi);
+        end;
+        Lines[0] := MyRO.nModel;
+        SortModels;
+        FirstShrinkedLine[0] := 0
+      end;
+    kChooseModel:
+      begin
+        for mix := 3 to MyRO.nModel - 1 do
+        begin // check if opponent already has this model
+          MakeModelInfo(me, mix, MyModel[mix], mi);
+          ok := true;
+          for emix := 0 to MyRO.nEnemyModel - 1 do
+            if (MyRO.EnemyModel[emix].Owner = DipMem[me].pContact) and
+              IsSameModel(MyRO.EnemyModel[emix], mi) then
+              ok := false;
+          if ok then
+          begin
+            code[0, Lines[0]] := mix;
+            MakeModelInfo(me, mix, MyModel[mix], mi);
+            code[2, Lines[0]] := ModelSortValue(mi);
+            inc(Lines[0]);
+          end;
+        end;
+        SortModels;
+        // if Lines[0]>1 then
+        begin
+          code[0, Lines[0]] := mixAll;
+          inc(Lines[0]);
+        end;
+        FirstShrinkedLine[0] := 0
+      end;
+    kChooseEModel:
+      begin
+        if MyRO.TestFlags and tfUncover <> 0 then
+          Server(sGetModels, me, 0, nil^);
+        for emix := 0 to MyRO.nEnemyModel - 1 do
+          ModelOk[emix] := MyRO.EnemyModel[emix].Owner = DipMem[me].pContact;
+        for mix := 0 to MyRO.nModel - 1 do
+        begin // don't list models I already have
+          MakeModelInfo(me, mix, MyModel[mix], mi);
+          for emix := 0 to MyRO.nEnemyModel - 1 do
+            ModelOk[emix] := ModelOk[emix] and
+              not IsSameModel(MyRO.EnemyModel[emix], mi);
+        end;
+        for emix := 0 to MyRO.nEnemyModel - 1 do
+          if ModelOk[emix] then
+          begin
+            if Tribe[DipMem[me].pContact].ModelPicture
+              [MyRO.EnemyModel[emix].mix].HGr = 0 then
+              InitEnemyModel(emix);
+            code[0, Lines[0]] := emix;
+            code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix]);
+            inc(Lines[0]);
+          end;
+        SortModels;
+        // if not IsMilReportNew(DipMem[me].pContact) or (Lines[0]>1) then
+        begin
+          code[0, Lines[0]] := mixAll;
+          inc(Lines[0]);
+        end;
+        FirstShrinkedLine[0] := 0
+      end;
+    kEModels:
+      begin
+        for i := 0 to MyRO.EnemyReport[pView].nModelCounted - 1 do
+        begin
+          code[1, Lines[0]] := MyRO.nEnemyModel - 1;
+          while (code[1, Lines[0]] >= 0) and
+            not((MyRO.EnemyModel[code[1, Lines[0]]].Owner = pView) and
+            (MyRO.EnemyModel[code[1, Lines[0]]].mix = i)) do
+            dec(code[1, Lines[0]]);
+          if Tribe[pView].ModelPicture[i].HGr = 0 then
+            InitEnemyModel(code[1, Lines[0]]);
+          code[0, Lines[0]] := i;
+          code[2, Lines[0]] :=
+            ModelSortValue(MyRO.EnemyModel[code[1, Lines[0]]]);
+          inc(Lines[0]);
+        end;
+        SortModels;
+        FirstShrinkedLine[0] := 0
+      end;
+    kAllEModels:
+      begin
+        if (MyRO.TestFlags and tfUncover <> 0) or (G.Difficulty[me] = 0) then
+          Server(sGetModels, me, 0, nil^);
+        for emix := 0 to MyRO.nEnemyModel - 1 do
+          if (MyRO.EnemyModel[emix].mix >= 3) and
+            (MyRO.EnemyModel[emix].Kind in [mkSelfDeveloped, mkEnemyDeveloped])
+          then
+          begin
+            PPicture := @Tribe[MyRO.EnemyModel[emix].Owner].ModelPicture
+              [MyRO.EnemyModel[emix].mix];
+            if PPicture.HGr = 0 then
+              InitEnemyModel(emix);
+            ok := true;
+            if MainScreen.mNames.Checked then
+              for j := 0 to Lines[0] - 1 do
+              begin
+                PTestPicture := @Tribe[MyRO.EnemyModel[code[0, j]].Owner]
+                  .ModelPicture[MyRO.EnemyModel[code[0, j]].mix];
+                if (PPicture.HGr = PTestPicture.HGr) and
+                  (PPicture.pix = PTestPicture.pix) and
+                  (ModelHash(MyRO.EnemyModel[emix])
+                  = ModelHash(MyRO.EnemyModel[code[0, j]])) then
+                begin
+                  code[1, j] := 1;
+                  ok := false;
+                  Break
+                end;
+              end;
+            if ok then
             begin
-            PTestPicture:=@Tribe[MyRO.EnemyModel[code[0,j]].Owner].ModelPicture[MyRO.EnemyModel[code[0,j]].mix];
-            if (PPicture.HGr=PTestPicture.HGr) and (PPicture.pix=PTestPicture.pix)
-              and (ModelHash(MyRO.EnemyModel[emix])=ModelHash(MyRO.EnemyModel[code[0,j]])) then
-              begin code[1,j]:=1; ok:=false; Break end;
-            end;
-        if ok then
-          begin
-          code[0,Lines[0]]:=emix;
-          code[1,Lines[0]]:=0;
-          code[2,Lines[0]]:=ModelSortValue(MyRO.EnemyModel[emix],true);
-          inc(Lines[0]);
-          end
-        end;
-    SortModels;
-    FirstShrinkedLine[0]:=0
-    end;
-  kTribe:
-    for i:=0 to TribeNames.Count-1 do
-      begin code[0,Lines[0]]:=i; inc(Lines[0]) end;
-(*  kDeliver:
-    if MyRO.Treaty[DipMem[me].pContact]<trAlliance then
+              code[0, Lines[0]] := emix;
+              code[1, Lines[0]] := 0;
+              code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix], true);
+              inc(Lines[0]);
+            end
+          end;
+        SortModels;
+        FirstShrinkedLine[0] := 0
+      end;
+    kTribe:
+      for i := 0 to TribeNames.Count - 1 do
+      begin
+        code[0, Lines[0]] := i;
+        inc(Lines[0])
+      end;
+    (* kDeliver:
+      if MyRO.Treaty[DipMem[me].pContact]<trAlliance then
       begin // suggest next treaty level
       code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[me].pContact]+1;
       inc(Lines[0]);
       end;
-    if MyRO.Treaty[DipMem[me].pContact]=trNone then
+      if MyRO.Treaty[DipMem[me].pContact]=trNone then
       begin // suggest peace
       code[0,Lines[0]]:=opTreaty+trPeace;
       inc(Lines[0]);
       end;
-    if MyRO.Treaty[DipMem[me].pContact]>trNone then
+      if MyRO.Treaty[DipMem[me].pContact]>trNone then
       begin // suggest next treaty level
       code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
       inc(Lines[0]);
-      end;*)
-  kShipPart:
+      end; *)
+    kShipPart:
+      begin
+        Lines[0] := 0;
+        for i := 0 to nShipPart - 1 do
+          if MyRO.Ship[me].Parts[i] > 0 then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+      end;
+    kEShipPart:
+      begin
+        Lines[0] := 0;
+        for i := 0 to nShipPart - 1 do
+          if MyRO.Ship[DipMem[me].pContact].Parts[i] > 0 then
+          begin
+            code[0, Lines[0]] := i;
+            inc(Lines[0]);
+          end;
+      end;
+    kGov:
+      for i := 1 to nGov - 1 do
+        if (GovPreq[i] <> preNA) and
+          ((GovPreq[i] = preNone) or (MyRO.Tech[GovPreq[i]] >= tsApplicable))
+        then
+        begin
+          code[0, Lines[0]] := i;
+          inc(Lines[0])
+        end;
+    kMission:
+      for i := 0 to nSpyMission - 1 do
+      begin
+        code[0, Lines[0]] := i;
+        inc(Lines[0])
+      end;
+  end;
+
+  if Kind = kProject then // test if choice fitting to one screen
+    if Lines[0] + Lines[1] + Lines[2] <= MaxLines then
     begin
-    Lines[0]:=0;
-    for i:=0 to nShipPart-1 do
-      if MyRO.Ship[me].Parts[i]>0 then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    end;
-  kEShipPart:
-    begin
-    Lines[0]:=0;
-    for i:=0 to nShipPart-1 do
-      if MyRO.Ship[DipMem[me].pContact].Parts[i]>0 then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
-    end;
-  kGov:
-    for i:=1 to nGov-1 do
-      if (GovPreq[i]<>preNA) and ((GovPreq[i]=preNone)
-        or (MyRO.Tech[GovPreq[i]]>=tsApplicable)) then
-        begin code[0,Lines[0]]:=i; inc(Lines[0]) end;
-  kMission:
-    for i:=0 to nSpyMission-1 do
-      begin code[0,Lines[0]]:=i; inc(Lines[0]) end;
-  end;
-
-if Kind=kProject then // test if choice fitting to one screen
-  if Lines[0]+Lines[1]+Lines[2]<=MaxLines then
-    begin
-    for i:=0 to Lines[1]-1 do // add wonders to first page
-      begin code[0,Lines[0]]:=code[1,i]; inc(Lines[0]); end;
-    Lines[1]:=0;
-    FirstShrinkedLine[0]:=Lines[0];
-    for i:=0 to Lines[2]-1 do // add models to first page
-      begin code[0,Lines[0]]:=code[2,i]; inc(Lines[0]); end;
-    Lines[2]:=0;
+      for i := 0 to Lines[1] - 1 do // add wonders to first page
+      begin
+        code[0, Lines[0]] := code[1, i];
+        inc(Lines[0]);
+      end;
+      Lines[1] := 0;
+      FirstShrinkedLine[0] := Lines[0];
+      for i := 0 to Lines[2] - 1 do // add models to first page
+      begin
+        code[0, Lines[0]] := code[2, i];
+        inc(Lines[0]);
+      end;
+      Lines[2] := 0;
     end;
 end; // InitLines
@@ -1230 +1498 @@
 function TListDlg.OnlyChoice(TestKind: TListKind): integer;
 begin
-Kind:=TestKind;
-InitLines;
-if Lines[0]=0 then result:=-2
-else if Lines[0]>1 then result:=-1
-else result:=code[0,0];
+  Kind := TestKind;
+  InitLines;
+  if Lines[0] = 0 then
+    result := -2
+  else if Lines[0] > 1 then
+    result := -1
+  else
+    result := code[0, 0];
 end;
 
 procedure TListDlg.FormShow(Sender: TObject);
 var
-i: integer;
-begin
-result:=-1;
-Closable:=false;
-
-if Kind=kTribe then
-  begin
-  LineDistance:=21; // looks ugly with scrollbar
-  MaxLines:=(hMainTexture-(24+TitleHeight+NarrowFrame)) div LineDistance -1;
+  i: integer;
+begin
+  result := -1;
+  Closable := false;
+
+  if Kind = kTribe then
+  begin
+    LineDistance := 21; // looks ugly with scrollbar
+    MaxLines := (hMaintexture - (24 + TitleHeight + NarrowFrame))
+      div LineDistance - 1;
   end
-else
-  begin
-  LineDistance:=24;
-  MaxLines:=(hMainTexture-(24+TitleHeight+WideFrame)) div LineDistance -1;
-  end;
-InitLines;
-
-MultiPage:=false;
-for i:=1 to MaxLayer-1 do if Lines[i]>0 then MultiPage:=true;
-WideBottom:=MultiPage or (Kind=kScience)
-  or not Phrases2FallenBackToEnglish
-    and (Kind in [kProject,kAdvance,kFarAdvance]);
-if (Kind=kAdvance) and (MyData.FarTech<>adNone)
-  or (Kind=kModels) or (Kind=kEModels) then
-  TitleHeight:=WideFrame+20
-else TitleHeight:=WideFrame;
-
-DispLines:=Lines[0];
-for i:=0 to MaxLayer-1 do if Lines[i]>DispLines then DispLines:=Lines[i];
-if WideBottom then
-  begin
-  if DispLines>MaxLines then
-    DispLines:=MaxLines;
-  InnerHeight:=LineDistance*(DispLines+1)+24;
-  ClientHeight:=InnerHeight+TitleHeight+WideFrame
+  else
+  begin
+    LineDistance := 24;
+    MaxLines := (hMaintexture - (24 + TitleHeight + WideFrame))
+      div LineDistance - 1;
+  end;
+  InitLines;
+
+  MultiPage := false;
+  for i := 1 to MaxLayer - 1 do
+    if Lines[i] > 0 then
+      MultiPage := true;
+  WideBottom := MultiPage or (Kind = kScience) or
+    not Phrases2FallenBackToEnglish and
+    (Kind in [kProject, kAdvance, kFarAdvance]);
+  if (Kind = kAdvance) and (MyData.FarTech <> adNone) or (Kind = kModels) or
+    (Kind = kEModels) then
+    TitleHeight := WideFrame + 20
+  else
+    TitleHeight := WideFrame;
+
+  DispLines := Lines[0];
+  for i := 0 to MaxLayer - 1 do
+    if Lines[i] > DispLines then
+      DispLines := Lines[i];
+  if WideBottom then
+  begin
+    if DispLines > MaxLines then
+      DispLines := MaxLines;
+    InnerHeight := LineDistance * (DispLines + 1) + 24;
+    ClientHeight := InnerHeight + TitleHeight + WideFrame
   end
-else
-  begin
-  if DispLines>MaxLines then
-    DispLines:=MaxLines;
-  InnerHeight:=LineDistance*(DispLines+1)+24;
-  ClientHeight:=InnerHeight+TitleHeight+NarrowFrame;
-  end;
-assert(ClientHeight<=hMainTexture);
-
-TechNameSpace:=224;
-case Kind of
-  kGov: InnerWidth:=272;
-  kCities, kCityEvents: InnerWidth:=640-18;
-  kTribe:
-    if Lines[0]>MaxLines then InnerWidth:=280+GetSystemMetrics(SM_CXVSCROLL)
-    else InnerWidth:=280;
-  kScience:
-    begin
-    InnerWidth:=104-33+15+8+TechNameSpace+24*nColumn+GetSystemMetrics(SM_CXVSCROLL);
-    if InnerWidth+2*SideFrame>640 then
-      begin
-      TechNameSpace:=TechNameSpace+640-InnerWidth-2*SideFrame;
-      InnerWidth:=640-2*SideFrame
-      end
-    end;
-  kAdvance,kFarAdvance:
-    InnerWidth:=104-33+15+8+TechNameSpace+24+GetSystemMetrics(SM_CXVSCROLL);
-  kChooseTech, kChooseETech, kStealTech:
-    InnerWidth:=104-33+15+8+TechNameSpace+GetSystemMetrics(SM_CXVSCROLL);
-  else InnerWidth:=363;
-  end;
-ClientWidth:=InnerWidth+2*SideFrame;
-
-CloseBtn.Left:=ClientWidth-38;
-CaptionLeft:=ToggleBtn.Left+ToggleBtn.Width;
-CaptionRight:=CloseBtn.Left;
-SetWindowPos(sb.h,0,SideFrame+InnerWidth-GetSystemMetrics(SM_CXVSCROLL),
-  TitleHeight,GetSystemMetrics(SM_CXVSCROLL),LineDistance*DispLines+48,
-  SWP_NOZORDER or SWP_NOREDRAW);
-
-if WindowMode=wmModal then
-  begin {center on screen}
-  if Kind=kTribe then
-    Left:=(Screen.Width-800)*3 div 8+130
-  else Left:=(Screen.Width-Width) div 2;
-  Top:=(Screen.Height-Height) div 2;
-  if Kind=kProject then
-    Top:=Top+48;
-  end;
-
-Layer0Btn.Visible:= MultiPage and (Lines[0]>0);
-Layer1Btn.Visible:= MultiPage and (Lines[1]>0);
-Layer2Btn.Visible:= MultiPage and (Lines[2]>0);
-if Kind=kProject then
-  begin
-  Layer0Btn.Top:=ClientHeight-31;
-  Layer0Btn.Left:=ClientWidth div 2-(12+29);
-  Layer0Btn.Down:=true;
-  Layer1Btn.Top:=ClientHeight-31;
-  Layer1Btn.Left:=ClientWidth div 2-(12-29);
-  Layer1Btn.Down:=false;
-  Layer2Btn.Top:=ClientHeight-31;
-  Layer2Btn.Left:=ClientWidth div 2-12;
-  Layer2Btn.Down:=false;
-  end;
-
-Layer:=0;
-Sel:=-2;
-ScienceNation:=-1;
-InitPVSB(sb,Lines[Layer]-1,DispLines);
-
-OffscreenPaint;
+  else
+  begin
+    if DispLines > MaxLines then
+      DispLines := MaxLines;
+    InnerHeight := LineDistance * (DispLines + 1) + 24;
+    ClientHeight := InnerHeight + TitleHeight + NarrowFrame;
+  end;
+  assert(ClientHeight <= hMaintexture);
+
+  TechNameSpace := 224;
+  case Kind of
+    kGov:
+      InnerWidth := 272;
+    kCities, kCityEvents:
+      InnerWidth := 640 - 18;
+    kTribe:
+      if Lines[0] > MaxLines then
+        InnerWidth := 280 + GetSystemMetrics(SM_CXVSCROLL)
+      else
+        InnerWidth := 280;
+    kScience:
+      begin
+        InnerWidth := 104 - 33 + 15 + 8 + TechNameSpace + 24 * nColumn +
+          GetSystemMetrics(SM_CXVSCROLL);
+        if InnerWidth + 2 * SideFrame > 640 then
+        begin
+          TechNameSpace := TechNameSpace + 640 - InnerWidth - 2 * SideFrame;
+          InnerWidth := 640 - 2 * SideFrame
+        end
+      end;
+    kAdvance, kFarAdvance:
+      InnerWidth := 104 - 33 + 15 + 8 + TechNameSpace + 24 +
+        GetSystemMetrics(SM_CXVSCROLL);
+    kChooseTech, kChooseETech, kStealTech:
+      InnerWidth := 104 - 33 + 15 + 8 + TechNameSpace +
+        GetSystemMetrics(SM_CXVSCROLL);
+  else
+    InnerWidth := 363;
+  end;
+  ClientWidth := InnerWidth + 2 * SideFrame;
+
+  CloseBtn.Left := ClientWidth - 38;
+  CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
+  CaptionRight := CloseBtn.Left;
+  SetWindowPos(sb.h, 0, SideFrame + InnerWidth - GetSystemMetrics(SM_CXVSCROLL),
+    TitleHeight, GetSystemMetrics(SM_CXVSCROLL), LineDistance * DispLines + 48,
+    SWP_NOZORDER or SWP_NOREDRAW);
+
+  if WindowMode = wmModal then
+  begin { center on screen }
+    if Kind = kTribe then
+      Left := (Screen.Width - 800) * 3 div 8 + 130
+    else
+      Left := (Screen.Width - Width) div 2;
+    Top := (Screen.Height - Height) div 2;
+    if Kind = kProject then
+      Top := Top + 48;
+  end;
+
+  Layer0Btn.Visible := MultiPage and (Lines[0] > 0);
+  Layer1Btn.Visible := MultiPage and (Lines[1] > 0);
+  Layer2Btn.Visible := MultiPage and (Lines[2] > 0);
+  if Kind = kProject then
+  begin
+    Layer0Btn.Top := ClientHeight - 31;
+    Layer0Btn.Left := ClientWidth div 2 - (12 + 29);
+    Layer0Btn.Down := true;
+    Layer1Btn.Top := ClientHeight - 31;
+    Layer1Btn.Left := ClientWidth div 2 - (12 - 29);
+    Layer1Btn.Down := false;
+    Layer2Btn.Top := ClientHeight - 31;
+    Layer2Btn.Left := ClientWidth div 2 - 12;
+    Layer2Btn.Down := false;
+  end;
+
+  Layer := 0;
+  Sel := -2;
+  ScienceNation := -1;
+  InitPVSB(sb, Lines[Layer] - 1, DispLines);
+
+  OffscreenPaint;
 end;
 
 procedure TListDlg.ShowNewContent(NewMode: integer; ListKind: TListKind);
 var
-i: integer;
-ShowFocus, forceclose: boolean;
-begin
-forceclose:= (ListKind<>Kind)
-  and not ((Kind=kCities) and (ListKind=kCityEvents))
-  and not ((Kind=kCityEvents) and (ListKind=kCities))
-  and not ((Kind=kModels) and (ListKind=kEModels))
-  and not ((Kind=kEModels) and (ListKind=kModels));
-
-Kind:=ListKind;
-ModalIndication:= not (Kind in MustChooseKind);
-case Kind of
-  kProject: Caption:=Phrases.Lookup('TITLE_PROJECT');
-  kAdvance: Caption:=Phrases.Lookup('TITLE_TECHSELECT');
-  kFarAdvance: Caption:=Phrases.Lookup('TITLE_FARTECH');
-  kModels, kEModels: Caption:=Phrases.Lookup('FRMILREP');
-  kAllEModels: Caption:=Phrases.Lookup('TITLE_EMODELS');
-  kTribe: Caption:=Phrases.Lookup('TITLE_TRIBE');
-  kScience: Caption:=Phrases.Lookup('TITLE_SCIENCE');
-  kShipPart, kEShipPart: Caption:=Phrases.Lookup('TITLE_CHOOSESHIPPART');
-  kChooseTech, kChooseETech: Caption:=Phrases.Lookup('TITLE_CHOOSETECH');
-  kChooseModel, kChooseEModel: Caption:=Phrases.Lookup('TITLE_CHOOSEMODEL');
-  kStealTech: Caption:=Phrases.Lookup('TITLE_CHOOSETECH');
-  kGov: Caption:=Phrases.Lookup('TITLE_GOV');
-  kMission: Caption:=Phrases.Lookup('TITLE_SPYMISSION');
-  end;
-
-case Kind of
-  kMission: HelpContext:='SPYMISSIONS';
-  else HelpContext:='CONCEPTS'
-  end;
-
-if Kind=kAdvance then
-  begin
-  ToggleBtn.ButtonIndex:=13;
-  ToggleBtn.Hint:=Phrases.Lookup('FARTECH')
+  i: integer;
+  ShowFocus, forceclose: boolean;
+begin
+  forceclose := (ListKind <> Kind) and
+    not((Kind = kCities) and (ListKind = kCityEvents)) and
+    not((Kind = kCityEvents) and (ListKind = kCities)) and
+    not((Kind = kModels) and (ListKind = kEModels)) and
+    not((Kind = kEModels) and (ListKind = kModels));
+
+  Kind := ListKind;
+  ModalIndication := not(Kind in MustChooseKind);
+  case Kind of
+    kProject:
+      Caption := Phrases.Lookup('TITLE_PROJECT');
+    kAdvance:
+      Caption := Phrases.Lookup('TITLE_TECHSELECT');
+    kFarAdvance:
+      Caption := Phrases.Lookup('TITLE_FARTECH');
+    kModels, kEModels:
+      Caption := Phrases.Lookup('FRMILREP');
+    kAllEModels:
+      Caption := Phrases.Lookup('TITLE_EMODELS');
+    kTribe:
+      Caption := Phrases.Lookup('TITLE_TRIBE');
+    kScience:
+      Caption := Phrases.Lookup('TITLE_SCIENCE');
+    kShipPart, kEShipPart:
+      Caption := Phrases.Lookup('TITLE_CHOOSESHIPPART');
+    kChooseTech, kChooseETech:
+      Caption := Phrases.Lookup('TITLE_CHOOSETECH');
+    kChooseModel, kChooseEModel:
+      Caption := Phrases.Lookup('TITLE_CHOOSEMODEL');
+    kStealTech:
+      Caption := Phrases.Lookup('TITLE_CHOOSETECH');
+    kGov:
+      Caption := Phrases.Lookup('TITLE_GOV');
+    kMission:
+      Caption := Phrases.Lookup('TITLE_SPYMISSION');
+  end;
+
+  case Kind of
+    kMission:
+      HelpContext := 'SPYMISSIONS';
+  else
+    HelpContext := 'CONCEPTS'
+  end;
+
+  if Kind = kAdvance then
+  begin
+    ToggleBtn.ButtonIndex := 13;
+    ToggleBtn.Hint := Phrases.Lookup('FARTECH')
   end
-else if Kind=kCities then
-  begin
-  ToggleBtn.ButtonIndex:=15;
-  ToggleBtn.Hint:=Phrases.Lookup('BTN_PAGE')
+  else if Kind = kCities then
+  begin
+    ToggleBtn.ButtonIndex := 15;
+    ToggleBtn.Hint := Phrases.Lookup('BTN_PAGE')
   end
-else
-  begin
-  ToggleBtn.ButtonIndex:=28;
-  ToggleBtn.Hint:=Phrases.Lookup('BTN_SELECT')
-  end;
-
-if Kind=kAdvance then // show focus button?
-  if MyData.FarTech<>adNone then
-    ShowFocus:=true
   else
+  begin
+    ToggleBtn.ButtonIndex := 28;
+    ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT')
+  end;
+
+  if Kind = kAdvance then // show focus button?
+    if MyData.FarTech <> adNone then
+      ShowFocus := true
+    else
     begin
-    ShowFocus:=false;
-    for i:=0 to nAdv-1 do
-      if not (i in FutureTech) and (MyRO.Tech[i]<tsApplicable)
-        and ((AdvValue[i]<2000) or (MyRO.Tech[adMassProduction]>tsNA))
-        and ((AdvValue[i]<1000) or (MyRO.Tech[adScience]>tsNA))
-        and (Server(sSetResearch-sExecute,me,i,nil^)<rExecuted) then
-        ShowFocus:=true;
+      ShowFocus := false;
+      for i := 0 to nAdv - 1 do
+        if not(i in FutureTech) and (MyRO.Tech[i] < tsApplicable) and
+          ((AdvValue[i] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
+          ((AdvValue[i] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
+          (Server(sSetResearch - sExecute, me, i, nil^) < rExecuted) then
+          ShowFocus := true;
     end;
-ToggleBtn.Visible:= (Kind=kCities) and not supervising
-  or (Kind=kAdvance) and ShowFocus
-  or (Kind=kModels)
-  or (Kind=kEModels);
-CloseBtn.Visible:= not(Kind in MustChooseKind);
-
-inherited ShowNewContent(NewMode, forceclose);
+  ToggleBtn.Visible := (Kind = kCities) and not supervising or (Kind = kAdvance)
+    and ShowFocus or (Kind = kModels) or (Kind = kEModels);
+  CloseBtn.Visible := not(Kind in MustChooseKind);
+
+  inherited ShowNewContent(NewMode, forceclose);
 end; // ShowNewContent
 
 procedure TListDlg.ShowNewContent_CityProject(NewMode, cix: integer);
 begin
-cixProject:=cix;
-ShowNewContent(NewMode, kProject);
+  cixProject := cix;
+  ShowNewContent(NewMode, kProject);
 end;
 
 procedure TListDlg.ShowNewContent_MilReport(NewMode, p: integer);
 begin
-pView:=p;
-if p=me then ShowNewContent(NewMode, kModels)
-else ShowNewContent(NewMode, kEModels)
+  pView := p;
+  if p = me then
+    ShowNewContent(NewMode, kModels)
+  else
+    ShowNewContent(NewMode, kEModels)
 end;
 
 procedure TListDlg.PlayerClick(Sender: TObject);
 begin
-if TComponent(Sender).Tag=me then Kind:=kModels
-else
-  begin
-  Kind:=kEModels;
-  pView:=TComponent(Sender).Tag;
-  end;
-InitLines;
-Sel:=-2;
-InitPVSB(sb,Lines[Layer]-1,DispLines);
-OffscreenPaint;
-Invalidate
+  if TComponent(Sender).Tag = me then
+    Kind := kModels
+  else
+  begin
+    Kind := kEModels;
+    pView := TComponent(Sender).Tag;
+  end;
+  InitLines;
+  Sel := -2;
+  InitPVSB(sb, Lines[Layer] - 1, DispLines);
+  OffscreenPaint;
+  Invalidate
 end;
 
 procedure TListDlg.ModeBtnClick(Sender: TObject);
 begin
-Layer0Btn.Down:= Sender=Layer0Btn;
-Layer1Btn.Down:= Sender=Layer1Btn;
-Layer2Btn.Down:= Sender=Layer2Btn;
-Layer:=TComponent(Sender).Tag;
-
-Sel:=-2;
-InitPVSB(sb,Lines[Layer]-1,DispLines);
-SmartUpdateContent
+  Layer0Btn.Down := Sender = Layer0Btn;
+  Layer1Btn.Down := Sender = Layer1Btn;
+  Layer2Btn.Down := Sender = Layer2Btn;
+  Layer := TComponent(Sender).Tag;
+
+  Sel := -2;
+  InitPVSB(sb, Lines[Layer] - 1, DispLines);
+  SmartUpdateContent
 end;
 
 procedure TListDlg.ToggleBtnClick(Sender: TObject);
 var
-p1: integer;
-m: TMenuItem;
-begin
-case Kind of
-  kAdvance:
-    begin
-    result:=adFar;
-    Closable:=true;
-    Close
-    end;
-  kCities, kCityEvents:
-    begin
-    if Kind=kCities then Kind:=kCityEvents
-    else Kind:=kCities;
-    OffscreenPaint;
-    Invalidate;
-    end;
-  kModels, kEModels:
-    begin
-    EmptyMenu(Popup.Items);
-    if G.Difficulty[me]>0 then
-      begin
-      m:=TMenuItem.Create(Popup);
-      m.RadioItem:=true;
-      m.Caption:=Tribe[me].TPhrase('SHORTNAME');
-      m.Tag:=me;
-      m.OnClick:=PlayerClick;
-      if Kind=kModels then m.Checked:=true;
-      Popup.Items.Add(m);
-      end;
-    for p1:=0 to nPl-1 do
-      if (p1<>me) and (MyRO.EnemyReport[p1]<>nil)
-        and (MyRO.EnemyReport[p1].TurnOfMilReport>=0) then
-        begin
-        m:=TMenuItem.Create(Popup);
-        m.RadioItem:=true;
-        m.Caption:=Tribe[p1].TPhrase('SHORTNAME');
-        m.Tag:=p1;
-        m.OnClick:=PlayerClick;
-        if (Kind=kEModels) and (p1=pView) then m.Checked:=true;
-        Popup.Items.Add(m);
-        end;
-    Popup.Popup(Left+ToggleBtn.Left, Top+ToggleBtn.Top+ToggleBtn.Height);
-    end
+  p1: integer;
+  m: TMenuItem;
+begin
+  case Kind of
+    kAdvance:
+      begin
+        result := adFar;
+        Closable := true;
+        Close
+      end;
+    kCities, kCityEvents:
+      begin
+        if Kind = kCities then
+          Kind := kCityEvents
+        else
+          Kind := kCities;
+        OffscreenPaint;
+        Invalidate;
+      end;
+    kModels, kEModels:
+      begin
+        EmptyMenu(Popup.Items);
+        if G.Difficulty[me] > 0 then
+        begin
+          m := TMenuItem.Create(Popup);
+          m.RadioItem := true;
+          m.Caption := Tribe[me].TPhrase('SHORTNAME');
+          m.Tag := me;
+          m.OnClick := PlayerClick;
+          if Kind = kModels then
+            m.Checked := true;
+          Popup.Items.Add(m);
+        end;
+        for p1 := 0 to nPl - 1 do
+          if (p1 <> me) and (MyRO.EnemyReport[p1] <> nil) and
+            (MyRO.EnemyReport[p1].TurnOfMilReport >= 0) then
+          begin
+            m := TMenuItem.Create(Popup);
+            m.RadioItem := true;
+            m.Caption := Tribe[p1].TPhrase('SHORTNAME');
+            m.Tag := p1;
+            m.OnClick := PlayerClick;
+            if (Kind = kEModels) and (p1 = pView) then
+              m.Checked := true;
+            Popup.Items.Add(m);
+          end;
+        Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top +
+          ToggleBtn.Height);
+      end
   end
 end;
@@ -1513 +1821 @@
   Shift: TShiftState);
 begin
-if (Key=VK_F2) and (Kind in [kModels,kEModels]) then // my key
-  // !!! toggle
-else if (Key=VK_F3) and (Kind in [kCities,kCityEvents]) then // my key
-  ToggleBtnClick(nil)
-else if ((Key=VK_ESCAPE) or (Key=VK_RETURN)) and not CloseBtn.Visible then // prevent closing
-else inherited
+  if (Key = VK_F2) and (Kind in [kModels, kEModels]) then // my key
+    // !!! toggle
+  else if (Key = VK_F3) and (Kind in [kCities, kCityEvents]) then // my key
+    ToggleBtnClick(nil)
+  else if ((Key = VK_ESCAPE) or (Key = VK_RETURN)) and not CloseBtn.Visible then
+  // prevent closing
+  else
+    inherited
 end;
 
 procedure TListDlg.EcoChange;
 begin
-if Visible and (Kind=kCities) then SmartUpdateContent
+  if Visible and (Kind = kCities) then
+    SmartUpdateContent
 end;
 
 procedure TListDlg.TechChange;
 begin
-if Visible and (Kind=kScience) then
-  begin
-  FormShow(nil);
-  Invalidate;
+  if Visible and (Kind = kScience) then
+  begin
+    FormShow(nil);
+    Invalidate;
   end;
 end;
@@ -1537 +1848 @@
 procedure TListDlg.AddCity;
 begin
-if Visible and (Kind=kCities) then
-  begin
-  FormShow(nil);
-  Invalidate;
+  if Visible and (Kind = kCities) then
+  begin
+    FormShow(nil);
+    Invalidate;
   end;
 end;
@@ -1546 +1857 @@
 procedure TListDlg.RemoveUnit;
 begin
-if ListDlg.Visible and (Kind=kModels) then
-  SmartUpdateContent;
+  if ListDlg.Visible and (Kind = kModels) then
+    SmartUpdateContent;
 end;
 
 end.
-

trunk/LocalPlayer/TechTree.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit TechTree;
 
@@ -6 +5 @@
 
 uses
-  ScreenTools,Messg,
+  ScreenTools, Messg,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
@@ -21 +20 @@
     procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X,
-      Y: Integer);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CloseBtnClick(Sender: TObject);
   private
-    xOffset, yOffset, xDown, yDown: integer;
+    xOffset, yOffset, xDown, yDown: Integer;
     Image: TBitmap;
     dragging: boolean;
@@ -43 +40 @@
 
 const
-BlackBorder=4;
-LeftBorder=72; RightBorder=45; TopBorder=16; BottomBorder=48;
-xStart=0; yStart=40;
-xPitch=160; yPitch=90;
-xLegend=44; yLegend=79; yLegendPitch=32;
-
-function min(a,b: integer): integer;
-begin
-if a<b then
-  result:=a
-else result:=b;
-end;
-
-function max(a,b: integer): integer;
-begin
-if a>b then
-  result:=a
-else result:=b;
+  BlackBorder = 4;
+  LeftBorder = 72;
+  RightBorder = 45;
+  TopBorder = 16;
+  BottomBorder = 48;
+  xStart = 0;
+  yStart = 40;
+  xPitch = 160;
+  yPitch = 90;
+  xLegend = 44;
+  yLegend = 79;
+  yLegendPitch = 32;
+
+function min(a, b: Integer): Integer;
+begin
+  if a < b then
+    result := a
+  else
+    result := b;
+end;
+
+function max(a, b: Integer): Integer;
+begin
+  if a > b then
+    result := a
+  else
+    result := b;
 end;
 
 procedure TTechTreeDlg.FormCreate(Sender: TObject);
 begin
-InitButtons;
-Image:=nil;
+  InitButtons;
+  Image := nil;
 end;
 
 procedure TTechTreeDlg.FormPaint(Sender: TObject);
 var
-x,w: integer;
-begin
-with Canvas do
-  begin
-  // black border
-  brush.color:=$000000;
-  fillrect(rect(0,0,BlackBorder,ClientHeight));
-  fillrect(rect(BlackBorder,0,ClientWidth-BlackBorder,BlackBorder));
-  fillrect(rect(ClientWidth-BlackBorder,0,ClientWidth,ClientHeight));
-  fillrect(rect(BlackBorder,ClientHeight-BlackBorder,ClientWidth-BlackBorder,
-    ClientHeight));
-
-  // texturize empty space
-  brush.color:=$FFFFFF;
-  if xOffset>0 then
-    FillRectSeamless(Canvas,BlackBorder,BlackBorder,BlackBorder+xOffset,
-      ClientHeight-BlackBorder,-BlackBorder-xOffset,-BlackBorder-yOffset,Paper);
-  if xOffset+Image.width<ClientWidth-2*BlackBorder then
-    FillRectSeamless(Canvas,BlackBorder+xOffset+Image.width,BlackBorder,
-      ClientWidth-BlackBorder,ClientHeight-BlackBorder,-BlackBorder-xOffset,
-      -BlackBorder-yOffset,Paper);
-  x:=max(BlackBorder,BlackBorder+xOffset);
-  w:=min(BlackBorder+xOffset+Image.width,ClientWidth-BlackBorder);
-  if yOffset>0 then
-    FillRectSeamless(Canvas,x,BlackBorder,w,BlackBorder+yOffset,
-      -BlackBorder-xOffset,-BlackBorder-yOffset,Paper);
-  if yOffset+Image.height<ClientHeight-2*BlackBorder then
-    FillRectSeamless(Canvas,x,BlackBorder+yOffset+Image.height,w,
-      ClientHeight-BlackBorder,-BlackBorder-xOffset,-BlackBorder-yOffset,Paper);
+  X, w: Integer;
+begin
+  with Canvas do
+  begin
+    // black border
+    brush.color := $000000;
+    fillrect(rect(0, 0, BlackBorder, ClientHeight));
+    fillrect(rect(BlackBorder, 0, ClientWidth - BlackBorder, BlackBorder));
+    fillrect(rect(ClientWidth - BlackBorder, 0, ClientWidth, ClientHeight));
+    fillrect(rect(BlackBorder, ClientHeight - BlackBorder,
+      ClientWidth - BlackBorder, ClientHeight));
+
+    // texturize empty space
+    brush.color := $FFFFFF;
+    if xOffset > 0 then
+      FillRectSeamless(Canvas, BlackBorder, BlackBorder, BlackBorder + xOffset,
+        ClientHeight - BlackBorder, -BlackBorder - xOffset,
+        -BlackBorder - yOffset, Paper);
+    if xOffset + Image.width < ClientWidth - 2 * BlackBorder then
+      FillRectSeamless(Canvas, BlackBorder + xOffset + Image.width, BlackBorder,
+        ClientWidth - BlackBorder, ClientHeight - BlackBorder,
+        -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
+    X := max(BlackBorder, BlackBorder + xOffset);
+    w := min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
+    if yOffset > 0 then
+      FillRectSeamless(Canvas, X, BlackBorder, w, BlackBorder + yOffset,
+        -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
+    if yOffset + Image.height < ClientHeight - 2 * BlackBorder then
+      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, w,
+        ClientHeight - BlackBorder, -BlackBorder - xOffset,
+        -BlackBorder - yOffset, Paper);
   end;
-BitBlt(Canvas.Handle,max(BlackBorder,BlackBorder+xOffset),
-  max(BlackBorder,BlackBorder+yOffset),
-  min(Image.width,min(Image.width+xOffset,
-    min(ClientWidth-2*BlackBorder,ClientWidth-2*BlackBorder-xOffset))),
-  min(Image.Height,min(Image.height+yOffset,
-    min(ClientHeight-2*BlackBorder,ClientHeight-2*BlackBorder-yOffset))),
-  Image.Canvas.Handle,max(0,-xOffset),max(0,-yOffset),SRCCOPY);
+  BitBlt(Canvas.Handle, max(BlackBorder, BlackBorder + xOffset),
+    max(BlackBorder, BlackBorder + yOffset),
+    min(Image.width, min(Image.width + xOffset,
+    min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
+    ), min(Image.height, min(Image.height + yOffset,
+    min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
+    yOffset))), Image.Canvas.Handle, max(0, -xOffset),
+    max(0, -yOffset), SRCCOPY);
 end;
 
 procedure TTechTreeDlg.FormShow(Sender: TObject);
 type
-TLine=array[0..9999,0..2] of Byte;
+  TLine = array [0 .. 9999, 0 .. 2] of Byte;
 var
-x,y,ad,TexWidth,TexHeight: integer;
-s: string;
-SrcLine, DstLine: ^TLine;
-begin
-if Image=nil then
-  begin
-  Image:=TBitmap.Create;
-  LoadGraphicFile(Image, HomeDir+'Help\AdvTree',gfNoGamma);
-  Image.PixelFormat:=pf24bit;
-
-  with Image.Canvas do
+  X, Y, ad, TexWidth, TexHeight: Integer;
+  s: string;
+  SrcLine, DstLine: ^TLine;
+begin
+  if Image = nil then
+  begin
+    Image := TBitmap.Create;
+    LoadGraphicFile(Image, HomeDir + 'Help\AdvTree', gfNoGamma);
+    Image.PixelFormat := pf24bit;
+
+    with Image.Canvas do
     begin
-    // write advance names
-    Font.Assign(UniFont[ftSmall]);
-    Font.Color:=clBlack;
-    Brush.Style:=bsClear;
-    for x:=0 to (Image.width-xStart) div xPitch do
-      for y:=0 to (Image.height-yStart) div yPitch do
+      // write advance names
+      Font.Assign(UniFont[ftSmall]);
+      Font.color := clBlack;
+      brush.Style := bsClear;
+      for X := 0 to (Image.width - xStart) div xPitch do
+        for Y := 0 to (Image.height - yStart) div yPitch do
         begin
-        ad:=Pixels[xStart+x*xPitch+10,yStart+y*yPitch-1];
-        if ad and $FFFF00=0 then
+          ad := Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1];
+          if ad and $FFFF00 = 0 then
           begin
-          s:=Phrases.Lookup('ADVANCES',ad);
-          while TextWidth(s)>112 do
-            Delete(s,Length(s),1);
-          TextOut(xStart+x*xPitch+2,yStart+y*yPitch,s);
-          Pixels[xStart+x*xPitch+10,yStart+y*yPitch-1]:=$7F007F;
+            s := Phrases.Lookup('ADVANCES', ad);
+            while TextWidth(s) > 112 do
+              Delete(s, Length(s), 1);
+            TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
+            Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
+              := $7F007F;
           end
         end;
 
-    // write legend
-    TextOut(xLegend,yLegend,Phrases2.Lookup('ADVTREE_UP0'));
-    TextOut(xLegend,yLegend+yLegendPitch,Phrases2.Lookup('ADVTREE_UP1'));
-    TextOut(xLegend,yLegend+2*yLegendPitch,Phrases2.Lookup('ADVTREE_UP2'));
-    TextOut(xLegend,yLegend+3*yLegendPitch,Phrases2.Lookup('ADVTREE_GOV'));
-    TextOut(xLegend,yLegend+4*yLegendPitch,Phrases2.Lookup('ADVTREE_OTHER'));
+      // write legend
+      TextOut(xLegend, yLegend, Phrases2.Lookup('ADVTREE_UP0'));
+      TextOut(xLegend, yLegend + yLegendPitch, Phrases2.Lookup('ADVTREE_UP1'));
+      TextOut(xLegend, yLegend + 2 * yLegendPitch,
+        Phrases2.Lookup('ADVTREE_UP2'));
+      TextOut(xLegend, yLegend + 3 * yLegendPitch,
+        Phrases2.Lookup('ADVTREE_GOV'));
+      TextOut(xLegend, yLegend + 4 * yLegendPitch,
+        Phrases2.Lookup('ADVTREE_OTHER'));
     end;
 
-  // texturize background
-  TexWidth:=Paper.width;
-  TexHeight:=Paper.height;
-  for y:=0 to Image.height-1 do
+    // texturize background
+    TexWidth := Paper.width;
+    TexHeight := Paper.height;
+    for Y := 0 to Image.height - 1 do
     begin
-    SrcLine:=Paper.ScanLine[y mod TexHeight];
-    DstLine:=Image.ScanLine[y];
-    for x:=0 to Image.Width-1 do
+      SrcLine := Paper.ScanLine[Y mod TexHeight];
+      DstLine := Image.ScanLine[Y];
+      for X := 0 to Image.width - 1 do
       begin
-      if Cardinal((@DstLine[x])^) and $FFFFFF=$7F007F then // transparent
-        DstLine[x]:=SrcLine[x mod TexWidth];
+        if Cardinal((@DstLine[X])^) and $FFFFFF = $7F007F then // transparent
+          DstLine[X] := SrcLine[X mod TexWidth];
       end
     end
   end;
 
-// fit window to image, center image in window, center window to screen
-Width:=min(Screen.Width-40,Image.Width+LeftBorder+RightBorder+2*BlackBorder);
-Height:=min(Screen.Height-40,Image.Height+TopBorder+BottomBorder+2*BlackBorder);
-Left:=(Screen.Width-Width) div 2;
-Top:=(Screen.Height-Height) div 2;
-CloseBtn.Left:=Width-CloseBtn.Width-BlackBorder-8;
-CloseBtn.Top:=BlackBorder+8;
-xOffset:=(ClientWidth-Image.width+LeftBorder-RightBorder) div 2-BlackBorder;
-yOffset:=ClientHeight-2*BlackBorder-Image.height-BottomBorder;
+  // fit window to image, center image in window, center window to screen
+  width := min(Screen.width - 40, Image.width + LeftBorder + RightBorder + 2 *
+    BlackBorder);
+  height := min(Screen.height - 40, Image.height + TopBorder + BottomBorder + 2
+    * BlackBorder);
+  Left := (Screen.width - width) div 2;
+  Top := (Screen.height - height) div 2;
+  CloseBtn.Left := width - CloseBtn.width - BlackBorder - 8;
+  CloseBtn.Top := BlackBorder + 8;
+  xOffset := (ClientWidth - Image.width + LeftBorder - RightBorder) div 2 -
+    BlackBorder;
+  yOffset := ClientHeight - 2 * BlackBorder - Image.height - BottomBorder;
 end;
 
@@ -181 +197 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-if Button=mbLeft then
-  begin
-  dragging:=true;
-  xDown:=x;
-  yDown:=y;
+  if Button = mbLeft then
+  begin
+    dragging := true;
+    xDown := X;
+    yDown := Y;
   end
 end;
@@ -192 +208 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-dragging:=false;
+  dragging := false;
 end;
 
@@ -198 +214 @@
   X, Y: Integer);
 begin
-if dragging then
-  begin
-  xOffset:=xOffset+x-xDown;
-  yOffset:=yOffset+y-yDown;
-  xDown:=x;
-  yDown:=y;
-
-  if xOffset>LeftBorder then
-    xOffset:=LeftBorder;
-  if xOffset<ClientWidth-2*BlackBorder-Image.width-RightBorder then
-    xOffset:=ClientWidth-2*BlackBorder-Image.width-RightBorder;
-  if yOffset>TopBorder then
-    yOffset:=TopBorder;
-  if yOffset<ClientHeight-2*BlackBorder-Image.height-BottomBorder then
-    yOffset:=ClientHeight-2*BlackBorder-Image.height-BottomBorder;
-
-  SmartInvalidate;
+  if dragging then
+  begin
+    xOffset := xOffset + X - xDown;
+    yOffset := yOffset + Y - yDown;
+    xDown := X;
+    yDown := Y;
+
+    if xOffset > LeftBorder then
+      xOffset := LeftBorder;
+    if xOffset < ClientWidth - 2 * BlackBorder - Image.width - RightBorder then
+      xOffset := ClientWidth - 2 * BlackBorder - Image.width - RightBorder;
+    if yOffset > TopBorder then
+      yOffset := TopBorder;
+    if yOffset < ClientHeight - 2 * BlackBorder - Image.height - BottomBorder
+    then
+      yOffset := ClientHeight - 2 * BlackBorder - Image.height - BottomBorder;
+
+    SmartInvalidate;
   end
 end;
@@ -221 +238 @@
   Shift: TShiftState);
 begin
-if key=VK_ESCAPE then
-  Close;
+  if Key = VK_ESCAPE then
+    Close;
 end;
 
 procedure TTechTreeDlg.CloseBtnClick(Sender: TObject);
 begin
-Close();
+  Close();
 end;
 

trunk/LocalPlayer/Term.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Term;
 
@@ -6 +5 @@
 
 uses
-  Protocol,Tribes,PVSB,ClientTools,ScreenTools,BaseWin,Messg,ButtonBase,
-
-  Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms,Menus,ExtCtrls,
-  ButtonA,ButtonB, ButtonC, EOTButton, Area;
+  Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
+
+  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus,
+  ExtCtrls,
+  ButtonA, ButtonB, ButtonC, EOTButton, Area;
 
 const
-WM_EOT=WM_USER;
-
-pltsNormal=0; pltsBlink=1;
+  WM_EOT = WM_USER;
+
+  pltsNormal = 0;
+  pltsBlink = 1;
 
 type
   TMainScreen = class(TDrawDlg)
-    Timer1:TTimer;
+    Timer1: TTimer;
     GamePopup: TPopupMenu;
-    UnitPopup:TPopupMenu;
-    mIrrigation:TMenuItem;
-    mCity:TMenuItem;
-    mRoad:TMenuItem;
-    mMine:TMenuItem;
-    mPollution:TMenuItem;
-    mHome:TMenuItem;
+    UnitPopup: TPopupMenu;
+    mIrrigation: TMenuItem;
+    mCity: TMenuItem;
+    mRoad: TMenuItem;
+    mMine: TMenuItem;
+    mPollution: TMenuItem;
+    mHome: TMenuItem;
     mStay: TMenuItem;
-    mDisband:TMenuItem;
-    mWait:TMenuItem;
-    mNoOrders:TMenuItem;
-    MTrans:TMenuItem;
+    mDisband: TMenuItem;
+    mWait: TMenuItem;
+    mNoOrders: TMenuItem;
+    MTrans: TMenuItem;
     UnitBtn: TButtonB;
     mResign: TMenuItem;
@@ -163 +164 @@
     N12: TMenuItem;
     mRep14: TMenuItem;
-    procedure FormCreate(Sender:TObject);
-    procedure FormDestroy(Sender:TObject);
-    procedure Timer1Timer(Sender:TObject);
-    procedure MapBoxMouseDown(Sender:TObject;Button:TMouseButton;
-      Shift:TShiftState;x,y:integer);
-    procedure EOTClick(Sender:TObject);
-    procedure PanelBoxMouseDown(Sender:TObject;Button:TMouseButton;
-      Shift:TShiftState;x,y:integer);
-    procedure FormKeyDown(Sender:TObject;var Key:word;
-      Shift:TShiftState);
-    procedure MenuClick(Sender:TObject);
-    procedure FormResize(Sender:TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure Timer1Timer(Sender: TObject);
+    procedure MapBoxMouseDown(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    procedure EOTClick(Sender: TObject);
+    procedure PanelBoxMouseDown(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure MenuClick(Sender: TObject);
+    procedure FormResize(Sender: TObject);
     procedure PanelBtnClick(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure Toggle(Sender: TObject);
-    procedure PanelBoxMouseMove(Sender: TObject; Shift: TShiftState; x,
-      y: integer);
+    procedure PanelBoxMouseMove(Sender: TObject; Shift: TShiftState;
+      x, y: integer);
     procedure PanelBoxMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; x, y: integer);
-    procedure MapBoxMouseMove(Sender: TObject; Shift: TShiftState; x,
-      y: integer);
+    procedure MapBoxMouseMove(Sender: TObject; Shift: TShiftState;
+      x, y: integer);
     procedure mShowClick(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; x, y: integer);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x,
-      y: integer);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
     procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; x, y: integer);
@@ -200 +199 @@
     procedure mNamesClick(Sender: TObject);
     procedure MapBtnClick(Sender: TObject);
-    procedure FormKeyUp(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormKeyUp(Sender: TObject; var Key: word; Shift: TShiftState);
     procedure CreateUnitClick(Sender: TObject);
     procedure mSoundOffClick(Sender: TObject);
@@ -217 +215 @@
   public
     procedure CreateParams(var p: TCreateParams); override;
-    procedure Client(Command,NewPlayer:integer;var Data);
+    procedure Client(Command, NewPlayer: integer; var Data);
     procedure SetAIName(p: integer; Name: string);
     function ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
@@ -229 +227 @@
 
   private
-    xw,yw,xwd,ywd,xwMini,ywMini,xMidPanel,xRightPanel,xTroop,xTerrain,xMini,
-      yMini,ywmax,ywcenter,TroopLoc,TrCnt,TrRow,TrPitch,MapWidth,MapOffset,
-      MapHeight,BlinkTime,BrushLoc,EditLoc,xMouse,yMouse: integer;
+    xw, yw, xwd, ywd, xwMini, ywMini, xMidPanel, xRightPanel, xTroop, xTerrain,
+      xMini, yMini, ywmax, ywcenter, TroopLoc, TrCnt, TrRow, TrPitch, MapWidth,
+      MapOffset, MapHeight, BlinkTime, BrushLoc, EditLoc, xMouse,
+      yMouse: integer;
     BrushType: Cardinal;
-    trix:array[0..63] of integer;
-    AILogo: array[0..nPl-1] of TBitmap;
-    Mini,Panel,TopBar: TBitmap;
-    sb:TPVScrollbar;
-    Closable,RepaintOnResize,Tracking,TurnComplete,Edited,GoOnPhase,
+    trix: array [0 .. 63] of integer;
+    AILogo: array [0 .. nPl - 1] of TBitmap;
+    Mini, Panel, TopBar: TBitmap;
+    sb: TPVScrollbar;
+    Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
       HaveStrategyAdvice, FirstMovieTurn: boolean;
     procedure ArrangeMidPanel;
@@ -246 +245 @@
     procedure CopyMiniToPanel;
     procedure PanelPaint;
-    procedure NextUnit(NearLoc:integer;AutoTurn:boolean);
-    procedure Scroll(dx,dy: integer);
-    procedure Centre(Loc:integer);
-    procedure SetTroopLoc(Loc:integer);
-    procedure ProcessRect(x0,y0,nx,ny,Options: integer);
+    procedure NextUnit(NearLoc: integer; AutoTurn: boolean);
+    procedure Scroll(dx, dy: integer);
+    procedure Centre(Loc: integer);
+    procedure SetTroopLoc(Loc: integer);
+    procedure ProcessRect(x0, y0, nx, ny, Options: integer);
     procedure PaintLoc(Loc: integer; Radius: integer = 0);
     procedure PaintLoc_BeforeMove(FromLoc: integer);
     procedure PaintLocTemp(Loc: integer; Style: integer = pltsNormal);
-    procedure PaintBufferToScreen(xMap,yMap,width,height: integer);
+    procedure PaintBufferToScreen(xMap, yMap, width, height: integer);
     procedure PaintDestination;
-    procedure SetUnFocus(uix:integer);
-    function MoveUnit(dx,dy:integer; Options: integer = 0): integer;
+    procedure SetUnFocus(uix: integer);
+    function MoveUnit(dx, dy: integer; Options: integer = 0): integer;
     procedure MoveToLoc(Loc: integer; CheckSuicide: boolean);
-    procedure MoveOnScreen(ShowMove: TShowMove; Step0,Step1,nStep: integer;
+    procedure MoveOnScreen(ShowMove: TShowMove; Step0, Step1, nStep: integer;
       Restore: boolean = true);
-    procedure FocusOnLoc(Loc:integer; Options: integer = 0);
+    procedure FocusOnLoc(Loc: integer; Options: integer = 0);
     function EndTurn(WasSkipped: boolean = false): boolean;
     procedure EndNego;
-    function IsPanelPixel(x,y: integer): boolean;
+    function IsPanelPixel(x, y: integer): boolean;
     procedure InitPopup(Popup: TPopupMenu);
     procedure SetMapOptions;
@@ -272 +271 @@
     procedure SetDebugMap(p: integer);
     procedure SetViewpoint(p: integer);
-    function LocationOfScreenPixel(x,y: integer): integer;
-    procedure SetTileSize(x,y: integer);
-    procedure RectInvalidate(Left,Top,Rigth,Bottom: integer);
-    procedure SmartRectInvalidate(Left,Top,Rigth,Bottom: integer);
+    function LocationOfScreenPixel(x, y: integer): integer;
+    procedure SetTileSize(x, y: integer);
+    procedure RectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure SmartRectInvalidate(Left, Top, Rigth, Bottom: integer);
     procedure SaveSettings;
-    procedure OnScroll(var m:TMessage); message WM_VSCROLL;
-    procedure OnEOT(var Msg:TMessage); message WM_EOT;
+    procedure OnScroll(var m: TMessage); message WM_VSCROLL;
+    procedure OnEOT(var Msg: TMessage); message WM_EOT;
   end;
 
 var
-MainScreen:TMainScreen;
+  MainScreen: TMainScreen;
 
 type
-TTribeInfo=record
-  trix: integer;
-  FileName: ShortString;
+  TTribeInfo = record
+    trix: integer;
+    FileName: ShortString;
   end;
-TCityNameInfo=record
-  ID: integer;
-  NewName: ShortString
-  end;
-TModelNameInfo=record
-  mix: integer;
-  NewName: ShortString
-  end;
-TPriceSet=Set of $00..$FF;
-
-const
-crImpDrag=2;
-crFlatHand=3;
-
-xxu=32; yyu=24; // half of unit slot size x/y
-yyu_anchor=32;
-xxc=32; yyc=16; // 1/2 of city slot size in x, 1/2 of ground tile size in y (=1/3 of slot)
-
-// layout
-TopBarHeight=41;
-PanelHeight=168;
-MidPanelHeight=120; // TopBarHeight+MidPanelHeight should be same as BaseWin.yUnused
-MapCenterUp=(MidPanelHeight-TopBarHeight) div 2;
-
-nCityType=4;
-
-{client exclusive commands:}
-cSetTribe=$9000;cSetNewModelPicture=$9100;cSetModelName=$9110;
-cSetModelPicture=$9120;cSetSlaveIndex=$9131;
-cSetCityName=$9200;
-
-// city status flags
-csTypeMask=$0007; csToldDelay=$0008; csResourceWeightsMask=$00F0;
-csToldBombard=$0100;
-
-{unit status flags}
-usStay=$01; usWaiting=$02; usGoto=$04; usEnhance=$08; usRecover=$10;
-usToldNoReturn=$100;
-usPersistent=usStay or usGoto or usEnhance or usRecover or integer($FFFF0000);
-
-{model status flags}
-msObsolete=$1; msAllowConscripts=$2;
-
-{additional city happened flags}
-chTypeDel=$8000; chAllImpsMade=$4000;
-
-adNone=$801; adFar=$802; adNexus=$803;
-
-SpecialModelPictureCode: array[0..nSpecialModel-1] of integer=
-(10,11,40,41,21,30,{50,51,}64,74,{71,}73);
-
-pixSlaves=0; pixNoSlaves=1; // index of slaves in StdUnits
-
-// icons.bmp properties
-xSizeSmall=36; ySizeSmall=20;
-SystemIconLines=2; // lines of system icons in icons.bmp before improvements
-
-// save options apart from what's defined by SaveOption
-soTellAI=30;
-soExtraMask=$40000000;
-
-nCityEventPriority=16;
-CityEventPriority: array[0..nCityEventPriority-1] of integer=
-(chDisorder,chImprovementLost,chUnitLost,chAllImpsMade,chProduction,
-chOldWonder,chNoSettlerProd,chPopDecrease,chProductionSabotaged,
-chNoGrowthWarning,chPollution,chTypeDel,chFounded,chSiege,chAfterCapture,
-chPopIncrease);
-
-CityEventSoundItem: array[0..15] of string=
-('CITY_DISORDER','','CITY_POPPLUS','CITY_POPMINUS','CITY_UNITLOST',
-'CITY_IMPLOST','CITY_SABOTAGE','CITY_GROWTHNEEDSIMP','CITY_POLLUTION',
-'CITY_SIEGE','CITY_WONDEREX','CITY_EMDELAY','CITY_FOUNDED','CITY_FOUNDED','',
-'CITY_INVALIDTYPE');
-
-type
-TPersistentData=record
-  FarTech, ToldAge, ToldModels, ToldAlive, ToldContact, ToldOwnCredibility,
-    ColdWarStart, PeaceEvaHappened: integer;
-  EnhancementJobs: TEnhancementJobs;
-  ImpOrder: array[0..nCityType-1] of TImpOrder;
-  ToldWonders: array[0..27] of TWonderInfo;
-  ToldTech: array[0..nAdv-1] of ShortInt;
-  end;
-
-var
-MyData: ^TPersistentData;
-AdvIcon:array[0..nAdv-1] of integer; {icons displayed with the technologies}
-xxt,yyt, // half of tile size x/y
-  GameMode,ClientMode,Age,UnFocus,OptionChecked,MapOptionChecked,nLostArmy,
-  ScienceSum,TaxSum,SoundPreloadDone,MarkCityLoc,HGrTerrain,HGrCities,
-  MovieSpeed: integer;
-CityRepMask: cardinal;
-ReceivedOffer: TOffer;
-Buffer,SmallImp: TBitmap;
-BlinkON,DestinationMarkON,StartRunning,StayOnTop_Ensured,supervising: boolean;
-UnusedTribeFiles, TribeNames: tstringlist;
-TribeOriginal: array[0..nPl-1] of boolean;
-LostArmy: array[0..nPl*nMmax-1] of integer;
-DipMem: array[0..nPl-1] of record
-  pContact, SentCommand, FormerTreaty: integer;
-  SentOffer: TOffer;
-  DeliveredPrices, ReceivedPrices: TPriceSet;
+
+  TCityNameInfo = record
+    ID: integer;
+    NewName: ShortString end;
+    TModelNameInfo = record mix: integer;
+    NewName: ShortString end;
+    TPriceSet = Set of $00 .. $FF;
+
+  const
+    crImpDrag = 2;
+    crFlatHand = 3;
+
+    xxu = 32;
+    yyu = 24; // half of unit slot size x/y
+    yyu_anchor = 32;
+    xxc = 32;
+    yyc = 16; // 1/2 of city slot size in x, 1/2 of ground tile size in y (=1/3 of slot)
+
+    // layout
+    TopBarHeight = 41;
+    PanelHeight = 168;
+    MidPanelHeight = 120;
+    // TopBarHeight+MidPanelHeight should be same as BaseWin.yUnused
+    MapCenterUp = (MidPanelHeight - TopBarHeight) div 2;
+
+    nCityType = 4;
+
+    { client exclusive commands: }
+    cSetTribe = $9000;
+    cSetNewModelPicture = $9100;
+    cSetModelName = $9110;
+    cSetModelPicture = $9120;
+    cSetSlaveIndex = $9131;
+    cSetCityName = $9200;
+
+    // city status flags
+    csTypeMask = $0007;
+    csToldDelay = $0008;
+    csResourceWeightsMask = $00F0;
+    csToldBombard = $0100;
+
+    { unit status flags }
+    usStay = $01;
+    usWaiting = $02;
+    usGoto = $04;
+    usEnhance = $08;
+    usRecover = $10;
+    usToldNoReturn = $100;
+    usPersistent = usStay or usGoto or usEnhance or usRecover or
+      integer($FFFF0000);
+
+    { model status flags }
+    msObsolete = $1;
+    msAllowConscripts = $2;
+
+    { additional city happened flags }
+    chTypeDel = $8000;
+    chAllImpsMade = $4000;
+
+    adNone = $801;
+    adFar = $802;
+    adNexus = $803;
+
+    SpecialModelPictureCode: array [0 .. nSpecialModel - 1] of integer = (10,
+      11, 40, 41, 21, 30, { 50,51, } 64, 74, { 71, } 73);
+
+    pixSlaves = 0;
+    pixNoSlaves = 1; // index of slaves in StdUnits
+
+    // icons.bmp properties
+    xSizeSmall = 36;
+    ySizeSmall = 20;
+    SystemIconLines = 2;
+    // lines of system icons in icons.bmp before improvements
+
+    // save options apart from what's defined by SaveOption
+    soTellAI = 30;
+    soExtraMask = $40000000;
+
+    nCityEventPriority = 16;
+    CityEventPriority: array [0 .. nCityEventPriority - 1] of integer =
+      (chDisorder, chImprovementLost, chUnitLost, chAllImpsMade, chProduction,
+      chOldWonder, chNoSettlerProd, chPopDecrease, chProductionSabotaged,
+      chNoGrowthWarning, chPollution, chTypeDel, chFounded, chSiege,
+      chAfterCapture, chPopIncrease);
+
+    CityEventSoundItem: array [0 .. 15] of string = ('CITY_DISORDER', '',
+      'CITY_POPPLUS', 'CITY_POPMINUS', 'CITY_UNITLOST', 'CITY_IMPLOST',
+      'CITY_SABOTAGE', 'CITY_GROWTHNEEDSIMP', 'CITY_POLLUTION', 'CITY_SIEGE',
+      'CITY_WONDEREX', 'CITY_EMDELAY', 'CITY_FOUNDED', 'CITY_FOUNDED', '',
+      'CITY_INVALIDTYPE');
+
+  type
+    TPersistentData = record
+      FarTech, ToldAge, ToldModels, ToldAlive, ToldContact, ToldOwnCredibility,
+        ColdWarStart, PeaceEvaHappened: integer;
+      EnhancementJobs: TEnhancementJobs;
+      ImpOrder: array [0 .. nCityType - 1] of TImpOrder;
+      ToldWonders: array [0 .. 27] of TWonderInfo;
+      ToldTech: array [0 .. nAdv - 1] of ShortInt;
+    end;
+
+  var
+    MyData: ^TPersistentData;
+    AdvIcon: array [0 .. nAdv - 1] of integer;
+    { icons displayed with the technologies }
+    xxt, yyt, // half of tile size x/y
+    GameMode, ClientMode, Age, UnFocus, OptionChecked, MapOptionChecked,
+      nLostArmy, ScienceSum, TaxSum, SoundPreloadDone, MarkCityLoc, HGrTerrain,
+      HGrCities, MovieSpeed: integer;
+    CityRepMask: Cardinal;
+    ReceivedOffer: TOffer;
+    Buffer, SmallImp: TBitmap;
+    BlinkON, DestinationMarkON, StartRunning, StayOnTop_Ensured,
+      supervising: boolean;
+    UnusedTribeFiles, TribeNames: tstringlist;
+    TribeOriginal: array [0 .. nPl - 1] of boolean;
+    LostArmy: array [0 .. nPl * nMmax - 1] of integer;
+    DipMem: array [0 .. nPl - 1] of record pContact, SentCommand,
+      FormerTreaty: integer;
+    SentOffer: TOffer;
+    DeliveredPrices, ReceivedPrices: TPriceSet;
   end;
 
@@ -400 +419 @@
 procedure InitMyModel(mix: integer; final: boolean);
 
-procedure ImpImage(ca: TCanvas; x,y,iix: integer; Government: integer = -1;
+procedure ImpImage(ca: TCanvas; x, y, iix: integer; Government: integer = -1;
   IsControl: boolean = false);
 procedure HelpOnTerrain(Loc, NewMode: integer);
 
-
 implementation
 
 uses
-  Directories,IsoEngine,CityScreen,Draft,MessgEx,Select,CityType,Help,
-  UnitStat,Diplomacy,Inp,log,Diagram,NatStat,Wonders,Enhance,Nego,Battle,Rates,
+  Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
+  UnitStat, Diplomacy, Inp, log, Diagram, NatStat, Wonders, Enhance, Nego,
+  Battle, Rates,
   TechTree,
 
-  Registry,ShellAPI;
-
+  Registry, ShellAPI;
 
 {$R *.DFM}
@@ -419 +437 @@
 
 const
-lxmax_xxx=130;
-LeftPanelWidth=70;
-LeftPanelWidth_Editor=46;
-overlap=PanelHeight-MidPanelHeight;
-yTroop=PanelHeight-83;
-xPalace=66; yPalace=24; //120;
-xAdvisor=108; yAdvisor=48;
-xUnitText=80;
-PaperShade=3;
-BlinkOnTime=12; BlinkOffTime=6;
-MoveTime=300; // {time for moving a unit in ms}
-WaitAfterShowMove=32;
-FastScrolling=false; // causes problems with overlapping windows
-
-nBrushTypes=26;
-BrushTypes: array[0..nBrushTypes-1] of Cardinal=
-(fPrefStartPos,fStartPos,
-fShore,fGrass,fTundra,fPrairie,fDesert,fSwamp,fForest,fHills,fMountains,fArctic,
-fDeadLands,fDeadLands or fCobalt,fDeadLands or fUranium,
-fDeadLands or fMercury,fRiver,
-fRoad,fRR,fCanal,tiIrrigation,tiFarm,tiMine,fPoll,tiFort,tiBase);
-
-// MoveUnit options:
-muAutoNoWait=$0001; muAutoNext=$0002; muNoSuicideCheck=$0004;
-
-// ProcessRect options:
-prPaint=$0001; prAutoBounds=$0002; prInvalidate=$0004;
-
-// FocusOnLoc options:
-flRepaintPanel=$0001; flImmUpdate=$0002;
-
-nSaveOption=22;
+  lxmax_xxx = 130;
+  LeftPanelWidth = 70;
+  LeftPanelWidth_Editor = 46;
+  overlap = PanelHeight - MidPanelHeight;
+  yTroop = PanelHeight - 83;
+  xPalace = 66;
+  yPalace = 24; // 120;
+  xAdvisor = 108;
+  yAdvisor = 48;
+  xUnitText = 80;
+  PaperShade = 3;
+  BlinkOnTime = 12;
+  BlinkOffTime = 6;
+  MoveTime = 300; // {time for moving a unit in ms}
+  WaitAfterShowMove = 32;
+  FastScrolling = false; // causes problems with overlapping windows
+
+  nBrushTypes = 26;
+  BrushTypes: array [0 .. nBrushTypes - 1] of Cardinal = (fPrefStartPos,
+    fStartPos, fShore, fGrass, fTundra, fPrairie, fDesert, fSwamp, fForest,
+    fHills, fMountains, fArctic, fDeadLands, fDeadLands or fCobalt,
+    fDeadLands or fUranium, fDeadLands or fMercury, fRiver, fRoad, fRR, fCanal,
+    tiIrrigation, tiFarm, tiMine, fPoll, tiFort, tiBase);
+
+  // MoveUnit options:
+  muAutoNoWait = $0001;
+  muAutoNext = $0002;
+  muNoSuicideCheck = $0004;
+
+  // ProcessRect options:
+  prPaint = $0001;
+  prAutoBounds = $0002;
+  prInvalidate = $0004;
+
+  // FocusOnLoc options:
+  flRepaintPanel = $0001;
+  flImmUpdate = $0002;
+
+  nSaveOption = 22;
 
 var
-Jump: array[0..nPl-1] of integer;
-pTurn,pLogo,UnStartLoc,ToldSlavery: integer;
-PerfFreq: int64;
-SmallScreen, GameOK, MapValid, skipped, idle: boolean;
-
-SaveOption: array[0..nSaveOption-1] of integer;
-MiniColors: array[0..11,0..1] of TColor;
-MainMap: TIsoMap;
-CurrentMoveInfo: record
-  AfterMovePaintRadius,AfterAttackExpeller: integer;
-  DoShow,IsAlly: boolean;
-  end;
-
+  Jump: array [0 .. nPl - 1] of integer;
+  pTurn, pLogo, UnStartLoc, ToldSlavery: integer;
+  PerfFreq: int64;
+  SmallScreen, GameOK, MapValid, skipped, idle: boolean;
+
+  SaveOption: array [0 .. nSaveOption - 1] of integer;
+  MiniColors: array [0 .. 11, 0 .. 1] of TColor;
+  MainMap: TIsoMap;
+  CurrentMoveInfo: record AfterMovePaintRadius, AfterAttackExpeller: integer;
+  DoShow, IsAlly: boolean;
+end;
 
 function CityEventName(i: integer): string;
 begin
-if i=14 then // chAllImpsMade
-  if not Phrases2FallenBackToEnglish then
-    result:=Phrases2.Lookup('CITYEVENT_ALLIMPSMADE')
-  else result:=Phrases.Lookup('CITYEVENTS',1)
-else result:=Phrases.Lookup('CITYEVENTS',i);
+  if i = 14 then // chAllImpsMade
+    if not Phrases2FallenBackToEnglish then
+      result := Phrases2.Lookup('CITYEVENT_ALLIMPSMADE')
+    else
+      result := Phrases.Lookup('CITYEVENTS', 1)
+  else
+    result := Phrases.Lookup('CITYEVENTS', i);
 end;
 
 procedure InitSmallImp;
 const
-cut=4;
-Sharpen=80;
+  cut = 4;
+  Sharpen = 80;
 type
-TLine=array[0..99999,0..2] of Byte;
-TBuffer=array[0..99999,0..2] of integer;
+  TLine = array [0 .. 99999, 0 .. 2] of Byte;
+  TBuffer = array [0 .. 99999, 0 .. 2] of integer;
 var
-sum,Cnt,dx,dy,nx,ny,ix,iy,ir,x,y,c,ch,xdivider,ydivider: integer;
-resampled: ^TBuffer;
-line: ^TLine;
+  sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch, xdivider,
+    ydivider: integer;
+  resampled: ^TBuffer;
+  line: ^TLine;
 begin
-nx:=BigImp.Width div xSizeBig *xSizeSmall;
-ny:=BigImp.Height div ySizeBig *ySizeSmall;
-
-// resample icons
-GetMem(resampled,nx*ny*12);
-FillChar(resampled^,nx*ny*12,0);
-for ix:=0 to BigImp.Width div xSizeBig-1 do for iy:=0 to BigImp.Height div ySizeBig-1 do
-  for y:=0 to ySizeBig-2*cut-1 do
-    begin
-    ydivider:=(y*ySizeSmall div (ySizeBig-2*cut)+1)*(ySizeBig-2*cut)-y*ySizeSmall;
-    if ydivider>ySizeSmall then ydivider:=ySizeSmall;
-    line:=BigImp.ScanLine[cut+iy*ySizeBig+y];
-    for x:=0 to xSizeBig-1 do
-      begin
-      ir:=ix*xSizeSmall+iy*nx*ySizeSmall
-        +x*xSizeSmall div xSizeBig + y*ySizeSmall div (ySizeBig-2*cut) *nx;
-      xdivider:=(x*xSizeSmall div xSizeBig+1)*xSizeBig-x*xSizeSmall;
-      if xdivider>xSizeSmall then xdivider:=xSizeSmall;
-      for ch:=0 to 2 do
-        begin
-        c:=line[ix*xSizeBig+x,ch];
-        inc(resampled[ir,ch],c*xdivider*ydivider);
-        if xdivider<xSizeSmall then
-          inc(resampled[ir+1,ch],c*(xSizeSmall-xdivider)*ydivider);
-        if ydivider<ySizeSmall then
-          inc(resampled[ir+nx,ch],c*xdivider*(ySizeSmall-ydivider));
-        if (xdivider<xSizeSmall) and (ydivider<ySizeSmall) then
-          inc(resampled[ir+nx+1,ch],c*(xSizeSmall-xdivider)*(ySizeSmall-ydivider));
+  nx := BigImp.width div xSizeBig * xSizeSmall;
+  ny := BigImp.height div ySizeBig * ySizeSmall;
+
+  // resample icons
+  GetMem(resampled, nx * ny * 12);
+  FillChar(resampled^, nx * ny * 12, 0);
+  for ix := 0 to BigImp.width div xSizeBig - 1 do
+    for iy := 0 to BigImp.height div ySizeBig - 1 do
+      for y := 0 to ySizeBig - 2 * cut - 1 do
+      begin
+        ydivider := (y * ySizeSmall div (ySizeBig - 2 * cut) + 1) *
+          (ySizeBig - 2 * cut) - y * ySizeSmall;
+        if ydivider > ySizeSmall then
+          ydivider := ySizeSmall;
+        line := BigImp.ScanLine[cut + iy * ySizeBig + y];
+        for x := 0 to xSizeBig - 1 do
+        begin
+          ir := ix * xSizeSmall + iy * nx * ySizeSmall + x *
+            xSizeSmall div xSizeBig + y *
+            ySizeSmall div (ySizeBig - 2 * cut) * nx;
+          xdivider := (x * xSizeSmall div xSizeBig + 1) * xSizeBig - x *
+            xSizeSmall;
+          if xdivider > xSizeSmall then
+            xdivider := xSizeSmall;
+          for ch := 0 to 2 do
+          begin
+            c := line[ix * xSizeBig + x, ch];
+            inc(resampled[ir, ch], c * xdivider * ydivider);
+            if xdivider < xSizeSmall then
+              inc(resampled[ir + 1, ch], c * (xSizeSmall - xdivider) *
+                ydivider);
+            if ydivider < ySizeSmall then
+              inc(resampled[ir + nx, ch],
+                c * xdivider * (ySizeSmall - ydivider));
+            if (xdivider < xSizeSmall) and (ydivider < ySizeSmall) then
+              inc(resampled[ir + nx + 1, ch], c * (xSizeSmall - xdivider) *
+                (ySizeSmall - ydivider));
+          end
         end
-      end
-    end;
-
-// sharpen resampled icons
-SmallImp.Width:=nx; SmallImp.Height:=ny;
-for y:=0 to ny-1 do
+      end;
+
+  // sharpen resampled icons
+  SmallImp.width := nx;
+  SmallImp.height := ny;
+  for y := 0 to ny - 1 do
   begin
-  line:=SmallImp.ScanLine[y];
-  for x:=0 to nx-1 do
-    for ch:=0 to 2 do
-      begin
-      sum:=0;
-      Cnt:=0;
-      for dy:=-1 to 1 do
-        if ((dy>=0) or (y mod ySizeSmall>0)) and ((dy<=0) or (y mod ySizeSmall<ySizeSmall-1)) then
-          for dx:=-1 to 1 do
-            if ((dx>=0) or (x mod xSizeSmall>0)) and ((dx<=0) or (x mod xSizeSmall<xSizeSmall-1)) then
+    line := SmallImp.ScanLine[y];
+    for x := 0 to nx - 1 do
+      for ch := 0 to 2 do
+      begin
+        sum := 0;
+        Cnt := 0;
+        for dy := -1 to 1 do
+          if ((dy >= 0) or (y mod ySizeSmall > 0)) and
+            ((dy <= 0) or (y mod ySizeSmall < ySizeSmall - 1)) then
+            for dx := -1 to 1 do
+              if ((dx >= 0) or (x mod xSizeSmall > 0)) and
+                ((dx <= 0) or (x mod xSizeSmall < xSizeSmall - 1)) then
               begin
-              inc(sum,resampled[x+dx+nx*(y+dy),ch]);
-              inc(Cnt);
+                inc(sum, resampled[x + dx + nx * (y + dy), ch]);
+                inc(Cnt);
               end;
-      sum:=((Cnt*Sharpen+800)*resampled[x+nx*y,ch]-sum*Sharpen) div (800*xSizeBig*(ySizeBig-2*cut));
-      if sum<0 then sum:=0;
-      if sum>255 then sum:=255;
-      line[x][ch]:=sum;
+        sum := ((Cnt * Sharpen + 800) * resampled[x + nx * y, ch] - sum *
+          Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * cut));
+        if sum < 0 then
+          sum := 0;
+        if sum > 255 then
+          sum := 255;
+        line[x][ch] := sum;
       end;
   end;
-FreeMem(resampled);
-//smallimp.savetofile(homedir+'smallimp.bmp'); //!!!
+  FreeMem(resampled);
+  // smallimp.savetofile(homedir+'smallimp.bmp'); //!!!
 end;
 
-procedure ImpImage(ca: TCanvas; x,y,iix: integer; Government: integer;
+procedure ImpImage(ca: TCanvas; x, y, iix: integer; Government: integer;
   IsControl: boolean);
 begin
-if Government<0 then
-  Government:=MyRO.Government;
-if (iix=imPalace) and (Government<>gAnarchy) then
-  iix:=Government-8;
-FrameImage(ca, BigImp, x, y, xSizeBig, ySizeBig,
-  (iix+SystemIconLines*7) mod 7*xSizeBig,
-  (iix+SystemIconLines*7) div 7*ySizeBig, IsControl);
+  if Government < 0 then
+    Government := MyRO.Government;
+  if (iix = imPalace) and (Government <> gAnarchy) then
+    iix := Government - 8;
+  FrameImage(ca, BigImp, x, y, xSizeBig, ySizeBig, (iix + SystemIconLines * 7)
+    mod 7 * xSizeBig, (iix + SystemIconLines * 7) div 7 * ySizeBig, IsControl);
 end;
 
 procedure HelpOnTerrain(Loc, NewMode: integer);
 begin
-if MyMap[Loc] and fDeadLands<>0 then
-  HelpDlg.ShowNewContent(NewMode, hkTer, 3*12)
-else if (MyMap[Loc] and fTerrain=fForest) and IsJungle(Loc div G.lx) then
-  HelpDlg.ShowNewContent(NewMode, hkTer, fJungle + (MyMap[Loc] shr 5 and 3)*12)
-else HelpDlg.ShowNewContent(NewMode, hkTer,
-  MyMap[Loc] and fTerrain + (MyMap[Loc] shr 5 and 3)*12);
+  if MyMap[Loc] and fDeadLands <> 0 then
+    HelpDlg.ShowNewContent(NewMode, hkTer, 3 * 12)
+  else if (MyMap[Loc] and fTerrain = fForest) and IsJungle(Loc div G.lx) then
+    HelpDlg.ShowNewContent(NewMode, hkTer,
+      fJungle + (MyMap[Loc] shr 5 and 3) * 12)
+  else
+    HelpDlg.ShowNewContent(NewMode, hkTer, MyMap[Loc] and fTerrain +
+      (MyMap[Loc] shr 5 and 3) * 12);
 end;
 
-
-{*** tribe management procedures ***}
+{ *** tribe management procedures *** }
 
 function RoughCredibility(Credibility: integer): integer;
 begin
-case Credibility of
-  0..69: result:=0; 70..89: result:=1; 90..99: result:=2; 100: result:=3 end;
-end;
-
-procedure ChooseModelPicture(p,mix,code,Hash,Turn: integer;
-  ForceNew,final: boolean);
-var
-i: integer;
-Picture: TModelPictureInfo;
-IsNew: boolean;
-begin
-Picture.trix:=p;
-Picture.mix:=mix;
-if code=74 then
-  begin // use correct pictures for slaves
-  if Tribe[p].mixSlaves<0 then
-    if not TribeOriginal[p] then Tribe[p].mixSlaves:=mix
-    else begin i:=mix+p shl 16; Server(cSetSlaveIndex,0,0,i); end;
-  if ToldSlavery=1 then Picture.pix:=pixSlaves else Picture.pix:=pixNoSlaves;
-  Picture.Hash:=0;
-  Picture.GrName:='StdUnits';
-  IsNew:=true;
-  end
-else
-  begin
-  Picture.Hash:=Hash;
-  IsNew:=Tribe[p].ChooseModelPicture(Picture,code,Turn,ForceNew);
-  end;
-if final then
-  if not TribeOriginal[p] then
-    Tribe[p].SetModelPicture(Picture, IsNew)
-  else if IsNew then
-    Server(cSetNewModelPicture+(Length(Picture.GrName)+1+16+3) div 4,0,
-      0,Picture)
-  else Server(cSetModelPicture+(Length(Picture.GrName)+1+16+3) div 4,0,
-    0,Picture)
-else with Tribe[p].ModelPicture[mix] do
-  begin
-  HGr:=LoadGraphicSet(Picture.GrName);
-  pix:=Picture.pix;
+  case Credibility of
+    0 .. 69:
+      result := 0;
+    70 .. 89:
+      result := 1;
+    90 .. 99:
+      result := 2;
+    100:
+      result := 3
   end;
 end;
 
+procedure ChooseModelPicture(p, mix, code, Hash, Turn: integer;
+  ForceNew, final: boolean);
+var
+  i: integer;
+  Picture: TModelPictureInfo;
+  IsNew: boolean;
+begin
+  Picture.trix := p;
+  Picture.mix := mix;
+  if code = 74 then
+  begin // use correct pictures for slaves
+    if Tribe[p].mixSlaves < 0 then
+      if not TribeOriginal[p] then
+        Tribe[p].mixSlaves := mix
+      else
+      begin
+        i := mix + p shl 16;
+        Server(cSetSlaveIndex, 0, 0, i);
+      end;
+    if ToldSlavery = 1 then
+      Picture.pix := pixSlaves
+    else
+      Picture.pix := pixNoSlaves;
+    Picture.Hash := 0;
+    Picture.GrName := 'StdUnits';
+    IsNew := true;
+  end
+  else
+  begin
+    Picture.Hash := Hash;
+    IsNew := Tribe[p].ChooseModelPicture(Picture, code, Turn, ForceNew);
+  end;
+  if final then
+    if not TribeOriginal[p] then
+      Tribe[p].SetModelPicture(Picture, IsNew)
+    else if IsNew then
+      Server(cSetNewModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4,
+        0, 0, Picture)
+    else
+      Server(cSetModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4, 0,
+        0, Picture)
+  else
+    with Tribe[p].ModelPicture[mix] do
+    begin
+      HGr := LoadGraphicSet(Picture.GrName);
+      pix := Picture.pix;
+    end;
+end;
+
 function InitEnemyModel(emix: integer): boolean;
 begin
-if GameMode=cMovie then
-  begin result:=false; exit end;
-with MyRO.EnemyModel[emix] do
-  ChooseModelPicture(Owner, mix, ModelCode(MyRO.EnemyModel[emix]),
-    ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, false, true);
-result:=true
+  if GameMode = cMovie then
+  begin
+    result := false;
+    exit
+  end;
+  with MyRO.EnemyModel[emix] do
+    ChooseModelPicture(Owner, mix, ModelCode(MyRO.EnemyModel[emix]),
+      ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, false, true);
+  result := true
 end;
 
 procedure InitAllEnemyModels;
 var
-emix: integer;
+  emix: integer;
 begin
-for emix:=0 to MyRO.nEnemyModel-1 do
-  with MyRO.EnemyModel[emix] do
-    if Tribe[Owner].ModelPicture[mix].HGr=0 then
-      InitEnemyModel(emix);
+  for emix := 0 to MyRO.nEnemyModel - 1 do
+    with MyRO.EnemyModel[emix] do
+      if Tribe[Owner].ModelPicture[mix].HGr = 0 then
+        InitEnemyModel(emix);
 end;
 
 procedure InitMyModel(mix: integer; final: boolean);
 var
-mi: TModelInfo;
+  mi: TModelInfo;
 begin
-if (GameMode=cMovie) and (MyModel[mix].Kind<$08) then exit;
+  if (GameMode = cMovie) and (MyModel[mix].Kind < $08) then
+    exit;
   // don't exit for special units because cSetModelPicture comes after TellNewModels
-MakeModelInfo(me,mix,MyModel[mix],mi);
-ChooseModelPicture(me, mix, ModelCode(mi), ModelHash(mi), MyRO.Turn, false,
-  final);
+  MakeModelInfo(me, mix, MyModel[mix], mi);
+  ChooseModelPicture(me, mix, ModelCode(mi), ModelHash(mi), MyRO.Turn,
+    false, final);
 end;
 
 function AttackSound(code: integer): string;
 begin
-result:='ATTACK_'+char(48+code div 100 mod 10)+char(48+code div 10 mod 10)
-  +char(48+code mod 10);
+  result := 'ATTACK_' + char(48 + code div 100 mod 10) +
+    char(48 + code div 10 mod 10) + char(48 + code mod 10);
 end;
 
@@ -658 +721 @@
 // check whether aircraft survived low-fuel warning
 begin
-assert(not supervising);
-with MyUn[uix] do
-  if (Status and usToldNoReturn<>0)
-    and ((MyMap[Loc] and fCity<>0) or (MyMap[Loc] and fTerImp=tiBase)
-      or (Master>=0)) then
-    Status:=Status and not usToldNoReturn;
+  assert(not supervising);
+  with MyUn[uix] do
+    if (Status and usToldNoReturn <> 0) and
+      ((MyMap[Loc] and fCity <> 0) or (MyMap[Loc] and fTerImp = tiBase) or
+      (Master >= 0)) then
+      Status := Status and not usToldNoReturn;
 end;
 
-function CreateTribe(p:integer; FileName:string; Original: boolean): boolean;
+function CreateTribe(p: integer; FileName: string; Original: boolean): boolean;
 begin
-if not FileExists(LocalizedFilePath('Tribes\'+FileName+'.tribe.txt')) then
-  begin result:=false; exit end;
-
-TribeOriginal[p]:=Original;
-Tribe[p]:=TTribe.Create(FileName);
-with Tribe[p] do
+  if not FileExists(LocalizedFilePath('Tribes\' + FileName + '.tribe.txt')) then
   begin
-  if (GameMode=cNewGame) or not Original then
-    begin
-    Term.ChooseModelPicture(p,0,010,1,0,true,true);
-    Term.ChooseModelPicture(p,1,040,1,0,true,true);
-    Term.ChooseModelPicture(p,2,041,1,0,true,true);
-    Term.ChooseModelPicture(p,-1,017,1,0,true,true);
-    end;
-  DipMem[p].pContact:=-1;
+    result := false;
+    exit
   end;
-result:=true;
+
+  TribeOriginal[p] := Original;
+  Tribe[p] := TTribe.Create(FileName);
+  with Tribe[p] do
+  begin
+    if (GameMode = cNewGame) or not Original then
+    begin
+      Term.ChooseModelPicture(p, 0, 010, 1, 0, true, true);
+      Term.ChooseModelPicture(p, 1, 040, 1, 0, true, true);
+      Term.ChooseModelPicture(p, 2, 041, 1, 0, true, true);
+      Term.ChooseModelPicture(p, -1, 017, 1, 0, true, true);
+    end;
+    DipMem[p].pContact := -1;
+  end;
+  result := true;
 end;
 
 procedure TellNewContacts;
 var
-p1: integer;
+  p1: integer;
 begin
-if not supervising then
-  for p1:=0 to nPl-1 do
-    if (p1<>me) and (1 shl p1 and MyData.ToldContact=0)
-      and (1 shl p1 and MyRO.Alive<>0) and (MyRO.Treaty[p1]>trNoContact) then
-      begin
-      TribeMessage(p1, Tribe[p1].TPhrase('FRNEWNATION'), '');
-      MyData.ToldContact:=MyData.ToldContact or (1 shl p1);
+  if not supervising then
+    for p1 := 0 to nPl - 1 do
+      if (p1 <> me) and (1 shl p1 and MyData.ToldContact = 0) and
+        (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] > trNoContact) then
+      begin
+        TribeMessage(p1, Tribe[p1].TPhrase('FRNEWNATION'), '');
+        MyData.ToldContact := MyData.ToldContact or (1 shl p1);
       end
 end;
@@ -703 +769 @@
 procedure TellNewModels;
 var
-mix: integer;
-ModelNameInfo: TModelNameInfo;
+  mix: integer;
+  ModelNameInfo: TModelNameInfo;
 begin
-if supervising then
-  exit;
-with Tribe[me] do while MyData.ToldModels<MyRO.nModel do
-  begin {new Unit class available}
-  if (ModelPicture[MyData.ToldModels].HGr>0)
-    and (MyModel[MyData.ToldModels].Kind<>mkSelfDeveloped) then
-    begin // save picture of DevModel
-    ModelPicture[MyData.ToldModels+1]:=ModelPicture[MyData.ToldModels];
-    ModelName[MyData.ToldModels+1]:=ModelName[MyData.ToldModels];
-    ModelPicture[MyData.ToldModels].HGr:=0
-    end;
-  if ModelPicture[MyData.ToldModels].HGr=0 then
-    InitMyModel(MyData.ToldModels,true); {only run if no researched model}
-  with MessgExDlg do
-    begin
-{    MakeModelInfo(me,MyData.ToldModels,MyModel[MyData.ToldModels],mi);
-    if mi.Attack=0 then OpenSound:='MSG_DEFAULT'
-    else OpenSound:=AttackSound(ModelCode(mi));}
-    if MyModel[MyData.ToldModels].Kind=mkSelfDeveloped then
-      OpenSound:='NEWMODEL_'+char(48+Age);
-    MessgText:=Phrases.Lookup('MODELAVAILABLE');
-    if GameMode=cMovie then
-      begin
-      Kind:=mkOkHelp; // doesn't matter
-      MessgText:=MessgText+'\'+ModelName[MyData.ToldModels];
+  if supervising then
+    exit;
+  with Tribe[me] do
+    while MyData.ToldModels < MyRO.nModel do
+    begin { new Unit class available }
+      if (ModelPicture[MyData.ToldModels].HGr > 0) and
+        (MyModel[MyData.ToldModels].Kind <> mkSelfDeveloped) then
+      begin // save picture of DevModel
+        ModelPicture[MyData.ToldModels + 1] := ModelPicture[MyData.ToldModels];
+        ModelName[MyData.ToldModels + 1] := ModelName[MyData.ToldModels];
+        ModelPicture[MyData.ToldModels].HGr := 0
+      end;
+      if ModelPicture[MyData.ToldModels].HGr = 0 then
+        InitMyModel(MyData.ToldModels, true);
+      { only run if no researched model }
+      with MessgExDlg do
+      begin
+        { MakeModelInfo(me,MyData.ToldModels,MyModel[MyData.ToldModels],mi);
+          if mi.Attack=0 then OpenSound:='MSG_DEFAULT'
+          else OpenSound:=AttackSound(ModelCode(mi)); }
+        if MyModel[MyData.ToldModels].Kind = mkSelfDeveloped then
+          OpenSound := 'NEWMODEL_' + char(48 + Age);
+        MessgText := Phrases.Lookup('MODELAVAILABLE');
+        if GameMode = cMovie then
+        begin
+          Kind := mkOkHelp; // doesn't matter
+          MessgText := MessgText + '\' + ModelName[MyData.ToldModels];
+        end
+        else
+        begin
+          Kind := mkModel;
+          EInput.Text := ModelName[MyData.ToldModels];
+        end;
+        IconKind := mikModel;
+        IconIndex := MyData.ToldModels;
+        ShowModal;
+        if (EInput.Text <> '') and (EInput.Text <> ModelName[MyData.ToldModels])
+        then
+        begin // user renamed model
+          ModelNameInfo.mix := MyData.ToldModels;
+          ModelNameInfo.NewName := EInput.Text;
+          Server(cSetModelName + (Length(ModelNameInfo.NewName) + 1 + 4 + 3)
+            div 4, me, 0, ModelNameInfo);
+        end
+      end;
+      if MyModel[MyData.ToldModels].Kind = mkSettler then
+      begin // engineers make settlers obsolete
+        for mix := 0 to MyData.ToldModels - 1 do
+          if MyModel[mix].Kind = mkSettler then
+            MyModel[mix].Status := MyModel[mix].Status or msObsolete;
+      end;
+      inc(MyData.ToldModels)
+    end;
+end;
+
+procedure PaintZoomedTile(dst: TBitmap; x, y, Loc: integer);
+
+  procedure TSprite(xDst, yDst, xSrc, ySrc: integer);
+  begin
+    Sprite(dst, HGrTerrain, x + xDst, y + yDst, xxt * 2, yyt * 3,
+      1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
+  end;
+
+  procedure TSprite4(xSrc, ySrc: integer);
+  begin
+    Sprite(dst, HGrTerrain, x + xxt, y + yyt + 2, xxt * 2, yyt * 2 - 2,
+      1 + xSrc * (xxt * 2 + 1), 3 + yyt + ySrc * (yyt * 3 + 1));
+    Sprite(dst, HGrTerrain, x + 4, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      5 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
+    Sprite(dst, HGrTerrain, x + xxt * 2, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
+    Sprite(dst, HGrTerrain, x + xxt, y + yyt * 3, xxt * 2, yyt * 2 - 2,
+      1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
+  end;
+
+var
+  cix, ySrc, Tile: integer;
+begin
+  Tile := MyMap[Loc];
+  if Tile and fCity <> 0 then
+  begin
+    if MyRO.Tech[adRailroad] >= tsApplicable then
+      Tile := Tile or fRR
+    else
+      Tile := Tile or fRoad;
+    if Tile and fOwned <> 0 then
+    begin
+      cix := MyRO.nCity - 1;
+      while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
+        dec(cix);
+      assert(cix >= 0);
+      if MyCity[cix].Built[imSupermarket] > 0 then
+        Tile := Tile or tiFarm
+      else
+        Tile := Tile or tiIrrigation;
+    end
+    else
+      Tile := Tile or tiIrrigation;
+  end;
+
+  if Tile and fTerrain >= fForest then
+    TSprite4(2, 2)
+  else
+    TSprite4(Tile and fTerrain, 0);
+  if Tile and fTerrain >= fForest then
+  begin
+    if (Tile and fTerrain = fForest) and IsJungle(Loc div G.lx) then
+      ySrc := 18
+    else
+      ySrc := 3 + 2 * (Tile and fTerrain - fForest);
+    TSprite(xxt, 0, 6, ySrc);
+    TSprite(0, yyt, 3, ySrc);
+    TSprite((xxt * 2), yyt, 4, ySrc + 1);
+    TSprite(xxt, (yyt * 2), 1, ySrc + 1);
+  end;
+
+  // irrigation
+  case Tile and fTerImp of
+    tiIrrigation:
+      begin
+        TSprite(xxt, 0, 0, 12);
+        TSprite(xxt * 2, yyt, 0, 12);
+      end;
+    tiFarm:
+      begin
+        TSprite(xxt, 0, 1, 12);
+        TSprite(xxt * 2, yyt, 1, 12);
       end
+  end;
+
+  // river/canal/road/railroad
+  if Tile and fRiver <> 0 then
+  begin
+    TSprite(0, yyt, 2, 14);
+    TSprite(xxt, (yyt * 2), 2, 14);
+  end;
+  if Tile and fCanal <> 0 then
+  begin
+    TSprite(xxt, 0, 7, 11);
+    TSprite(xxt, 0, 3, 11);
+    TSprite(xxt * 2, yyt, 7, 11);
+    TSprite(xxt * 2, yyt, 3, 11);
+  end;
+  if Tile and fRR <> 0 then
+  begin
+    TSprite((xxt * 2), yyt, 1, 10);
+    TSprite((xxt * 2), yyt, 5, 10);
+    TSprite(xxt, (yyt * 2), 1, 10);
+    TSprite(xxt, (yyt * 2), 5, 10);
+  end
+  else if Tile and fRoad <> 0 then
+  begin
+    TSprite((xxt * 2), yyt, 8, 9);
+    TSprite((xxt * 2), yyt, 5, 9);
+    TSprite(xxt, (yyt * 2), 1, 9);
+    TSprite(xxt, (yyt * 2), 5, 9);
+  end;
+
+  if Tile and fPoll <> 0 then
+    TSprite(xxt, (yyt * 2), 6, 12);
+
+  // special
+  if Tile and (fTerrain or fSpecial) = fGrass or fSpecial1 then
+    TSprite4(2, 1)
+  else if Tile and fSpecial <> 0 then
+    if Tile and fTerrain < fForest then
+      TSprite(0, yyt, Tile and fTerrain, Tile and fSpecial shr 5)
+    else if (Tile and fTerrain = fForest) and IsJungle(Loc div G.lx) then
+      TSprite(0, yyt, 8, 17 + Tile and fSpecial shr 5)
     else
-      begin
-      Kind:=mkModel;
-      EInput.Text:=ModelName[MyData.ToldModels];
+      TSprite(0, yyt, 8, 2 + (Tile and fTerrain - fForest) * 2 + Tile and
+        fSpecial shr 5)
+  else if Tile and fDeadLands <> 0 then
+  begin
+    TSprite4(6, 2);
+    TSprite(xxt, yyt, 8, 12 + Tile shr 25 and 3);
+  end;
+
+  // other improvements
+  case Tile and fTerImp of
+    tiMine:
+      TSprite(xxt, 0, 2, 12);
+    tiFort:
+      begin
+        TSprite(xxt, 0, 7, 12);
+        TSprite(xxt, 0, 3, 12);
       end;
-    IconKind:=mikModel;
-    IconIndex:=MyData.ToldModels;
-    ShowModal;
-    if (EInput.Text<>'') and (EInput.Text<>ModelName[MyData.ToldModels]) then
-      begin // user renamed model
-      ModelNameInfo.mix:=MyData.ToldModels;
-      ModelNameInfo.NewName:=EInput.Text;
-      Server(cSetModelName+(Length(ModelNameInfo.NewName)+1+4+3) div 4,
-        me,0,ModelNameInfo);
-      end
-    end;
-  if MyModel[MyData.ToldModels].kind=mkSettler then
-    begin // engineers make settlers obsolete
-    for mix:=0 to MyData.ToldModels-1 do
-      if MyModel[mix].Kind=mkSettler then
-        MyModel[mix].Status:=MyModel[mix].Status or msObsolete;
-    end;
-  inc(MyData.ToldModels)
+    tiBase:
+      TSprite(xxt, 0, 4, 12);
   end;
 end;
 
-procedure PaintZoomedTile(dst: TBitmap; x,y,Loc: integer);
-
-  procedure TSprite(xDst, yDst, xSrc, ySrc: integer);
+function ChooseResearch: boolean;
+var
+  ChosenResearch: integer;
+begin
+  if (MyData.FarTech <> adNone) and (MyRO.Tech[MyData.FarTech] >= tsApplicable)
+  then
+    MyData.FarTech := adNone;
+  repeat
+    { research complete -- select new }
+    repeat
+      ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
+      if ModalSelectDlg.result < 0 then
+      begin
+        result := false;
+        exit
+      end;
+      ChosenResearch := ModalSelectDlg.result;
+      if ChosenResearch = adMilitary then
+      begin
+        DraftDlg.ShowNewContent(wmModal);
+        if DraftDlg.ModalResult <> mrOK then
+          Tribe[me].ModelPicture[MyRO.nModel].HGr := 0
+      end
+      until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
+
+      if ChosenResearch = adMilitary then
+        InitMyModel(MyRO.nModel, true)
+      else if ChosenResearch = adFar then
+      begin
+        ModalSelectDlg.ShowNewContent(wmModal, kFarAdvance);
+        if ModalSelectDlg.result >= 0 then
+          if (ModalSelectDlg.result = adNone) or
+            (Server(sSetResearch - sExecute, me, ModalSelectDlg.result, nil^) <
+            rExecuted) then
+            MyData.FarTech := ModalSelectDlg.result
+          else
+          begin
+            ChosenResearch := ModalSelectDlg.result;
+            // can be researched immediately
+            MyData.FarTech := adNone
+          end
+      end;
+    until ChosenResearch <> adFar;
+    if ChosenResearch = adNexus then
+      MyData.FarTech := adNexus
+    else
+      Server(sSetResearch, me, ChosenResearch, nil^);
+    ListDlg.TechChange;
+    result := true;
+  end;
+
+  (* ** client function handling ** *)
+
+  function TMainScreen.DipCall(Command: integer): integer;
+  var
+    i: integer;
+    IsTreatyDeal: boolean;
   begin
-  Sprite(dst, HGrTerrain, x+xDst, y+yDst, xxt*2, yyt*3, 1+xSrc*(xxt*2+1),
-    1+ySrc*(yyt*3+1));
-  end;
-
-  procedure TSprite4(xSrc, ySrc: integer);
-  begin
-  Sprite(dst, HGrTerrain, x+xxt, y+yyt+2, xxt*2, yyt*2-2, 1+xSrc*(xxt*2+1),
-    3+yyt+ySrc*(yyt*3+1));
-  Sprite(dst, HGrTerrain, x+4, y+2*yyt, xxt*2-4, yyt*2, 5+xSrc*(xxt*2+1),
-    1+yyt+ySrc*(yyt*3+1));
-  Sprite(dst, HGrTerrain, x+xxt*2, y+2*yyt, xxt*2-4, yyt*2, 1+xSrc*(xxt*2+1),
-    1+yyt+ySrc*(yyt*3+1));
-  Sprite(dst, HGrTerrain, x+xxt, y+yyt*3, xxt*2, yyt*2-2, 1+xSrc*(xxt*2+1),
-    1+yyt+ySrc*(yyt*3+1));
-  end;
-
-var
-cix, ySrc, Tile: integer;
-begin
-Tile:=MyMap[Loc];
-if Tile and fCity<>0 then
-  begin
-  if MyRO.Tech[adRailroad]>=tsApplicable then
-    Tile:=Tile or fRR
-  else Tile:=Tile or fRoad;
-  if Tile and fOwned<>0 then
-    begin
-    cix:=MyRO.nCity-1;
-    while (cix>=0) and (MyCity[cix].Loc<>Loc) do dec(cix);
-    assert(cix>=0);
-    if MyCity[cix].Built[imSupermarket]>0 then
-      Tile:=Tile or tiFarm
-    else Tile:=Tile or tiIrrigation;
-    end
-  else Tile:=Tile or tiIrrigation;
-  end;
-
-if Tile and fTerrain>=fForest then TSprite4(2,2)
-else TSprite4(Tile and fTerrain,0);
-if Tile and fTerrain>=fForest then
-  begin
-  if (Tile and fTerrain=fForest) and IsJungle(Loc div G.lx) then ySrc:=18
-  else ySrc:=3+2*(Tile and fTerrain-fForest);
-  TSprite(xxt, 0, 6, ySrc);
-  TSprite(0, yyt, 3, ySrc);
-  TSprite((xxt*2), yyt, 4, ySrc+1);
-  TSprite(xxt, (yyt*2), 1, ySrc+1);
-  end;
-
-// irrigation
-case Tile and fTerImp of
-  tiIrrigation:
-    begin
-    TSprite(xxt,0,0,12);
-    TSprite(xxt*2,yyt,0,12);
-    end;
-  tiFarm:
-    begin
-    TSprite(xxt,0,1,12);
-    TSprite(xxt*2,yyt,1,12);
+    result := Server(Command, me, 0, nil^);
+    if result >= rExecuted then
+    begin
+      if Command and $FF0F = scContact then
+      begin
+        DipMem[me].pContact := Command shr 4 and $F;
+        NegoDlg.Initiate;
+        DipMem[me].DeliveredPrices := [];
+        DipMem[me].ReceivedPrices := [];
+      end;
+
+      DipMem[me].SentCommand := Command;
+      DipMem[me].FormerTreaty := MyRO.Treaty[DipMem[me].pContact];
+      if Command = scDipCancelTreaty then
+        Play('CANCELTREATY')
+      else if Command = scDipAccept then
+      begin // remember delivered and received prices
+        for i := 0 to ReceivedOffer.nDeliver - 1 do
+          include(DipMem[me].ReceivedPrices, ReceivedOffer.Price[i] shr 24);
+        for i := 0 to ReceivedOffer.nCost - 1 do
+          include(DipMem[me].DeliveredPrices,
+            ReceivedOffer.Price[ReceivedOffer.nDeliver + i] shr 24);
+        IsTreatyDeal := false;
+        for i := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
+          if ReceivedOffer.Price[i] and opMask = opTreaty then
+            IsTreatyDeal := true;
+        if IsTreatyDeal then
+          Play('NEWTREATY')
+        else
+          Play('ACCEPTOFFER');
+      end;
+      CityDlg.CloseAction := None;
+      if G.RO[DipMem[me].pContact] <> nil then
+      begin // close windows for next player
+        for i := 0 to Screen.FormCount - 1 do
+          if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+          then
+            Screen.Forms[i].Close;
+      end
+      else
+      begin
+        if CityDlg.Visible then
+          CityDlg.Close;
+        if UnitStatDlg.Visible then
+          UnitStatDlg.Close;
+      end
     end
   end;
 
-// river/canal/road/railroad
-if Tile and fRiver<>0 then
+  function TMainScreen.OfferCall(var Offer: TOffer): integer;
+  var
+    i: integer;
   begin
-  TSprite(0, yyt, 2, 14);
-  TSprite(xxt, (yyt*2), 2, 14);
+    result := Server(scDipOffer, me, 0, Offer);
+    if result >= rExecuted then
+    begin
+      DipMem[me].SentCommand := scDipOffer;
+      DipMem[me].FormerTreaty := MyRO.Treaty[DipMem[me].pContact];
+      DipMem[me].SentOffer := Offer;
+      CityDlg.CloseAction := None;
+      if G.RO[DipMem[me].pContact] <> nil then
+      begin // close windows for next player
+        for i := 0 to Screen.FormCount - 1 do
+          if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+          then
+            Screen.Forms[i].Close;
+      end
+      else
+      begin
+        if CityDlg.Visible then
+          CityDlg.Close;
+        if UnitStatDlg.Visible then
+          UnitStatDlg.Close;
+      end
+    end
   end;
-if Tile and fCanal<>0 then
+
+  procedure TMainScreen.SetUnFocus(uix: integer);
+  var
+    Loc0: integer;
   begin
-  TSprite(xxt, 0, 7, 11);
-  TSprite(xxt, 0, 3, 11);
-  TSprite(xxt*2,yyt,7,11);
-  TSprite(xxt*2,yyt,3,11);
-  end;
-if Tile and fRR<>0 then
-  begin
-  TSprite((xxt*2), yyt, 1, 10);
-  TSprite((xxt*2), yyt, 5, 10);
-  TSprite(xxt, (yyt*2), 1, 10);
-  TSprite(xxt, (yyt*2), 5, 10);
-  end
-else if Tile and fRoad<>0 then
-  begin
-  TSprite((xxt*2), yyt, 8, 9);
-  TSprite((xxt*2), yyt, 5, 9);
-  TSprite(xxt, (yyt*2), 1, 9);
-  TSprite(xxt, (yyt*2), 5, 9);
-  end;
-
-if Tile and fPoll<>0 then
-  TSprite(xxt,(yyt*2),6,12);
-
-// special
-if Tile and (fTerrain or fSpecial)=fGrass or fSpecial1 then
-  TSprite4(2,1)
-else if Tile and fSpecial<>0 then
-  if Tile and fTerrain<fForest then
-    TSprite(0, yyt, Tile and fTerrain, Tile and fSpecial shr 5)
-  else if (Tile and fTerrain=fForest) and IsJungle(Loc div G.lx) then
-    TSprite(0, yyt, 8, 17+Tile and fSpecial shr 5)
-  else TSprite(0, yyt, 8, 2+(Tile and fTerrain-fForest)*2+Tile and fSpecial shr 5)
-else if Tile and fDeadLands<>0 then
-  begin
-  TSprite4(6,2);
-  TSprite(xxt, yyt, 8, 12+Tile shr 25 and 3);
-  end;
-
-// other improvements
-case Tile and fTerImp of
-  tiMine: TSprite(xxt, 0, 2, 12);
-  tiFort: begin TSprite(xxt, 0, 7, 12); TSprite(xxt, 0, 3, 12); end;
-  tiBase: TSprite(xxt, 0, 4, 12);
-  end;
-end;
-
-function ChooseResearch: boolean;
-var
-ChosenResearch: integer;
-begin
-if (MyData.FarTech<>adNone) and (MyRO.Tech[MyData.FarTech]>=tsApplicable) then
-  MyData.FarTech:=adNone;
-repeat
-  {research complete -- select new}
-  repeat
-    ModalSelectDlg.ShowNewContent(wmModal,kAdvance);
-    if ModalSelectDlg.result<0 then
-      begin result:=false; exit end;
-    ChosenResearch:=ModalSelectDlg.result;
-    if ChosenResearch=adMilitary then
-      begin
-      DraftDlg.ShowNewContent(wmModal);
-      if DraftDlg.ModalResult<>mrOK then
-        Tribe[me].ModelPicture[MyRO.nModel].HGr:=0
-      end
-  until (ChosenResearch<>adMilitary) or (DraftDlg.ModalResult=mrOK);
-
-  if ChosenResearch=adMilitary then InitMyModel(MyRO.nModel,true)
-  else if ChosenResearch=adFar then
-    begin
-    ModalSelectDlg.ShowNewContent(wmModal,kFarAdvance);
-    if ModalSelectDlg.result>=0 then
-      if (ModalSelectDlg.Result=adNone) or
-        (Server(sSetResearch-sExecute,me,ModalSelectDlg.Result,nil^)<rExecuted) then
-        MyData.FarTech:=ModalSelectDlg.result
-      else
-        begin
-        ChosenResearch:=ModalSelectDlg.result; // can be researched immediately
-        MyData.FarTech:=adNone
-        end
-    end;
-until ChosenResearch<>adFar;
-if ChosenResearch=adNexus then MyData.FarTech:=adNexus
-else Server(sSetResearch,me,ChosenResearch,nil^);
-ListDlg.TechChange;
-result:=true;
-end;
-
-
-(*** client function handling ***)
-
-function TMainScreen.DipCall(Command: integer): integer;
-var
-i: integer;
-IsTreatyDeal: boolean;
-begin
-result:=Server(Command,me,0,nil^);
-if result>=rExecuted then
-  begin
-  if Command and $FF0F=scContact then
-    begin
-    DipMem[me].pContact:=Command shr 4 and $f;
-    NegoDlg.Initiate;
-    DipMem[me].DeliveredPrices:=[];
-    DipMem[me].ReceivedPrices:=[];
-    end;
-
-  DipMem[me].SentCommand:=Command;
-  DipMem[me].FormerTreaty:=MyRO.Treaty[DipMem[me].pContact];
-  if Command=scDipCancelTreaty then Play('CANCELTREATY')
-  else if Command=scDipAccept then
-    begin // remember delivered and received prices
-    for i:=0 to ReceivedOffer.nDeliver-1 do
-      include(DipMem[me].ReceivedPrices,ReceivedOffer.Price[i] shr 24);
-    for i:=0 to ReceivedOffer.nCost-1 do
-      include(DipMem[me].DeliveredPrices,
-        ReceivedOffer.Price[ReceivedOffer.nDeliver+i] shr 24);
-    IsTreatyDeal:=false;
-    for i:=0 to ReceivedOffer.nDeliver+ReceivedOffer.nCost-1 do
-      if ReceivedOffer.Price[i] and opMask=opTreaty then
-        IsTreatyDeal:=true;
-    if IsTreatyDeal then Play('NEWTREATY')
-    else Play('ACCEPTOFFER');     
-    end;
-  CityDlg.CloseAction:=None;
-  if G.RO[DipMem[me].pContact]<>nil then
-    begin // close windows for next player
-    for i:=0 to Screen.FormCount-1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close;
-    end
-  else
-    begin
-    if CityDlg.Visible then CityDlg.Close;
-    if UnitStatDlg.Visible then UnitStatDlg.Close;
-    end
-  end
-end;
-
-function TMainScreen.OfferCall(var Offer: TOffer): integer;
-var
-i: integer;
-begin
-result:=Server(scDipOffer,me,0,Offer);
-if result>=rExecuted then
-  begin
-  DipMem[me].SentCommand:=scDipOffer;
-  DipMem[me].FormerTreaty:=MyRO.Treaty[DipMem[me].pContact];
-  DipMem[me].SentOffer:=Offer;
-  CityDlg.CloseAction:=None;
-  if G.RO[DipMem[me].pContact]<>nil then
-    begin // close windows for next player
-    for i:=0 to Screen.FormCount-1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close;
-    end
-  else
-    begin
-    if CityDlg.Visible then CityDlg.Close;
-    if UnitStatDlg.Visible then UnitStatDlg.Close;
-    end
-  end
-end;
-
-procedure TMainScreen.SetUnFocus(uix:integer);
-var
-Loc0: integer;
-begin
-assert(not ((uix>=0) and supervising));
-if uix<>UnFocus then
-  begin
-  DestinationMarkON:=false;
-  PaintDestination;
-  if uix>=0 then UnStartLoc:=MyUn[uix].Loc;
-  BlinkON:=false;
-  BlinkTime:=-1;
-  if UnFocus>=0 then
-    begin
-    Loc0:=MyUn[UnFocus].Loc;
-    if (uix<0) or (Loc0<>MyUn[uix].Loc) then
-      begin
-      UnFocus:=-1;
-      PaintLoc(Loc0);
-      end
-    end;
-  UnFocus:=uix;
-  end;
-UnitInfoBtn.Visible:= UnFocus>=0;
-UnitBtn.Visible:= UnFocus>=0;
-CheckTerrainBtnVisible;
-end;
-
-procedure TMainScreen.CheckTerrainBtnVisible;
-var
-Tile: integer;
-mox: ^TModel;
-begin
-if UnFocus>=0 then
-  begin
-  mox:=@MyModel[MyUn[UnFocus].mix];
-  Tile:=MyMap[MyUn[UnFocus].Loc];
-  TerrainBtn.Visible:= (Tile and fCity=0) and (MyUn[UnFocus].Master<0)
-    and ((mox.Kind=mkSettler) or (mox.Kind=mkSlaves) and (MyRO.Wonder[woPyramids].EffectiveOwner>=0));
-  end
-else TerrainBtn.Visible:=false;
-end;
-
-procedure TMainScreen.CheckMovieSpeedBtnState;
-begin
-if GameMode=cMovie then
-  begin
-  MovieSpeed1Btn.Down:= MovieSpeed=1;
-  MovieSpeed1Btn.Visible:=true;
-  MovieSpeed2Btn.Down:= MovieSpeed=2;
-  MovieSpeed2Btn.Visible:=true;
-  MovieSpeed3Btn.Down:= MovieSpeed=3;
-  MovieSpeed3Btn.Visible:=true;
-  MovieSpeed4Btn.Down:= MovieSpeed=4;
-  MovieSpeed4Btn.Visible:=true;
-  end
-else
-  begin
-  MovieSpeed1Btn.Visible:=false;
-  MovieSpeed2Btn.Visible:=false;
-  MovieSpeed3Btn.Visible:=false;
-  MovieSpeed4Btn.Visible:=false;
-  end
-end;
-
-procedure TMainScreen.SetMapOptions;
-begin
-IsoEngine.Options:=MapOptionChecked;
-if ClientMode=cEditMap then
-  IsoEngine.Options:=IsoEngine.Options or (1 shl moEditMode);
-if mLocCodes.Checked then
-  IsoEngine.Options:=IsoEngine.Options or (1 shl moLocCodes);
-end;
-
-procedure TMainScreen.UpdateViews(UpdateCityScreen: boolean);
-begin
-SumCities(TaxSum,ScienceSum);
-PanelPaint; // TopBar was enough!!!
-ListDlg.EcoChange;
-NatStatDlg.EcoChange;
-if UpdateCityScreen then
-  CityDlg.SmartUpdateContent;
-end;
-
-procedure TMainScreen.SetAIName(p: integer; Name: string);
-begin
-if Name='' then
-  begin
-  if AILogo[p]<>nil then
-    begin AILogo[p].free; AILogo[p]:=nil end
-  end
-else
-  begin
-  if AILogo[p]=nil then
-    AILogo[p]:=TBitmap.Create;
-  if not LoadGraphicFile(AILogo[p], HomeDir+Name, gfNoError) then
-    begin AILogo[p].free; AILogo[p]:=nil end
-  end
-end;
-
-function TMainScreen.ContactRefused(p: integer; Item: String): boolean;
-// return whether treaty was cancelled
-var
-s: string;
-begin
-assert(MyRO.Treaty[p]>=trPeace);
-s:=Tribe[p].TPhrase(Item);
-if MyRO.Turn<MyRO.LastCancelTreaty[p]+CancelTreatyTurns then
-  begin
-  SimpleMessage(s);
-  result:=false;
-  end
-else
-  begin
-  case MyRO.Treaty[p] of
-    trPeace: s:=s+' '+Phrases.Lookup('FRCANCELQUERY_PEACE');
-    trFriendlyContact: s:=s+' '+Phrases.Lookup('FRCANCELQUERY_FRIENDLY');
-    trAlliance: s:=s+' '+Phrases.Lookup('FRCANCELQUERY_ALLIANCE');
-    end;
-  result:= SimpleQuery(mkYesNo,s,'NEGO_REJECTED')=mrOK;
-  if result then
-    begin
-    Play('CANCELTREATY');
-    Server(sCancelTreaty,me,0,nil^);
-    if MyRO.Treaty[p]=trNone then
-      CityOptimizer_BeginOfTurn; // peace treaty was cancelled -- use formerly forbidden tiles
-    MapValid:=false;
-    PaintAllMaps;
-    end
-  end
-end;
-
-procedure TMainScreen.RememberPeaceViolation;
-var
-uix,p1: integer;
-begin
-MyData.PeaceEvaHappened:=0;
-for uix:=0 to MyRO.nUn-1 do with MyUn[uix] do if Loc>=0 then
-  begin
-  p1:=MyRO.Territory[Loc];
-  if (p1<>me) and (p1>=0) and (MyRO.Turn=MyRO.EvaStart[p1]+(PeaceEvaTurns-1)) then
-    MyData.PeaceEvaHappened:=MyData.PeaceEvaHappened or (1 shl p1);
-  end;
-end;
-
-procedure TMainScreen.Client(Command,NewPlayer:integer;var Data);
-
-  procedure GetTribeList;
-  var
-  SearchRec: TSearchRec;
-  Color: TColor;
-  Name: string;
-  ok: boolean;
-  begin
-  UnusedTribeFiles.Clear;
-  ok:= FindFirst(DataDir+'Localization\'+'Tribes\*.tribe.txt',
-    faArchive+faReadOnly,SearchRec)=0;
-  if not ok then
-    begin
-    FindClose(SearchRec);
-    ok:= FindFirst(HomeDir+'Tribes\*.tribe.txt',
-      faArchive+faReadOnly,SearchRec)=0;
-    end;
-  if ok then
-    repeat
-      SearchRec.Name:=Copy(SearchRec.Name,1,Length(SearchRec.Name)-10);
-      if GetTribeInfo(SearchRec.Name,Name,Color) then
-        UnusedTribeFiles.AddObject(SearchRec.Name, TObject(Color));
-    until FindNext(SearchRec)<>0;
-  FindClose(SearchRec);
-  end;
-
-  function ChooseUnusedTribe: integer;
-  var
-  i,j,ColorDistance, BestColorDistance, TestColorDistance, CountBest: integer;
-  begin
-  Assert(UnusedTribeFiles.Count>0);
-  result:=-1;
-  BestColorDistance:=-1;
-  for j:=0 to UnusedTribeFiles.Count-1 do
-    begin
-    ColorDistance:=250; // consider differences more than this infinite
-    for i:=0 to nPl-1 do if Tribe[i]<>nil then
-      begin
-      TestColorDistance:=abs(integer(UnusedTribeFiles.Objects[j]) shr 16 and $FF - Tribe[i].Color shr 16 and $FF)
-        +abs(integer(UnusedTribeFiles.Objects[j]) shr 8 and $FF - Tribe[i].Color shr 8 and $FF)*3
-        +abs(integer(UnusedTribeFiles.Objects[j]) and $FF - Tribe[i].Color and $FF)*2;
-      if TestColorDistance<ColorDistance then
-        ColorDistance:=TestColorDistance
-      end;
-    if ColorDistance>BestColorDistance then
-      begin CountBest:=0; BestColorDistance:=ColorDistance end;
-    if ColorDistance=BestColorDistance then
-      begin inc(CountBest); if random(CountBest)=0 then result:=j end
-    end;
-  end;
-
-  procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
-  var
-  i,TestCost,MostCost: integer;
-  Ship1Plus,Ship2Plus: boolean;
-  begin
-  with ShowShipChange, MessgExDlg do
-    begin
-    case Reason of
-      scrProduction:
-        begin
-        OpenSound:='SHIP_BUILT';
-        MessgText:=Tribe[Ship1Owner].TPhrase('SHIPBUILT');
-        IconKind:=mikShip;
-        IconIndex:=Ship1Owner;
-        end;
-
-      scrDestruction:
-        begin
-        OpenSound:='SHIP_DESTROYED';
-        MessgText:=Tribe[Ship1Owner].TPhrase('SHIPDESTROYED');
-        IconKind:=mikImp;
-        end;
-
-      scrTrade:
-        begin
-        OpenSound:='SHIP_TRADED';
-        Ship1Plus:=false;
-        Ship2Plus:=false;
-        for i:=0 to nShipPart-1 do
-          begin
-          if Ship1Change[i]>0 then Ship1Plus:=true;
-          if Ship2Change[i]>0 then Ship2Plus:=true;
-          end;
-        if Ship1Plus and Ship2Plus then
-          MessgText:=Tribe[Ship1Owner].TPhrase('SHIPBITRADE1')
-            +' '+Tribe[Ship2Owner].TPhrase('SHIPBITRADE2')
-        else if Ship1Plus then
-          MessgText:=Tribe[Ship1Owner].TPhrase('SHIPUNITRADE1')
-            +' '+Tribe[Ship2Owner].TPhrase('SHIPUNITRADE2')
-        else //if Ship2Plus then
-          MessgText:=Tribe[Ship2Owner].TPhrase('SHIPUNITRADE1')
-            +' '+Tribe[Ship1Owner].TPhrase('SHIPUNITRADE2');
-        IconKind:=mikImp;
-        end;
-
-      scrCapture:
-        begin
-        OpenSound:='SHIP_CAPTURED';
-        MessgText:=Tribe[Ship2Owner].TPhrase('SHIPCAPTURE1')
-          +' '+Tribe[Ship1Owner].TPhrase('SHIPCAPTURE2');
-        IconKind:=mikShip;
-        IconIndex:=Ship2Owner;
+    assert(not((uix >= 0) and supervising));
+    if uix <> UnFocus then
+    begin
+      DestinationMarkON := false;
+      PaintDestination;
+      if uix >= 0 then
+        UnStartLoc := MyUn[uix].Loc;
+      BlinkON := false;
+      BlinkTime := -1;
+      if UnFocus >= 0 then
+      begin
+        Loc0 := MyUn[UnFocus].Loc;
+        if (uix < 0) or (Loc0 <> MyUn[uix].Loc) then
+        begin
+          UnFocus := -1;
+          PaintLoc(Loc0);
         end
       end;
-
-    if IconKind=mikImp then
-      begin
-      MostCost:=0;
-      for i:=0 to nShipPart-1 do
-        begin
-        TestCost:=abs(Ship1Change[i])*Imp[imShipComp+i].Cost;
-        if TestCost>MostCost then
-          begin MostCost:=TestCost; IconIndex:=imShipComp+i end
-        end;
+      UnFocus := uix;
+    end;
+    UnitInfoBtn.Visible := UnFocus >= 0;
+    UnitBtn.Visible := UnFocus >= 0;
+    CheckTerrainBtnVisible;
+  end;
+
+  procedure TMainScreen.CheckTerrainBtnVisible;
+  var
+    Tile: integer;
+    mox: ^TModel;
+  begin
+    if UnFocus >= 0 then
+    begin
+      mox := @MyModel[MyUn[UnFocus].mix];
+      Tile := MyMap[MyUn[UnFocus].Loc];
+      TerrainBtn.Visible := (Tile and fCity = 0) and (MyUn[UnFocus].Master < 0)
+        and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves) and
+        (MyRO.Wonder[woPyramids].EffectiveOwner >= 0));
+    end
+    else
+      TerrainBtn.Visible := false;
+  end;
+
+  procedure TMainScreen.CheckMovieSpeedBtnState;
+  begin
+    if GameMode = cMovie then
+    begin
+      MovieSpeed1Btn.Down := MovieSpeed = 1;
+      MovieSpeed1Btn.Visible := true;
+      MovieSpeed2Btn.Down := MovieSpeed = 2;
+      MovieSpeed2Btn.Visible := true;
+      MovieSpeed3Btn.Down := MovieSpeed = 3;
+      MovieSpeed3Btn.Visible := true;
+      MovieSpeed4Btn.Down := MovieSpeed = 4;
+      MovieSpeed4Btn.Visible := true;
+    end
+    else
+    begin
+      MovieSpeed1Btn.Visible := false;
+      MovieSpeed2Btn.Visible := false;
+      MovieSpeed3Btn.Visible := false;
+      MovieSpeed4Btn.Visible := false;
+    end
+  end;
+
+  procedure TMainScreen.SetMapOptions;
+  begin
+    IsoEngine.Options := MapOptionChecked;
+    if ClientMode = cEditMap then
+      IsoEngine.Options := IsoEngine.Options or (1 shl moEditMode);
+    if mLocCodes.Checked then
+      IsoEngine.Options := IsoEngine.Options or (1 shl moLocCodes);
+  end;
+
+  procedure TMainScreen.UpdateViews(UpdateCityScreen: boolean);
+  begin
+    SumCities(TaxSum, ScienceSum);
+    PanelPaint; // TopBar was enough!!!
+    ListDlg.EcoChange;
+    NatStatDlg.EcoChange;
+    if UpdateCityScreen then
+      CityDlg.SmartUpdateContent;
+  end;
+
+  procedure TMainScreen.SetAIName(p: integer; Name: string);
+  begin
+    if Name = '' then
+    begin
+      if AILogo[p] <> nil then
+      begin
+        AILogo[p].free;
+        AILogo[p] := nil
+      end
+    end
+    else
+    begin
+      if AILogo[p] = nil then
+        AILogo[p] := TBitmap.Create;
+      if not LoadGraphicFile(AILogo[p], HomeDir + Name, gfNoError) then
+      begin
+        AILogo[p].free;
+        AILogo[p] := nil
+      end
+    end
+  end;
+
+  function TMainScreen.ContactRefused(p: integer; Item: String): boolean;
+  // return whether treaty was cancelled
+  var
+    s: string;
+  begin
+    assert(MyRO.Treaty[p] >= trPeace);
+    s := Tribe[p].TPhrase(Item);
+    if MyRO.Turn < MyRO.LastCancelTreaty[p] + CancelTreatyTurns then
+    begin
+      SimpleMessage(s);
+      result := false;
+    end
+    else
+    begin
+      case MyRO.Treaty[p] of
+        trPeace:
+          s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_PEACE');
+        trFriendlyContact:
+          s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_FRIENDLY');
+        trAlliance:
+          s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_ALLIANCE');
       end;
-
-    Kind:=mkOk;
-    ShowModal;
-    end;
+      result := SimpleQuery(mkYesNo, s, 'NEGO_REJECTED') = mrOK;
+      if result then
+      begin
+        Play('CANCELTREATY');
+        Server(sCancelTreaty, me, 0, nil^);
+        if MyRO.Treaty[p] = trNone then
+          CityOptimizer_BeginOfTurn;
+        // peace treaty was cancelled -- use formerly forbidden tiles
+        MapValid := false;
+        PaintAllMaps;
+      end
+    end
   end;
 
-  procedure InitModule;
+  procedure TMainScreen.RememberPeaceViolation;
   var
-  x,y,i,j,Domain:integer;
+    uix, p1: integer;
   begin
-  {search icons for advances:}
-  for i:=0 to nAdv-1 do
-    if i in FutureTech then AdvIcon[i]:=96+i-futResearchTechnology
-    else
-      begin
-      AdvIcon[i]:=-1;
-      for Domain:=0 to nDomains-1 do
-        for j:=0 to nUpgrade-1 do if upgrade[Domain,j].Preq=i then
-          if AdvIcon[i]>=0 then AdvIcon[i]:=85
-          else AdvIcon[i]:=86+Domain;
-      for j:=0 to nFeature-1 do if Feature[j].Preq=i then
-        for Domain:=0 to nDomains-1 do
-          if 1 shl Domain and Feature[j].Domains<>0 then
-            if (AdvIcon[i]>=0) and (AdvIcon[i]<>86+Domain) then AdvIcon[i]:=85
-            else AdvIcon[i]:=86+Domain;
-      for j:=28 to nImp-1 do if Imp[j].Preq=i then AdvIcon[i]:=j;
-      for j:=28 to nImp-1 do
-        if (Imp[j].Preq=i) and (Imp[j].Kind<>ikCommon) then AdvIcon[i]:=j;
-      for j:=0 to nJob-1 do if i=JobPreq[j] then AdvIcon[i]:=84;
-      for j:=0 to 27 do if Imp[j].Preq=i then AdvIcon[i]:=j;
-      if AdvIcon[i]<0 then
-        if AdvValue[i]<1000 then AdvIcon[i]:=-7
-        else AdvIcon[i]:=24+AdvValue[i] div 1000;
-      for j:=2 to nGov-1 do if GovPreq[j]=i then AdvIcon[i]:=j-8;
+    MyData.PeaceEvaHappened := 0;
+    for uix := 0 to MyRO.nUn - 1 do
+      with MyUn[uix] do
+        if Loc >= 0 then
+        begin
+          p1 := MyRO.Territory[Loc];
+          if (p1 <> me) and (p1 >= 0) and
+            (MyRO.Turn = MyRO.EvaStart[p1] + (PeaceEvaTurns - 1)) then
+            MyData.PeaceEvaHappened := MyData.PeaceEvaHappened or (1 shl p1);
+        end;
+  end;
+
+  procedure TMainScreen.Client(Command, NewPlayer: integer; var Data);
+
+    procedure GetTribeList;
+    var
+      SearchRec: TSearchRec;
+      Color: TColor;
+      Name: string;
+      ok: boolean;
+    begin
+      UnusedTribeFiles.Clear;
+      ok := FindFirst(DataDir + 'Localization\' + 'Tribes\*.tribe.txt',
+        faArchive + faReadOnly, SearchRec) = 0;
+      if not ok then
+      begin
+        FindClose(SearchRec);
+        ok := FindFirst(HomeDir + 'Tribes\*.tribe.txt', faArchive + faReadOnly,
+          SearchRec) = 0;
       end;
-  AdvIcon[adConscription]:=86+dGround;
-
-  UnusedTribeFiles:=tstringlist.Create;
-  UnusedTribeFiles.Sorted:=true;
-  TribeNames:=tstringlist.Create;
-
-  for x:=0 to 11 do for y:=0 to 1 do
-    MiniColors[x,y]:=GrExt[HGrSystem].Data.Canvas.Pixels[66+x,67+y];
-  IsoEngine.Init(InitEnemyModel);
-  if not IsoEngine.ApplyTileSize(xxt,yyt) and ((xxt<>48) or (yyt<>24)) then
-    ApplyTileSize(48,24); // non-default tile size is missing a file, switch to default
-  MainMap:=TIsoMap.Create;
-  MainMap.SetOutput(offscreen);
-
-  HGrStdUnits:=LoadGraphicSet('StdUnits');
-  SmallImp:=TBitmap.Create;
-  SmallImp.PixelFormat:=pf24bit;
-  InitSmallImp;
-  SoundPreloadDone:=0;
-  StartRunning:=false;
-  StayOnTop_Ensured:=false;
-
-  CreatePVSB(sb,Handle,100-200,122,100+MidPanelHeight-16-200);
-  end;{InitModule}
+      if ok then
+        repeat
+          SearchRec.Name := Copy(SearchRec.Name, 1,
+            Length(SearchRec.Name) - 10);
+          if GetTribeInfo(SearchRec.Name, Name, Color) then
+            UnusedTribeFiles.AddObject(SearchRec.Name, TObject(Color));
+        until FindNext(SearchRec) <> 0;
+      FindClose(SearchRec);
+    end;
+
+    function ChooseUnusedTribe: integer;
+    var
+      i, j, ColorDistance, BestColorDistance, TestColorDistance,
+        CountBest: integer;
+    begin
+      assert(UnusedTribeFiles.Count > 0);
+      result := -1;
+      BestColorDistance := -1;
+      for j := 0 to UnusedTribeFiles.Count - 1 do
+      begin
+        ColorDistance := 250; // consider differences more than this infinite
+        for i := 0 to nPl - 1 do
+          if Tribe[i] <> nil then
+          begin
+            TestColorDistance :=
+              abs(integer(UnusedTribeFiles.Objects[j]) shr 16 and
+              $FF - Tribe[i].Color shr 16 and $FF) +
+              abs(integer(UnusedTribeFiles.Objects[j]) shr 8 and
+              $FF - Tribe[i].Color shr 8 and $FF) * 3 +
+              abs(integer(UnusedTribeFiles.Objects[j]) and
+              $FF - Tribe[i].Color and $FF) * 2;
+            if TestColorDistance < ColorDistance then
+              ColorDistance := TestColorDistance
+          end;
+        if ColorDistance > BestColorDistance then
+        begin
+          CountBest := 0;
+          BestColorDistance := ColorDistance
+        end;
+        if ColorDistance = BestColorDistance then
+        begin
+          inc(CountBest);
+          if random(CountBest) = 0 then
+            result := j
+        end
+      end;
+    end;
+
+    procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
+    var
+      i, TestCost, MostCost: integer;
+      Ship1Plus, Ship2Plus: boolean;
+    begin
+      with ShowShipChange, MessgExDlg do
+      begin
+        case Reason of
+          scrProduction:
+            begin
+              OpenSound := 'SHIP_BUILT';
+              MessgText := Tribe[Ship1Owner].TPhrase('SHIPBUILT');
+              IconKind := mikShip;
+              IconIndex := Ship1Owner;
+            end;
+
+          scrDestruction:
+            begin
+              OpenSound := 'SHIP_DESTROYED';
+              MessgText := Tribe[Ship1Owner].TPhrase('SHIPDESTROYED');
+              IconKind := mikImp;
+            end;
+
+          scrTrade:
+            begin
+              OpenSound := 'SHIP_TRADED';
+              Ship1Plus := false;
+              Ship2Plus := false;
+              for i := 0 to nShipPart - 1 do
+              begin
+                if Ship1Change[i] > 0 then
+                  Ship1Plus := true;
+                if Ship2Change[i] > 0 then
+                  Ship2Plus := true;
+              end;
+              if Ship1Plus and Ship2Plus then
+                MessgText := Tribe[Ship1Owner].TPhrase('SHIPBITRADE1') + ' ' +
+                  Tribe[Ship2Owner].TPhrase('SHIPBITRADE2')
+              else if Ship1Plus then
+                MessgText := Tribe[Ship1Owner].TPhrase('SHIPUNITRADE1') + ' ' +
+                  Tribe[Ship2Owner].TPhrase('SHIPUNITRADE2')
+              else // if Ship2Plus then
+                MessgText := Tribe[Ship2Owner].TPhrase('SHIPUNITRADE1') + ' ' +
+                  Tribe[Ship1Owner].TPhrase('SHIPUNITRADE2');
+              IconKind := mikImp;
+            end;
+
+          scrCapture:
+            begin
+              OpenSound := 'SHIP_CAPTURED';
+              MessgText := Tribe[Ship2Owner].TPhrase('SHIPCAPTURE1') + ' ' +
+                Tribe[Ship1Owner].TPhrase('SHIPCAPTURE2');
+              IconKind := mikShip;
+              IconIndex := Ship2Owner;
+            end
+        end;
+
+        if IconKind = mikImp then
+        begin
+          MostCost := 0;
+          for i := 0 to nShipPart - 1 do
+          begin
+            TestCost := abs(Ship1Change[i]) * Imp[imShipComp + i].Cost;
+            if TestCost > MostCost then
+            begin
+              MostCost := TestCost;
+              IconIndex := imShipComp + i
+            end
+          end;
+        end;
+
+        Kind := mkOk;
+        ShowModal;
+      end;
+    end;
+
+    procedure InitModule;
+    var
+      x, y, i, j, Domain: integer;
+    begin
+      { search icons for advances: }
+      for i := 0 to nAdv - 1 do
+        if i in FutureTech then
+          AdvIcon[i] := 96 + i - futResearchTechnology
+        else
+        begin
+          AdvIcon[i] := -1;
+          for Domain := 0 to nDomains - 1 do
+            for j := 0 to nUpgrade - 1 do
+              if upgrade[Domain, j].Preq = i then
+                if AdvIcon[i] >= 0 then
+                  AdvIcon[i] := 85
+                else
+                  AdvIcon[i] := 86 + Domain;
+          for j := 0 to nFeature - 1 do
+            if Feature[j].Preq = i then
+              for Domain := 0 to nDomains - 1 do
+                if 1 shl Domain and Feature[j].Domains <> 0 then
+                  if (AdvIcon[i] >= 0) and (AdvIcon[i] <> 86 + Domain) then
+                    AdvIcon[i] := 85
+                  else
+                    AdvIcon[i] := 86 + Domain;
+          for j := 28 to nImp - 1 do
+            if Imp[j].Preq = i then
+              AdvIcon[i] := j;
+          for j := 28 to nImp - 1 do
+            if (Imp[j].Preq = i) and (Imp[j].Kind <> ikCommon) then
+              AdvIcon[i] := j;
+          for j := 0 to nJob - 1 do
+            if i = JobPreq[j] then
+              AdvIcon[i] := 84;
+          for j := 0 to 27 do
+            if Imp[j].Preq = i then
+              AdvIcon[i] := j;
+          if AdvIcon[i] < 0 then
+            if AdvValue[i] < 1000 then
+              AdvIcon[i] := -7
+            else
+              AdvIcon[i] := 24 + AdvValue[i] div 1000;
+          for j := 2 to nGov - 1 do
+            if GovPreq[j] = i then
+              AdvIcon[i] := j - 8;
+        end;
+      AdvIcon[adConscription] := 86 + dGround;
+
+      UnusedTribeFiles := tstringlist.Create;
+      UnusedTribeFiles.Sorted := true;
+      TribeNames := tstringlist.Create;
+
+      for x := 0 to 11 do
+        for y := 0 to 1 do
+          MiniColors[x, y] := GrExt[HGrSystem].Data.Canvas.Pixels
+            [66 + x, 67 + y];
+      IsoEngine.Init(InitEnemyModel);
+      if not IsoEngine.ApplyTileSize(xxt, yyt) and ((xxt <> 48) or (yyt <> 24))
+      then
+        ApplyTileSize(48, 24);
+      // non-default tile size is missing a file, switch to default
+      MainMap := TIsoMap.Create;
+      MainMap.SetOutput(offscreen);
+
+      HGrStdUnits := LoadGraphicSet('StdUnits');
+      SmallImp := TBitmap.Create;
+      SmallImp.PixelFormat := pf24bit;
+      InitSmallImp;
+      SoundPreloadDone := 0;
+      StartRunning := false;
+      StayOnTop_Ensured := false;
+
+      CreatePVSB(sb, Handle, 100 - 200, 122, 100 + MidPanelHeight - 16 - 200);
+    end; { InitModule }
 
   // sound blocks for preload
   const
-  sbStart=$01; sbWonder=$02; sbScience=$04; sbContact=$08;
-  sbTurn=$10; sbAll=$FF;
-
-  procedure SoundPreload(Check: integer);
-  const
-  nStartBlock=27;
-  StartBlock: array[0..nStartBlock-1] of string=
-  ('INVALID','TURNEND','DISBAND','CHEAT','MSG_DEFAULT','WARNING_DISORDER',
-  'WARNING_FAMINE','WARNING_LOWSUPPORT','WARNING_LOWFUNDS','MOVE_MOUNTAIN',
-  'MOVE_LOAD','MOVE_UNLOAD','MOVE_DIE','NOMOVE_TIME','NOMOVE_DOMAIN',
-  'NOMOVE_DEFAULT','CITY_SELLIMP','CITY_REBUILDIMP','CITY_BUYPROJECT',
-  'CITY_UTILIZE','NEWMODEL_0','NEWADVANCE_0','AGE_0','REVOLUTION','NEWGOV',
-  'CITY_INVALIDTYPE','MSG_GAMEOVER');
-
-  nWonderBlock=6;
-  WonderBlock: array[0..nWonderBlock-1] of string=
-  ('WONDER_BUILT','WONDER_CAPTURED','WONDER_EXPIRED','WONDER_DESTROYED',
-  'MSG_COLDWAR','NEWADVANCE_GRLIB');
-
-  nScienceBlock=17;
-  ScienceBlock: array[0..nScienceBlock-1] of string=
-  ('MOVE_PARACHUTE','MOVE_PLANESTART','MOVE_PLANELANDING','MOVE_COVERT',
-  'NEWMODEL_1','NEWMODEL_2','NEWMODEL_3','NEWADVANCE_1','NEWADVANCE_2',
-  'NEWADVANCE_3','AGE_1','AGE_2','AGE_3','SHIP_BUILT','SHIP_TRADED',
-  'SHIP_CAPTURED','SHIP_DESTROYED');
-
-  nContactBlock=20;
-  ContactBlock: array[0..nContactBlock-1] of string=
-  ('NEWTREATY','CANCELTREATY','ACCEPTOFFER','MSG_WITHDRAW','MSG_BANKRUPT',
-  'CONTACT_0','CONTACT_1','CONTACT_2','CONTACT_3','CONTACT_4','CONTACT_5',
-  'CONTACT_5','CONTACT_6','NEGO_REJECTED','MOVE_CAPTURE','MOVE_EXPEL',
-  'NOMOVE_TREATY','NOMOVE_ZOC','NOMOVE_SUBMARINE','NOMOVE_STEALTH');
-
-  var
-  i,cix,mix: integer;
-  need: boolean;
-  mi: TModelInfo;
-  begin
-  if Check and sbStart and not SoundPreloadDone<>0 then
-    begin
-    for i:=0 to nStartBlock-1 do PreparePlay(StartBlock[i]);
-    SoundPreloadDone:=SoundPreloadDone or sbStart;
-    end;
-  if Check and sbWonder and not SoundPreloadDone<>0 then
-    begin
-    need:=false;
-    for i:=0 to 27 do if MyRO.Wonder[i].CityID<>-1 then need:=true;
-    if need then
-      begin
-      for i:=0 to nWonderBlock-1 do PreparePlay(WonderBlock[i]);
-      SoundPreloadDone:=SoundPreloadDone or sbWonder;
+    sbStart = $01;
+    sbWonder = $02;
+    sbScience = $04;
+    sbContact = $08;
+    sbTurn = $10;
+    sbAll = $FF;
+
+    procedure SoundPreload(Check: integer);
+    const
+      nStartBlock = 27;
+      StartBlock: array [0 .. nStartBlock - 1] of string = ('INVALID',
+        'TURNEND', 'DISBAND', 'CHEAT', 'MSG_DEFAULT', 'WARNING_DISORDER',
+        'WARNING_FAMINE', 'WARNING_LOWSUPPORT', 'WARNING_LOWFUNDS',
+        'MOVE_MOUNTAIN', 'MOVE_LOAD', 'MOVE_UNLOAD', 'MOVE_DIE', 'NOMOVE_TIME',
+        'NOMOVE_DOMAIN', 'NOMOVE_DEFAULT', 'CITY_SELLIMP', 'CITY_REBUILDIMP',
+        'CITY_BUYPROJECT', 'CITY_UTILIZE', 'NEWMODEL_0', 'NEWADVANCE_0',
+        'AGE_0', 'REVOLUTION', 'NEWGOV', 'CITY_INVALIDTYPE', 'MSG_GAMEOVER');
+
+      nWonderBlock = 6;
+      WonderBlock: array [0 .. nWonderBlock - 1] of string = ('WONDER_BUILT',
+        'WONDER_CAPTURED', 'WONDER_EXPIRED', 'WONDER_DESTROYED', 'MSG_COLDWAR',
+        'NEWADVANCE_GRLIB');
+
+      nScienceBlock = 17;
+      ScienceBlock: array [0 .. nScienceBlock - 1] of string =
+        ('MOVE_PARACHUTE', 'MOVE_PLANESTART', 'MOVE_PLANELANDING',
+        'MOVE_COVERT', 'NEWMODEL_1', 'NEWMODEL_2', 'NEWMODEL_3', 'NEWADVANCE_1',
+        'NEWADVANCE_2', 'NEWADVANCE_3', 'AGE_1', 'AGE_2', 'AGE_3', 'SHIP_BUILT',
+        'SHIP_TRADED', 'SHIP_CAPTURED', 'SHIP_DESTROYED');
+
+      nContactBlock = 20;
+      ContactBlock: array [0 .. nContactBlock - 1] of string = ('NEWTREATY',
+        'CANCELTREATY', 'ACCEPTOFFER', 'MSG_WITHDRAW', 'MSG_BANKRUPT',
+        'CONTACT_0', 'CONTACT_1', 'CONTACT_2', 'CONTACT_3', 'CONTACT_4',
+        'CONTACT_5', 'CONTACT_5', 'CONTACT_6', 'NEGO_REJECTED', 'MOVE_CAPTURE',
+        'MOVE_EXPEL', 'NOMOVE_TREATY', 'NOMOVE_ZOC', 'NOMOVE_SUBMARINE',
+        'NOMOVE_STEALTH');
+
+    var
+      i, cix, mix: integer;
+      need: boolean;
+      mi: TModelInfo;
+    begin
+      if Check and sbStart and not SoundPreloadDone <> 0 then
+      begin
+        for i := 0 to nStartBlock - 1 do
+          PreparePlay(StartBlock[i]);
+        SoundPreloadDone := SoundPreloadDone or sbStart;
       end;
-    end;
-  if (Check and sbScience and not SoundPreloadDone<>0)
-    and (MyRO.Tech[adScience]>=tsApplicable) then
-    begin
-    for i:=0 to nScienceBlock-1 do PreparePlay(ScienceBlock[i]);
-    SoundPreloadDone:=SoundPreloadDone or sbScience;
-    end;
-  if (Check and sbContact and not SoundPreloadDone<>0)
-    and (MyRO.nEnemyModel+MyRO.nEnemyCity>0) then
-    begin
-    for i:=0 to nContactBlock-1 do PreparePlay(ContactBlock[i]);
-    SoundPreloadDone:=SoundPreloadDone or sbContact;
-    end;
-  if Check and sbTurn<>0 then
-    begin
-    if MyRO.Happened and phShipComplete<>0 then
-      PreparePlay('MSG_YOUWIN');
-    if MyData.ToldAlive<>MyRO.Alive then PreparePlay('MSG_EXTINCT');
-    for cix:=0 to MyRO.nCity-1 do with MyCity[cix] do
-      if (Loc>=0) and (Flags and CityRepMask<>0) then
-        for i:=0 to 12 do if 1 shl i and Flags and CityRepMask<>0 then
-          PreparePlay(CityEventSoundItem[i]);
-     for mix:=0 to MyRO.nModel-1 do with MyModel[mix] do if Attack>0 then
-       begin
-       MakeModelInfo(me,mix,MyModel[mix],mi);
-       PreparePlay(AttackSound(ModelCode(mi)));
-       end
-     end
-  end;
-
-  procedure InitTurn(p: integer);
-  const
-  nAdvBookIcon=16;
-  AdvBookIcon: array[0..nAdvBookIcon-1] of record Adv,Icon: integer end=
-  ((Adv:adPolyTheism;Icon:woZeus),(Adv:adBronzeWorking;Icon:woColossus),
-  (Adv:adMapMaking;Icon:woLighthouse),(Adv:adPoetry;Icon:imTheater),
-  (Adv:adMonotheism;Icon:woMich),(Adv:adPhilosophy;Icon:woLeo),
-  (Adv:adTheoryOfGravity;Icon:woNewton),(Adv:adSteel;Icon:woEiffel),
-  (Adv:adDemocracy;Icon:woLiberty),(Adv:adAutomobile;Icon:imHighways),
-  (Adv:adSanitation;Icon:imSewer),(Adv:adElectronics;Icon:woHoover),
-  (Adv:adNuclearFission;Icon:woManhattan),(Adv:adRecycling;Icon:imRecycling),
-  (Adv:adComputers;Icon:imResLab),(Adv:adSpaceFlight;Icon:woMIR));
-  var
-  Domain,p1,i,ad,uix,cix,MoveOptions,MoveResult,Loc1,Dist,NewAgeCenterTo,
-    Bankrupt,ShipMore,Winners,NewGovAvailable,dx,dy:integer;
-  MoveAdviceData: TMoveAdviceData;
-  Picture: TModelPictureInfo;
-  s, Item, Item2: string;
-  UpdatePanel, OwnWonder, ok, Stop, ShowCityList, WondersOnly,AllowCityScreen: boolean;
-  begin
-  if IsMultiPlayerGame and (p<>me) then
-    begin
-    UnitInfoBtn.Visible:=false;
-    UnitBtn.Visible:=false;
-    TerrainBtn.Visible:=false;
-    EOT.Visible:=false;
-    end;
-  if IsMultiPlayerGame and (p<>me) and (G.RO[0].Happened and phShipComplete=0) then
-    begin //inter player screen
-    for i:=0 to ControlCount-1 do if Controls[i] is TButtonC then
-      Controls[i].visible:=false;
-    me:=-1;
-    SetMainTextureByAge(-1);
-    with Panel.Canvas do
-      begin
-      Brush.Color:=$000000;
-      FillRect(Rect(0,0,Panel.Width,Panel.Height));
-      Brush.Style:=bsClear;
+      if Check and sbWonder and not SoundPreloadDone <> 0 then
+      begin
+        need := false;
+        for i := 0 to 27 do
+          if MyRO.Wonder[i].CityID <> -1 then
+            need := true;
+        if need then
+        begin
+          for i := 0 to nWonderBlock - 1 do
+            PreparePlay(WonderBlock[i]);
+          SoundPreloadDone := SoundPreloadDone or sbWonder;
+        end;
       end;
-    with TopBar.Canvas do
-      begin
-      Brush.Color:=$000000;
-      FillRect(Rect(0,0,TopBar.Width,TopBar.Height));
-      Brush.Style:=bsClear;
+      if (Check and sbScience and not SoundPreloadDone <> 0) and
+        (MyRO.Tech[adScience] >= tsApplicable) then
+      begin
+        for i := 0 to nScienceBlock - 1 do
+          PreparePlay(ScienceBlock[i]);
+        SoundPreloadDone := SoundPreloadDone or sbScience;
       end;
-    Invalidate;
-
-    s:=TurnToString(G.RO[0].Turn);
-    if supervising then
-      SimpleMessage(Format(Phrases.Lookup('SUPERTURN'),[s]))
-    else SimpleMessage(Format(Tribe[NewPlayer].TPhrase('TURN'),[s]));
-    end;
-  for i:=0 to ControlCount-1 do if Controls[i] is TButtonC then
-    Controls[i].visible:=true;
-
-  ItsMeAgain(p);
-  MyData:=G.RO[p].Data;
-  if not supervising then
-    SoundPreload(sbAll);
-  if (me=0) and ((MyRO.Turn=0) or (ClientMode=cResume)) then
-    Invalidate; // colorize empty space
-
-  if not supervising then
-    begin
-{    if MyRO.Happened and phGameEnd<>0 then
-      begin
-      Age:=3;
-      SetMainTextureByAge(-1);
+      if (Check and sbContact and not SoundPreloadDone <> 0) and
+        (MyRO.nEnemyModel + MyRO.nEnemyCity > 0) then
+      begin
+        for i := 0 to nContactBlock - 1 do
+          PreparePlay(ContactBlock[i]);
+        SoundPreloadDone := SoundPreloadDone or sbContact;
+      end;
+      if Check and sbTurn <> 0 then
+      begin
+        if MyRO.Happened and phShipComplete <> 0 then
+          PreparePlay('MSG_YOUWIN');
+        if MyData.ToldAlive <> MyRO.Alive then
+          PreparePlay('MSG_EXTINCT');
+        for cix := 0 to MyRO.nCity - 1 do
+          with MyCity[cix] do
+            if (Loc >= 0) and (Flags and CityRepMask <> 0) then
+              for i := 0 to 12 do
+                if 1 shl i and Flags and CityRepMask <> 0 then
+                  PreparePlay(CityEventSoundItem[i]);
+        for mix := 0 to MyRO.nModel - 1 do
+          with MyModel[mix] do
+            if Attack > 0 then
+            begin
+              MakeModelInfo(me, mix, MyModel[mix], mi);
+              PreparePlay(AttackSound(ModelCode(mi)));
+            end
       end
-    else}
-      begin
-      Age:=GetAge(me);
-      if SetMainTextureByAge(Age) then
-        EOT.Invalidate; // has visible background parts in its bounds
+    end;
+
+    procedure InitTurn(p: integer);
+    const
+      nAdvBookIcon = 16;
+      AdvBookIcon: array [0 .. nAdvBookIcon - 1] of record Adv,
+        Icon: integer end = ((Adv: adPolyTheism; Icon: woZeus),
+        (Adv: adBronzeWorking; Icon: woColossus), (Adv: adMapMaking;
+        Icon: woLighthouse), (Adv: adPoetry; Icon: imTheater),
+        (Adv: adMonotheism; Icon: woMich), (Adv: adPhilosophy; Icon: woLeo),
+        (Adv: adTheoryOfGravity; Icon: woNewton), (Adv: adSteel;
+        Icon: woEiffel), (Adv: adDemocracy; Icon: woLiberty),
+        (Adv: adAutomobile; Icon: imHighways), (Adv: adSanitation;
+        Icon: imSewer), (Adv: adElectronics; Icon: woHoover),
+        (Adv: adNuclearFission; Icon: woManhattan), (Adv: adRecycling;
+        Icon: imRecycling), (Adv: adComputers; Icon: imResLab),
+        (Adv: adSpaceFlight; Icon: woMIR));
+    var
+      Domain, p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1, Dist,
+        NewAgeCenterTo, Bankrupt, ShipMore, Winners, NewGovAvailable, dx,
+        dy: integer;
+      MoveAdviceData: TMoveAdviceData;
+      Picture: TModelPictureInfo;
+      s, Item, Item2: string;
+      UpdatePanel, OwnWonder, ok, Stop, ShowCityList, WondersOnly,
+        AllowCityScreen: boolean;
+    begin
+      if IsMultiPlayerGame and (p <> me) then
+      begin
+        UnitInfoBtn.Visible := false;
+        UnitBtn.Visible := false;
+        TerrainBtn.Visible := false;
+        EOT.Visible := false;
       end;
-//    age:=MyRO.Turn mod 4; //!!!
-    if ClientMode=cMovieTurn then
-      EOT.ButtonIndex:=eotCancel
-    else if ClientMode<scContact then
-      EOT.ButtonIndex:=eotGray
-    else EOT.ButtonIndex:=eotBackToNego;
-    end
-  else
-    begin
-    Age:=0;
-    SetMainTextureByAge(-1);
-    if ClientMode=cMovieTurn then
-      EOT.ButtonIndex:=eotCancel
-    else EOT.ButtonIndex:=eotBlinkOn;
-    end;
-  InitCityMark(MainTexture);
-  CityDlg.CheckAge;
-  NatStatDlg.CheckAge;
-  UnitStatDlg.CheckAge;
-  HelpDlg.Difficulty:=G.Difficulty[me];
-
-  UnFocus:=-1;
-  MarkCityLoc:=-1;
-  BlinkON:=false;
-  BlinkTime:=-1;
-  Tracking:=false;
-  TurnComplete:=false;
-
-  if (ToldSlavery<0)
-    or ((ToldSlavery=1)<>(MyRO.Wonder[woPyramids].EffectiveOwner>=0)) then
-    begin
-    if MyRO.Wonder[woPyramids].EffectiveOwner>=0 then ToldSlavery:=1
-    else ToldSlavery:=0;
-    for p1:=0 to nPl-1 do
-      if (Tribe[p1]<>nil) and (Tribe[p1].mixSlaves>=0) then
-        with Picture do
-          begin // replace unit picture
-          mix:=Tribe[p1].mixSlaves;
-          if ToldSlavery=1 then pix:=pixSlaves else pix:=pixNoSlaves;
-          Hash:=0;
-          GrName:='StdUnits';
-          Tribe[p1].SetModelPicture(Picture, true);
+      if IsMultiPlayerGame and (p <> me) and
+        (G.RO[0].Happened and phShipComplete = 0) then
+      begin // inter player screen
+        for i := 0 to ControlCount - 1 do
+          if Controls[i] is TButtonC then
+            Controls[i].Visible := false;
+        me := -1;
+        SetMainTextureByAge(-1);
+        with Panel.Canvas do
+        begin
+          Brush.Color := $000000;
+          FillRect(Rect(0, 0, Panel.width, Panel.height));
+          Brush.Style := bsClear;
+        end;
+        with TopBar.Canvas do
+        begin
+          Brush.Color := $000000;
+          FillRect(Rect(0, 0, TopBar.width, TopBar.height));
+          Brush.Style := bsClear;
+        end;
+        Invalidate;
+
+        s := TurnToString(G.RO[0].Turn);
+        if supervising then
+          SimpleMessage(Format(Phrases.Lookup('SUPERTURN'), [s]))
+        else
+          SimpleMessage(Format(Tribe[NewPlayer].TPhrase('TURN'), [s]));
+      end;
+      for i := 0 to ControlCount - 1 do
+        if Controls[i] is TButtonC then
+          Controls[i].Visible := true;
+
+      ItsMeAgain(p);
+      MyData := G.RO[p].Data;
+      if not supervising then
+        SoundPreload(sbAll);
+      if (me = 0) and ((MyRO.Turn = 0) or (ClientMode = cResume)) then
+        Invalidate; // colorize empty space
+
+      if not supervising then
+      begin
+
+        { if MyRO.Happened and phGameEnd<>0 then
+          begin
+          Age:=3;
+          SetMainTextureByAge(-1);
           end
-    end;
-
-  if not supervising and (ClientMode=cTurn) then
-    begin
-    for cix:=0 to MyRO.nCity-1 do
-      if (MyCity[cix].Loc>=0)
-        and ((MyRO.Turn=0) or (MyCity[cix].Flags and chFounded<>0)) then
-        MyCity[cix].Status:=MyCity[cix].Status
-          and not csResourceWeightsMask or (3 shl 4); // new city, set to maximum growth
-    end;
-  if (ClientMode=cTurn) or (ClientMode=cContinue) then
-    CityOptimizer_BeginOfTurn; // maybe peace was made or has ended
-  SumCities(TaxSum,ScienceSum);
-
-  if ClientMode=cMovieTurn then
-    begin
-    UnitInfoBtn.Visible:=false;
-    UnitBtn.Visible:=false;
-    TerrainBtn.Visible:=false;
-    EOT.Hint:=Phrases.Lookup('BTN_STOP');
-    EOT.Visible:=true;
-    end
-  else if ClientMode<scContact then
-    begin
-    UnitInfoBtn.Visible:= UnFocus>=0;
-    UnitBtn.Visible:= UnFocus>=0;
-    CheckTerrainBtnVisible;
-    TurnComplete:=supervising;
-    EOT.Hint:=Phrases.Lookup('BTN_ENDTURN');
-    EOT.Visible:= Server(sTurn-sExecute,me,0,nil^)>=rExecuted;
-    end
-  else
-    begin
-    UnitInfoBtn.Visible:=false;
-    UnitBtn.Visible:=false;
-    TerrainBtn.Visible:=false;
-    EOT.Hint:=Phrases.Lookup('BTN_NEGO');
-    EOT.Visible:=true;
-    end;
-  SetTroopLoc(-1);
-  MapValid:=false;
-  NewAgeCenterTo:=0;
-  if ((MyRO.Turn=0) and not supervising or IsMultiPlayerGame
-    or (ClientMode=cResume)) and (MyRO.nCity>0) then
-    begin
-    Loc1:=MyCity[0].Loc;
-    if (ClientMode=cTurn) and (MyRO.Turn=0) then
-      begin // move city out of center to not be covered by welcome screen
-      dx:=MapWidth div (xxt*5);
-      if dx>5 then
-        dx:=5;
-      dy:=MapHeight div (yyt*5);
-      if dy>5 then
-        dy:=5;
-      if Loc1>=G.lx*G.ly div 2 then
-        begin
-        NewAgeCenterTo:=-1;
-        Loc1:=dLoc(Loc1,-dx,-dy)
-        end
+          else }
+        begin
+          Age := GetAge(me);
+          if SetMainTextureByAge(Age) then
+            EOT.Invalidate; // has visible background parts in its bounds
+        end;
+        // age:=MyRO.Turn mod 4; //!!!
+        if ClientMode = cMovieTurn then
+          EOT.ButtonIndex := eotCancel
+        else if ClientMode < scContact then
+          EOT.ButtonIndex := eotGray
+        else
+          EOT.ButtonIndex := eotBackToNego;
+      end
       else
-        begin
-        NewAgeCenterTo:=1;
-        Loc1:=dLoc(Loc1,-dx,dy);
-        end
+      begin
+        Age := 0;
+        SetMainTextureByAge(-1);
+        if ClientMode = cMovieTurn then
+          EOT.ButtonIndex := eotCancel
+        else
+          EOT.ButtonIndex := eotBlinkOn;
       end;
-    Centre(Loc1)
-    end;
-
-  for i:=0 to Screen.FormCount-1 do
-    if Screen.Forms[i] is TBufferedDrawDlg then
-      Screen.Forms[i].Enabled:=true;
-
-  if ClientMode<>cResume then
-    begin
-    PaintAll;
-    if (MyRO.Happened and phChangeGov<>0) and (MyRO.NatBuilt[imPalace]>0) then
-      ImpImage(Panel.Canvas, ClientWidth-xPalace, yPalace, imPalace, gAnarchy{, GameMode<>cMovie});
-      // first turn after anarchy -- don't show despotism palace!
-    Update;
-    for i:=0 to Screen.FormCount-1 do
-      if (Screen.Forms[i].Visible) and (Screen.Forms[i] is TBufferedDrawDlg) then
-        begin
-        if @Screen.Forms[i].OnShow<>nil then
-          Screen.Forms[i].OnShow(nil);
-        Screen.Forms[i].Invalidate;
-        Screen.Forms[i].Update;
-        end;
-
-    if MyRO.Happened and phGameEnd<>0 then
-      with MessgExDlg do
-        begin // game ended
-        if MyRO.Happened and phExtinct<>0 then
+      InitCityMark(MainTexture);
+      CityDlg.CheckAge;
+      NatStatDlg.CheckAge;
+      UnitStatDlg.CheckAge;
+      HelpDlg.Difficulty := G.Difficulty[me];
+
+      UnFocus := -1;
+      MarkCityLoc := -1;
+      BlinkON := false;
+      BlinkTime := -1;
+      Tracking := false;
+      TurnComplete := false;
+
+      if (ToldSlavery < 0) or
+        ((ToldSlavery = 1) <> (MyRO.Wonder[woPyramids].EffectiveOwner >= 0))
+      then
+      begin
+        if MyRO.Wonder[woPyramids].EffectiveOwner >= 0 then
+          ToldSlavery := 1
+        else
+          ToldSlavery := 0;
+        for p1 := 0 to nPl - 1 do
+          if (Tribe[p1] <> nil) and (Tribe[p1].mixSlaves >= 0) then
+            with Picture do
+            begin // replace unit picture
+              mix := Tribe[p1].mixSlaves;
+              if ToldSlavery = 1 then
+                pix := pixSlaves
+              else
+                pix := pixNoSlaves;
+              Hash := 0;
+              GrName := 'StdUnits';
+              Tribe[p1].SetModelPicture(Picture, true);
+            end
+      end;
+
+      if not supervising and (ClientMode = cTurn) then
+      begin
+        for cix := 0 to MyRO.nCity - 1 do
+          if (MyCity[cix].Loc >= 0) and
+            ((MyRO.Turn = 0) or (MyCity[cix].Flags and chFounded <> 0)) then
+            MyCity[cix].Status := MyCity[cix].Status and
+              not csResourceWeightsMask or (3 shl 4);
+        // new city, set to maximum growth
+      end;
+      if (ClientMode = cTurn) or (ClientMode = cContinue) then
+        CityOptimizer_BeginOfTurn; // maybe peace was made or has ended
+      SumCities(TaxSum, ScienceSum);
+
+      if ClientMode = cMovieTurn then
+      begin
+        UnitInfoBtn.Visible := false;
+        UnitBtn.Visible := false;
+        TerrainBtn.Visible := false;
+        EOT.Hint := Phrases.Lookup('BTN_STOP');
+        EOT.Visible := true;
+      end
+      else if ClientMode < scContact then
+      begin
+        UnitInfoBtn.Visible := UnFocus >= 0;
+        UnitBtn.Visible := UnFocus >= 0;
+        CheckTerrainBtnVisible;
+        TurnComplete := supervising;
+        EOT.Hint := Phrases.Lookup('BTN_ENDTURN');
+        EOT.Visible := Server(sTurn - sExecute, me, 0, nil^) >= rExecuted;
+      end
+      else
+      begin
+        UnitInfoBtn.Visible := false;
+        UnitBtn.Visible := false;
+        TerrainBtn.Visible := false;
+        EOT.Hint := Phrases.Lookup('BTN_NEGO');
+        EOT.Visible := true;
+      end;
+      SetTroopLoc(-1);
+      MapValid := false;
+      NewAgeCenterTo := 0;
+      if ((MyRO.Turn = 0) and not supervising or IsMultiPlayerGame or
+        (ClientMode = cResume)) and (MyRO.nCity > 0) then
+      begin
+        Loc1 := MyCity[0].Loc;
+        if (ClientMode = cTurn) and (MyRO.Turn = 0) then
+        begin // move city out of center to not be covered by welcome screen
+          dx := MapWidth div (xxt * 5);
+          if dx > 5 then
+            dx := 5;
+          dy := MapHeight div (yyt * 5);
+          if dy > 5 then
+            dy := 5;
+          if Loc1 >= G.lx * G.ly div 2 then
           begin
-          OpenSound:='MSG_GAMEOVER';
-          MessgText:=Tribe[me].TPhrase('GAMEOVER');
-          IconKind:=mikBigIcon;
-          IconIndex:=8;
+            NewAgeCenterTo := -1;
+            Loc1 := dLoc(Loc1, -dx, -dy)
           end
-        else if MyRO.Happened and phShipComplete<>0 then
+          else
           begin
-          Winners:=0;
-          for p1:=0 to nPl-1 do if 1 shl p1 and MyRO.Alive<>0 then
+            NewAgeCenterTo := 1;
+            Loc1 := dLoc(Loc1, -dx, dy);
+          end
+        end;
+        Centre(Loc1)
+      end;
+
+      for i := 0 to Screen.FormCount - 1 do
+        if Screen.Forms[i] is TBufferedDrawDlg then
+          Screen.Forms[i].Enabled := true;
+
+      if ClientMode <> cResume then
+      begin
+        PaintAll;
+        if (MyRO.Happened and phChangeGov <> 0) and (MyRO.NatBuilt[imPalace] > 0)
+        then
+          ImpImage(Panel.Canvas, ClientWidth - xPalace, yPalace, imPalace,
+            gAnarchy { , GameMode<>cMovie } );
+        // first turn after anarchy -- don't show despotism palace!
+        Update;
+        for i := 0 to Screen.FormCount - 1 do
+          if (Screen.Forms[i].Visible) and (Screen.Forms[i] is TBufferedDrawDlg)
+          then
+          begin
+            if @Screen.Forms[i].OnShow <> nil then
+              Screen.Forms[i].OnShow(nil);
+            Screen.Forms[i].Invalidate;
+            Screen.Forms[i].Update;
+          end;
+
+        if MyRO.Happened and phGameEnd <> 0 then
+          with MessgExDlg do
+          begin // game ended
+            if MyRO.Happened and phExtinct <> 0 then
             begin
-            Winners:=Winners or 1 shl p1;
-            for i:=0 to nShipPart-1 do
-              if MyRO.Ship[p1].Parts[i]<ShipNeed[i] then
-                Winners:=Winners and not (1 shl p1);
+              OpenSound := 'MSG_GAMEOVER';
+              MessgText := Tribe[me].TPhrase('GAMEOVER');
+              IconKind := mikBigIcon;
+              IconIndex := 8;
+            end
+            else if MyRO.Happened and phShipComplete <> 0 then
+            begin
+              Winners := 0;
+              for p1 := 0 to nPl - 1 do
+                if 1 shl p1 and MyRO.Alive <> 0 then
+                begin
+                  Winners := Winners or 1 shl p1;
+                  for i := 0 to nShipPart - 1 do
+                    if MyRO.Ship[p1].Parts[i] < ShipNeed[i] then
+                      Winners := Winners and not(1 shl p1);
+                end;
+              assert(Winners <> 0);
+              if Winners and (1 shl me) <> 0 then
+              begin
+                s := '';
+                for p1 := 0 to nPl - 1 do
+                  if (p1 <> me) and (1 shl p1 and Winners <> 0) then
+                    if s = '' then
+                      s := Tribe[p1].TPhrase('SHORTNAME')
+                    else
+                      s := Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
+                        [s, Tribe[p1].TPhrase('SHORTNAME')]);
+
+                OpenSound := 'MSG_YOUWIN';
+                MessgText := Tribe[me].TPhrase('MYSPACESHIP');
+                if s <> '' then
+                  MessgText := MessgText + '\' +
+                    Format(Phrases.Lookup('SHAREDWIN'), [s]);
+                IconKind := mikBigIcon;
+                IconIndex := 9;
+              end
+              else
+              begin
+                assert(me = 0);
+                OpenSound := 'MSG_GAMEOVER';
+                MessgText := '';
+                for p1 := 0 to nPl - 1 do
+                  if Winners and (1 shl p1) <> 0 then
+                    MessgText := MessgText + Tribe[p1].TPhrase('SPACESHIP1');
+                MessgText := MessgText + '\' + Phrases.Lookup('SPACESHIP2');
+                IconKind := mikEnemyShipComplete;
+              end
+            end
+            else { if MyRO.Happened and fTimeUp<>0 then }
+            begin
+              assert(me = 0);
+              OpenSound := 'MSG_GAMEOVER';
+              if not supervising then
+                MessgText := Tribe[me].TPhrase('TIMEUP')
+              else
+                MessgText := Phrases.Lookup('TIMEUPSUPER');
+              IconKind := mikImp;
+              IconIndex := 22;
             end;
-          assert(Winners<>0);
-          if Winners and (1 shl me)<>0 then
+            Kind := mkOk;
+            ShowModal;
+            if MyRO.Happened and phExtinct = 0 then
             begin
-            s:='';
-            for p1:=0 to nPl-1 do
-              if (p1<>me) and (1 shl p1 and Winners<>0) then
-                if s='' then s:=Tribe[p1].TPhrase('SHORTNAME')
-                else s:=Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
-                  [s,Tribe[p1].TPhrase('SHORTNAME')]);
-
-            OpenSound:='MSG_YOUWIN';
-            MessgText:=Tribe[me].TPhrase('MYSPACESHIP');
-            if s<>'' then
-              MessgText:=MessgText+'\'+Format(Phrases.Lookup('SHAREDWIN'),[s]);
-            IconKind:=mikBigIcon;
-            IconIndex:=9;
+              p1 := 0;
+              while (p1 < nPl - 1) and (Winners and (1 shl p1) = 0) do
+                inc(p1);
+              if MyRO.Happened and phShipComplete = 0 then
+                DiaDlg.ShowNewContent_Charts(wmModal);
+            end;
+            TurnComplete := true;
+            exit;
+          end;
+        if not supervising and (1 shl me and MyRO.Alive = 0) then
+        begin
+          TurnComplete := true;
+          exit;
+        end;
+
+        if (ClientMode = cContinue) and
+          (DipMem[me].SentCommand and $FF0F = scContact) then
+          // contact was refused
+          if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
+            ContactRefused(DipMem[me].pContact, 'FRREJECTED')
+          else
+            SoundMessage(Tribe[DipMem[me].pContact].TPhrase('FRREJECTED'),
+              'NEGO_REJECTED');
+
+        if not supervising and (Age > MyData.ToldAge) and
+          ((Age > 0) or (ClientMode <> cMovieTurn)) then
+          with MessgExDlg do
+          begin
+            if Age = 0 then
+            begin
+              if Phrases2FallenBackToEnglish then
+              begin
+                s := Tribe[me].TPhrase('AGE0');
+                MessgText :=
+                  Format(s, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)])
+              end
+              else
+              begin
+                s := Tribe[me].TString(Phrases2.Lookup('AGE0'));
+                MessgText := Format(s, [TurnToString(MyRO.Turn)]);
+              end
             end
-          else
+            else
             begin
-            assert(me=0);
-            OpenSound:='MSG_GAMEOVER';
-            MessgText:='';
-            for p1:=0 to nPl-1 do if Winners and (1 shl p1)<>0 then
-              MessgText:=MessgText+Tribe[p1].TPhrase('SPACESHIP1');
-            MessgText:=MessgText+'\'+Phrases.Lookup('SPACESHIP2');
-            IconKind:=mikEnemyShipComplete;
+              s := Tribe[me].TPhrase('AGE' + char(48 + Age));
+              MessgText := Format(s, [TurnToString(MyRO.Turn)]);
+            end;
+            IconKind := mikAge;
+            IconIndex := Age;
+            { if age=0 then } Kind := mkOk
+            { else begin Kind:=mkOkHelp; HelpKind:=hkAdv; HelpNo:=AgePreq[age]; end };
+            CenterTo := NewAgeCenterTo;
+            OpenSound := 'AGE_' + char(48 + Age);
+            ShowModal;
+            MyData.ToldAge := Age;
+            if Age > 0 then
+              MyData.ToldTech[AgePreq[Age]] := MyRO.Tech[AgePreq[Age]];
+          end;
+
+        if MyData.ToldAlive <> MyRO.Alive then
+        begin
+          for p1 := 0 to nPl - 1 do
+            if (MyData.ToldAlive - MyRO.Alive) and (1 shl p1) <> 0 then
+              with MessgExDlg do
+              begin
+                OpenSound := 'MSG_EXTINCT';
+                s := Tribe[p1].TPhrase('EXTINCT');
+                MessgText := Format(s, [TurnToString(MyRO.Turn)]);
+                if MyRO.Alive = 1 shl me then
+                  MessgText := MessgText + Phrases.Lookup('EXTINCTALL');
+                Kind := mkOk;
+                IconKind := mikImp;
+                IconIndex := 21;
+                ShowModal;
+              end;
+          if (ClientMode <> cMovieTurn) and not supervising then
+            DiaDlg.ShowNewContent_Charts(wmModal);
+        end;
+
+        // tell changes of own credibility
+        if not supervising then
+        begin
+          if RoughCredibility(MyRO.Credibility) <>
+            RoughCredibility(MyData.ToldOwnCredibility) then
+          begin
+            if RoughCredibility(MyRO.Credibility) >
+              RoughCredibility(MyData.ToldOwnCredibility) then
+              s := Phrases.Lookup('CREDUP')
+            else
+              s := Phrases.Lookup('CREDDOWN');
+            TribeMessage(me,
+              Format(s, [Phrases.Lookup('CREDIBILITY',
+              RoughCredibility(MyRO.Credibility))]), '');
+          end;
+          MyData.ToldOwnCredibility := MyRO.Credibility;
+        end;
+
+        for i := 0 to 27 do
+        begin
+          OwnWonder := false;
+          for cix := 0 to MyRO.nCity - 1 do
+            if (MyCity[cix].Loc >= 0) and
+              (MyCity[cix].ID = MyRO.Wonder[i].CityID) then
+              OwnWonder := true;
+          if MyRO.Wonder[i].CityID <> MyData.ToldWonders[i].CityID then
+          begin
+            if MyRO.Wonder[i].CityID = -2 then
+              with MessgExDlg do
+              begin { tell about destroyed wonders }
+                OpenSound := 'WONDER_DESTROYED';
+                MessgText := Format(Phrases.Lookup('WONDERDEST'),
+                  [Phrases.Lookup('IMPROVEMENTS', i)]);
+                Kind := mkOkHelp;
+                HelpKind := hkImp;
+                HelpNo := i;
+                IconKind := mikImp;
+                IconIndex := i;
+                ShowModal;
+              end
+            else
+            begin
+              if i = woManhattan then
+                if MyRO.Wonder[i].EffectiveOwner > me then
+                  MyData.ColdWarStart := MyRO.Turn - 1
+                else
+                  MyData.ColdWarStart := MyRO.Turn;
+              if not OwnWonder then
+                with MessgExDlg do
+                begin { tell about newly built wonders }
+                  if i = woManhattan then
+                  begin
+                    OpenSound := 'MSG_COLDWAR';
+                    s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR')
+                  end
+                  else if MyRO.Wonder[i].EffectiveOwner >= 0 then
+                  begin
+                    OpenSound := 'WONDER_BUILT';
+                    s := Tribe[MyRO.Wonder[i].EffectiveOwner]
+                      .TPhrase('WONDERBUILT')
+                  end
+                  else
+                  begin
+                    OpenSound := 'MSG_DEFAULT';
+                    s := Phrases.Lookup('WONDERBUILTEXP');
+                    // already expired when built
+                  end;
+                  MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
+                    CityName(MyRO.Wonder[i].CityID)]);
+                  Kind := mkOkHelp;
+                  HelpKind := hkImp;
+                  HelpNo := i;
+                  IconKind := mikImp;
+                  IconIndex := i;
+                  ShowModal;
+                end
             end
           end
-        else {if MyRO.Happened and fTimeUp<>0 then}
+          else if (MyRO.Wonder[i].EffectiveOwner <> MyData.ToldWonders[i]
+            .EffectiveOwner) and (MyRO.Wonder[i].CityID > -2) then
+            if MyRO.Wonder[i].EffectiveOwner < 0 then
+            begin
+              if i <> woMIR then
+                with MessgExDlg do
+                begin { tell about expired wonders }
+                  OpenSound := 'WONDER_EXPIRED';
+                  MessgText := Format(Phrases.Lookup('WONDEREXP'),
+                    [Phrases.Lookup('IMPROVEMENTS', i),
+                    CityName(MyRO.Wonder[i].CityID)]);
+                  Kind := mkOkHelp;
+                  HelpKind := hkImp;
+                  HelpNo := i;
+                  IconKind := mikImp;
+                  IconIndex := i;
+                  ShowModal;
+                end
+            end
+            else if (MyData.ToldWonders[i].EffectiveOwner >= 0) and not OwnWonder
+            then
+              with MessgExDlg do
+              begin { tell about capture of wonders }
+                OpenSound := 'WONDER_CAPTURED';
+                s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('WONDERCAPT');
+                MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
+                  CityName(MyRO.Wonder[i].CityID)]);
+                Kind := mkOkHelp;
+                HelpKind := hkImp;
+                HelpNo := i;
+                IconKind := mikImp;
+                IconIndex := i;
+                ShowModal;
+              end;
+        end;
+
+        if MyRO.Turn = MyData.ColdWarStart + ColdWarTurns then
+        begin
+          SoundMessageEx(Phrases.Lookup('COLDWAREND'), 'MSG_DEFAULT');
+          MyData.ColdWarStart := -ColdWarTurns - 1
+        end;
+
+        TellNewModels;
+      end; // ClientMode<>cResume
+      MyData.ToldAlive := MyRO.Alive;
+      move(MyRO.Wonder, MyData.ToldWonders, SizeOf(MyData.ToldWonders));
+
+      NewGovAvailable := -1;
+      if ClientMode <> cResume then
+      begin // tell about new techs
+        for ad := 0 to nAdv - 1 do
+          if (MyRO.TestFlags and tfAllTechs = 0) and
+            ((MyRO.Tech[ad] >= tsApplicable) <>
+            (MyData.ToldTech[ad] >= tsApplicable)) or (ad in FutureTech) and
+            (MyRO.Tech[ad] <> MyData.ToldTech[ad]) then
+            with MessgExDlg do
+            begin
+              Item := 'RESEARCH_GENERAL';
+              if GameMode <> cMovie then
+                OpenSound := 'NEWADVANCE_' + char(48 + Age);
+              Item2 := Phrases.Lookup('ADVANCES', ad);
+              if ad in FutureTech then
+                Item2 := Item2 + ' ' + IntToStr(MyRO.Tech[ad]);
+              MessgText := Format(Phrases.Lookup(Item), [Item2]);
+              Kind := mkOkHelp;
+              HelpKind := hkAdv;
+              HelpNo := ad;
+              IconKind := mikBook;
+              IconIndex := -1;
+              for i := 0 to nAdvBookIcon - 1 do
+                if AdvBookIcon[i].Adv = ad then
+                  IconIndex := AdvBookIcon[i].Icon;
+              ShowModal;
+              MyData.ToldTech[ad] := MyRO.Tech[ad];
+              for i := gMonarchy to nGov - 1 do
+                if GovPreq[i] = ad then
+                  NewGovAvailable := i;
+            end;
+      end;
+
+      ShowCityList := false;
+      if ClientMode = cTurn then
+      begin
+        if (MyRO.Happened and phTech <> 0) and (MyData.FarTech <> adNexus) then
+          ChooseResearch;
+
+        UpdatePanel := false;
+        if MyRO.Happened and phChangeGov <> 0 then
+        begin
+          ModalSelectDlg.ShowNewContent(wmModal, kGov);
+          Play('NEWGOV');
+          Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
+          CityOptimizer_BeginOfTurn;
+          UpdatePanel := true;
+        end;
+      end; // ClientMode=cTurn
+
+      if not supervising and ((ClientMode = cTurn) or (ClientMode = cMovieTurn))
+      then
+        for cix := 0 to MyRO.nCity - 1 do
+          with MyCity[cix] do
+            Status := Status and not csToldBombard;
+
+      if ((ClientMode = cTurn) or (ClientMode = cMovieTurn)) and
+        (MyRO.Government <> gAnarchy) then
+      begin
+        // tell what happened in cities
+        for WondersOnly := true downto false do
+          for cix := 0 to MyRO.nCity - 1 do
+            with MyCity[cix] do
+              if (MyRO.Turn > 0) and (Loc >= 0) and (Flags and chCaptured = 0)
+                and (WondersOnly = (Flags and chProduction <> 0) and
+                (Project0 and cpImp <> 0) and (Project0 and cpIndex < 28)) then
+              begin
+                if WondersOnly then
+                  with MessgExDlg do
+                  begin { tell about newly built wonder }
+                    OpenSound := 'WONDER_BUILT';
+                    s := Tribe[me].TPhrase('WONDERBUILTOWN');
+                    MessgText :=
+                      Format(s, [Phrases.Lookup('IMPROVEMENTS',
+                      Project0 and cpIndex), CityName(ID)]);
+                    Kind := mkOkHelp;
+                    HelpKind := hkImp;
+                    HelpNo := Project0 and cpIndex;
+                    IconKind := mikImp;
+                    IconIndex := Project0 and cpIndex;
+                    ShowModal;
+                  end;
+                if not supervising and (ClientMode = cTurn) then
+                begin
+                  AllowCityScreen := true;
+                  if (Status and 7 <> 0) and
+                    (Project and (cpImp + cpIndex) = cpImp + imTrGoods) then
+                    if (MyData.ImpOrder[Status and 7 - 1, 0] >= 0) then
+                    begin
+                      if AutoBuild(cix, MyData.ImpOrder[Status and 7 - 1]) then
+                        AllowCityScreen := false
+                      else if Flags and chProduction <> 0 then
+                        Flags := (Flags and not chProduction) or chAllImpsMade
+                    end
+                    else
+                      Flags := Flags or chTypeDel;
+                  if (Size >= NeedAqueductSize) and
+                    (MyRO.Tech[Imp[imAqueduct].Preq] < tsApplicable) or
+                    (Size >= NeedSewerSize) and
+                    (MyRO.Tech[Imp[imSewer].Preq] < tsApplicable) then
+                    Flags := Flags and not chNoGrowthWarning;
+                  // don't remind of unknown building
+                  if Flags and chNoSettlerProd = 0 then
+                    Status := Status and not csToldDelay
+                  else if Status and csToldDelay = 0 then
+                    Status := Status or csToldDelay
+                  else
+                    Flags := Flags and not chNoSettlerProd;
+                  if mRepScreens.Checked then
+                  begin
+                    if (Flags and CityRepMask <> 0) and AllowCityScreen then
+                    begin { show what happened in cities }
+                      SetTroopLoc(MyCity[cix].Loc);
+                      MarkCityLoc := MyCity[cix].Loc;
+                      PanelPaint;
+                      CityDlg.CloseAction := None;
+                      CityDlg.ShowNewContent(wmModal, MyCity[cix].Loc,
+                        Flags and CityRepMask);
+                      UpdatePanel := true;
+                    end
+                  end
+                  else { if mRepList.Checked then }
+                  begin
+                    if Flags and CityRepMask <> 0 then
+                      ShowCityList := true
+                  end
+                end
+              end; { city loop }
+      end; // ClientMode=cTurn
+
+      if ClientMode = cTurn then
+      begin
+        if NewGovAvailable >= 0 then
+          with MessgExDlg do
           begin
-          assert(me=0);
-          OpenSound:='MSG_GAMEOVER';
-          if not supervising then MessgText:=Tribe[me].TPhrase('TIMEUP')
-          else MessgText:=Phrases.Lookup('TIMEUPSUPER');
-          IconKind:=mikImp;
-          IconIndex:=22;
+            MessgText := Format(Phrases.Lookup('AUTOREVOLUTION'),
+              [Phrases.Lookup('GOVERNMENT', NewGovAvailable)]);
+            Kind := mkYesNo;
+            IconKind := mikPureIcon;
+            IconIndex := 6 + NewGovAvailable;
+            ShowModal;
+            if ModalResult = mrOK then
+            begin
+              Play('REVOLUTION');
+              Server(sRevolution, me, 0, nil^);
+            end
           end;
-        Kind:=mkOK;
-        ShowModal;
-        if MyRO.Happened and phExtinct=0 then
+      end; // ClientMode=cTurn
+
+      if (ClientMode = cTurn) or (ClientMode = cMovieTurn) then
+      begin
+        if MyRO.Happened and phGliderLost <> 0 then
+          ContextMessage(Phrases.Lookup('GLIDERLOST'), 'MSG_DEFAULT',
+            hkModel, 200);
+        if MyRO.Happened and phPlaneLost <> 0 then
+          ContextMessage(Phrases.Lookup('PLANELOST'), 'MSG_DEFAULT',
+            hkFeature, mcFuel);
+        if MyRO.Happened and phPeaceEvacuation <> 0 then
+          for p1 := 0 to nPl - 1 do
+            if 1 shl p1 and MyData.PeaceEvaHappened <> 0 then
+              SoundMessageEx(Tribe[p1].TPhrase('WITHDRAW'), 'MSG_DEFAULT');
+        if MyRO.Happened and phPeaceViolation <> 0 then
+          for p1 := 0 to nPl - 1 do
+            if (1 shl p1 and MyRO.Alive <> 0) and (MyRO.EvaStart[p1] = MyRO.Turn)
+            then
+              SoundMessageEx(Format(Tribe[p1].TPhrase('VIOLATION'),
+                [TurnToString(MyRO.Turn + PeaceEvaTurns - 1)]), 'MSG_WITHDRAW');
+        TellNewContacts;
+      end;
+
+      if ClientMode = cMovieTurn then
+        Update
+      else if ClientMode = cTurn then
+      begin
+        if UpdatePanel then
+          UpdateViews;
+        Application.ProcessMessages;
+
+        if not supervising then
+          for uix := 0 to MyRO.nUn - 1 do
+            with MyUn[uix] do
+              if Loc >= 0 then
+              begin
+                if Flags and unWithdrawn <> 0 then
+                  Status := 0;
+                if Health = 100 then
+                  Status := Status and not usRecover;
+                if (Master >= 0) or UnitExhausted(uix) then
+                  Status := Status and not usWaiting
+                else
+                  Status := Status or usWaiting;
+                CheckToldNoReturn(uix);
+                if Status and usGoto <> 0 then
+                begin { continue multi-turn goto }
+                  SetUnFocus(uix);
+                  SetTroopLoc(Loc);
+                  FocusOnLoc(TroopLoc, flRepaintPanel or flImmUpdate);
+                  if Status shr 16 = $7FFF then
+                    MoveResult := GetMoveAdvice(UnFocus, maNextCity,
+                      MoveAdviceData)
+                  else
+                    MoveResult := GetMoveAdvice(UnFocus, Status shr 16,
+                      MoveAdviceData);
+                  if MoveResult >= rExecuted then
+                  begin // !!! Shinkansen
+                    MoveResult := eOK;
+                    ok := true;
+                    for i := 0 to MoveAdviceData.nStep - 1 do
+                    begin
+                      Loc1 := dLoc(Loc, MoveAdviceData.dx[i],
+                        MoveAdviceData.dy[i]);
+                      if (MyMap[Loc1] and (fCity or fOwned) = fCity)
+                      // don't capture cities during auto move
+                        or (MyMap[Loc1] and (fUnit or fOwned) = fUnit) then
+                      // don't attack during auto move
+                      begin
+                        ok := false;
+                        Break
+                      end
+                      else
+                      begin
+                        if (Loc1 = MoveAdviceData.ToLoc) or
+                          (MoveAdviceData.ToLoc = maNextCity) and
+                          (MyMap[dLoc(Loc, MoveAdviceData.dx[i],
+                          MoveAdviceData.dy[i])] and fCity <> 0) then
+                          MoveOptions := muAutoNoWait
+                        else
+                          MoveOptions := 0;
+                        MoveResult := MoveUnit(MoveAdviceData.dx[i],
+                          MoveAdviceData.dy[i], MoveOptions);
+                        if (MoveResult < rExecuted) or
+                          (MoveResult = eEnemySpotted) then
+                        begin
+                          ok := false;
+                          Break
+                        end;
+                      end
+                    end;
+                    Stop := not ok or (Loc = MoveAdviceData.ToLoc) or
+                      (MoveAdviceData.ToLoc = maNextCity) and
+                      (MyMap[Loc] and fCity <> 0)
+                  end
+                  else
+                  begin
+                    MoveResult := eOK;
+                    Stop := true;
+                  end;
+
+                  if MoveResult <> eDied then
+                    if Stop then
+                      Status := Status and ($FFFF - usGoto)
+                    else
+                      Status := Status and not usWaiting;
+                end;
+
+                if Status and (usEnhance or usGoto) = usEnhance then
+                // continue terrain enhancement
+                begin
+                  MoveResult := ProcessEnhancement(uix, MyData.EnhancementJobs);
+                  if MoveResult <> eDied then
+                    if MoveResult = eJobDone then
+                      Status := Status and not usEnhance
+                    else
+                      Status := Status and not usWaiting;
+                end
+              end;
+      end; // ClientMode=cTurn
+
+      HaveStrategyAdvice := false;
+      // (GameMode<>cMovie) and not supervising
+      // and AdvisorDlg.HaveStrategyAdvice;
+      GoOnPhase := true;
+      if supervising or (GameMode = cMovie) then
+      begin
+        SetTroopLoc(-1);
+        PaintAll
+      end { supervisor }
+      { else if (ClientMode=cTurn) and (MyRO.Turn=0) then
+        begin
+        SetUnFocus(0);
+        ZoomToCity(MyCity[0].Loc)
+        end }
+      else
+      begin
+        if ClientMode >= scContact then
+          SetUnFocus(-1)
+        else
+          NextUnit(-1, false);
+        if UnFocus < 0 then
+        begin
+          UnStartLoc := -1;
+          if IsMultiPlayerGame or (ClientMode = cResume) then
+            if MyRO.nCity > 0 then
+              FocusOnLoc(MyCity[0].Loc)
+            else
+              FocusOnLoc(G.lx * G.ly div 2);
+          SetTroopLoc(-1);
+          PanelPaint
+        end;
+        if ShowCityList then
+          ListDlg.ShowNewContent(wmPersistent, kCityEvents);
+      end;
+    end; { InitTurn }
+
+  var
+    i, j, p1, mix, ToLoc, AnimationSpeed, ShowMoveDomain, cix, ecix: integer;
+    Color: TColor;
+    Name, s: string;
+    TribeInfo: TTribeInfo;
+    mi: TModelInfo;
+    SkipTurn, IsAlpine, IsTreatyDeal: boolean;
+
+  begin { >>>client }
+    case Command of
+      cTurn, cResume, cContinue, cMovieTurn, scContact,
+        scDipStart .. scDipBreak:
+        begin
+          supervising := G.Difficulty[NewPlayer] = 0;
+          ArrangeMidPanel;
+        end
+    end;
+    case Command of
+      cDebugMessage:
+        LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(@Data));
+
+      cShowNego:
+        with TShowNegoData(Data) do
+        begin
+          s := Format('P%d to P%d: ', [pSender, pTarget]);
+          if (Action = scDipOffer) and (Offer.nDeliver + Offer.nCost > 0) then
           begin
-          p1:=0;
-          while (p1<nPl-1) and (Winners and (1 shl p1)=0) do inc(p1);
-          if MyRO.Happened and phShipComplete=0 then
-            DiaDlg.ShowNewContent_Charts(wmModal);
+            s := s + 'Offer ';
+            for i := 0 to Offer.nDeliver + Offer.nCost - 1 do
+            begin
+              if i = Offer.nDeliver then
+                s := s + ' for '
+              else if i > 0 then
+                s := s + '+';
+              case Offer.Price[i] and opMask of
+                opChoose:
+                  s := s + 'Price of choice';
+                opCivilReport:
+                  s := s + 'State report';
+                opMilReport:
+                  s := s + 'Military report';
+                opMap:
+                  s := s + 'Map';
+                opTreaty:
+                  s := s + 'Treaty';
+                opShipParts:
+                  s := s + 'Ship part';
+                opMoney:
+                  s := s + IntToStr(Offer.Price[i] and $FFFFFF) + 'o';
+                opTribute:
+                  s := s + IntToStr(Offer.Price[i] and $FFFFFF) + 'o tribute';
+                opTech:
+                  s := s + Phrases.Lookup('ADVANCES',
+                    Offer.Price[i] and $FFFFFF);
+                opAllTech:
+                  s := s + 'All advances';
+                opModel:
+                  s := s + Tribe[pSender].ModelName[Offer.Price[i] and $FFFFFF];
+                opAllModel:
+                  s := s + 'All models';
+              end
+            end;
+            LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
+          end
+          else if Action = scDipAccept then
+          begin
+            s := s + '--- ACCEPTED! ---';
+            LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
+          end
+        end;
+
+      cInitModule:
+        begin
+          Server := TInitModuleData(Data).Server;
+          // AdvisorDlg.Init;
+          InitModule;
+          TInitModuleData(Data).DataSize := SizeOf(TPersistentData);
+          TInitModuleData(Data).Flags := aiThreaded;
+        end;
+
+      cReleaseModule:
+        begin
+          SmallImp.free;
+          UnusedTribeFiles.free;
+          TribeNames.free;
+          MainMap.free;
+          IsoEngine.Done;
+          // AdvisorDlg.DeInit;
+        end;
+
+      cHelpOnly, cStartHelp, cStartCredits:
+        begin
+          Age := 0;
+          if Command = cHelpOnly then
+            SetMainTextureByAge(-1);
+          Tribes.Init;
+          HelpDlg.UserLeft := (Screen.width - HelpDlg.width) div 2;
+          HelpDlg.UserTop := (Screen.height - HelpDlg.height) div 2;
+          HelpDlg.Difficulty := 0;
+          if Command = cStartCredits then
+            HelpDlg.ShowNewContent(wmModal, hkMisc, miscCredits)
+          else
+            HelpDlg.ShowNewContent(wmModal, hkMisc, miscMain);
+          Tribes.Done;
+        end;
+
+      cNewGame, cLoadGame, cMovie, cNewMap:
+        begin
+          { if (Command=cNewGame) or (Command=cLoadGame) then
+            AdvisorDlg.NewGame(Data); }
+          GenerateNames := mNames.Checked;
+          GameOK := true;
+          G := TNewGameData(Data);
+          me := -1;
+          pLogo := -1;
+          ClientMode := -1;
+          SetMapOptions;
+          IsoEngine.pDebugMap := -1;
+          idle := false;
+          FillChar(Jump, SizeOf(Jump), 0);
+          if StartRunning then
+            Jump[0] := 999999;
+          GameMode := Command;
+          for i := 0 to nGrExt - 1 do
+            FillChar(GrExt[i].pixUsed, GrExt[i].Data.height div 49 * 10, 0);
+          IsoEngine.Reset;
+          Tribes.Init;
+          GetTribeList;
+          for p1 := 0 to nPl - 1 do
+            if (G.RO[p1] <> nil) and (G.RO[p1].Data <> nil) then
+              with TPersistentData(G.RO[p1].Data^) do
+              begin
+                FarTech := adNone;
+                FillChar(EnhancementJobs, SizeOf(EnhancementJobs), jNone);
+                FillChar(ImpOrder, SizeOf(ImpOrder), -1);
+                ColdWarStart := -ColdWarTurns - 1;
+                ToldAge := -1;
+                ToldModels := 3;
+                ToldAlive := 0;
+                ToldContact := 0;
+                ToldOwnCredibility := InitialCredibility;
+                for i := 0 to nPl - 1 do
+                  if G.Difficulty[i] > 0 then
+                    inc(ToldAlive, 1 shl i);
+                PeaceEvaHappened := 0;
+                for i := 0 to 27 do
+                  with ToldWonders[i] do
+                  begin
+                    CityID := -1;
+                    EffectiveOwner := -1
+                  end;
+                FillChar(ToldTech, SizeOf(ToldTech), tsNA);
+                if G.Difficulty[p1] > 0 then
+                  SoundPreload(sbStart);
+              end;
+
+          // arrange dialogs
+          ListDlg.UserLeft := 8;
+          ListDlg.UserTop := TopBarHeight + 8;
+          HelpDlg.UserLeft := Screen.width - HelpDlg.width - 8;
+          HelpDlg.UserTop := TopBarHeight + 8;
+          UnitStatDlg.UserLeft := 397;
+          UnitStatDlg.UserTop := TopBarHeight + 64;
+          DiaDlg.UserLeft := (Screen.width - DiaDlg.width) div 2;
+          DiaDlg.UserTop := (Screen.height - DiaDlg.height) div 2;
+          NatStatDlg.UserLeft := Screen.width - NatStatDlg.width - 8;
+          NatStatDlg.UserTop := Screen.height - PanelHeight -
+            NatStatDlg.height - 8;
+          if NatStatDlg.UserTop < 8 then
+            NatStatDlg.UserTop := 8;
+
+          Age := 0;
+          MovieSpeed := 1;
+          LogDlg.mSlot.Visible := true;
+          LogDlg.Host := self;
+          HelpDlg.ClearHistory;
+          CityDlg.Reset;
+
+          Mini.width := G.lx * 2;
+          Mini.height := G.ly;
+          for i := 0 to nPl - 1 do
+          begin
+            Tribe[i] := nil;
+            TribeOriginal[i] := false;
           end;
-        TurnComplete:=true;
-        exit;
-        end;
-    if not supervising and (1 shl me and MyRO.Alive=0) then
-      begin TurnComplete:=true; exit; end;
-
-    if (ClientMode=cContinue) and (DipMem[me].SentCommand and $FF0F=scContact) then
-      // contact was refused
-      if MyRO.Treaty[DipMem[me].pContact]>=trPeace then
-        ContactRefused(DipMem[me].pContact, 'FRREJECTED')
-      else SoundMessage(Tribe[DipMem[me].pContact].TPhrase('FRREJECTED'),'NEGO_REJECTED');
-
-    if not supervising and (Age>MyData.ToldAge)
-      and ((Age>0) or (ClientMode<>cMovieTurn)) then with MessgExDlg do
-      begin
-      if Age=0 then
-        begin
-        if Phrases2FallenBackToEnglish then
+          ToldSlavery := -1;
+          RepaintOnResize := false;
+          Closable := false;
+          FirstMovieTurn := true;
+
+          MenuArea.Visible := GameMode <> cMovie;
+          TreasuryArea.Visible := GameMode < cMovie;
+          ResearchArea.Visible := GameMode < cMovie;
+          ManagementArea.Visible := GameMode < cMovie;
+        end;
+
+      cGetReady, cReplay:
+        if NewPlayer = 0 then
+        begin
+          i := 0;
+          for p1 := 0 to nPl - 1 do
+            if (G.Difficulty[p1] > 0) and (Tribe[p1] = nil) then
+              inc(i);
+          if i > UnusedTribeFiles.Count then
           begin
-          s:=Tribe[me].TPhrase('AGE0');
-          MessgText:=Format(s,[TurnToString(MyRO.Turn),CityName(MyCity[0].ID)])
+            GameOK := false;
+            SimpleMessage(Phrases.Lookup('TOOFEWTRIBES'));
           end
+          else
+          begin
+            for p1 := 0 to nPl - 1 do
+              if (G.Difficulty[p1] > 0) and (Tribe[p1] = nil) and
+                (G.RO[p1] <> nil) then
+              begin // let player select own tribes
+                TribeInfo.trix := p1;
+                TribeNames.Clear;
+                for j := 0 to UnusedTribeFiles.Count - 1 do
+                begin
+                  GetTribeInfo(UnusedTribeFiles[j], Name, Color);
+                  TribeNames.AddObject(Name, TObject(Color));
+                end;
+                assert(TribeNames.Count > 0);
+                ModalSelectDlg.ShowNewContent(wmModal, kTribe);
+                Application.ProcessMessages;
+                TribeInfo.FileName := UnusedTribeFiles[ModalSelectDlg.result];
+                UnusedTribeFiles.Delete(ModalSelectDlg.result);
+
+                if GameMode = cLoadGame then
+                  CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
+                else
+                  Server(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
+                    0, 0, TribeInfo);
+              end;
+
+            for p1 := 0 to nPl - 1 do
+              if (G.Difficulty[p1] > 0) and (Tribe[p1] = nil) and
+                (G.RO[p1] = nil) then
+              begin // autoselect enemy tribes
+                j := ChooseUnusedTribe;
+                TribeInfo.FileName := UnusedTribeFiles[j];
+                UnusedTribeFiles.Delete(j);
+                TribeInfo.trix := p1;
+                if GameMode = cLoadGame then
+                  CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
+                else
+                  Server(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
+                    0, 0, TribeInfo);
+              end;
+          end;
+          if not mNames.Checked then
+            for p1 := 0 to nPl - 1 do
+              if Tribe[p1] <> nil then
+                Tribe[p1].NumberName := p1;
+        end;
+
+      cBreakGame:
+        begin
+          SaveSettings;
+          CityDlg.CloseAction := None;
+          for i := 0 to Screen.FormCount - 1 do
+            if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+            then
+              Screen.Forms[i].Close;
+          if LogDlg.Visible then
+            LogDlg.Close;
+          LogDlg.List.Clear;
+          StartRunning := not idle and (Jump[0] > 0); // AI called Reload
+          me := -1;
+          idle := false;
+          ClientMode := -1;
+          UnitInfoBtn.Visible := false;
+          UnitBtn.Visible := false;
+          TerrainBtn.Visible := false;
+          MovieSpeed1Btn.Visible := false;
+          MovieSpeed2Btn.Visible := false;
+          MovieSpeed3Btn.Visible := false;
+          MovieSpeed4Btn.Visible := false;
+          EOT.Visible := false;
+          for i := 0 to ControlCount - 1 do
+            if Controls[i] is TButtonC then
+              Controls[i].Visible := false;
+          InitPVSB(sb, 0, 1);
+          for p1 := 0 to nPl - 1 do
+            if Tribe[p1] <> nil then
+              Tribe[p1].free;
+          Tribes.Done;
+          RepaintOnResize := false;
+          Closable := true;
+          Close;
+          { if (GameMode=cNewGame) or (GameMode=cLoadGame) then
+            AdvisorDlg.BreakGame; }
+        end;
+
+      cShowGame:
+        begin
+          with Panel.Canvas do
+          begin
+            Brush.Color := $000000;
+            FillRect(Rect(0, 0, Panel.width, Panel.height));
+            Brush.Style := bsClear;
+          end;
+          with TopBar.Canvas do
+          begin
+            Brush.Color := $000000;
+            FillRect(Rect(0, 0, TopBar.width, TopBar.height));
+            Brush.Style := bsClear;
+          end;
+          FormResize(nil); // place mini map correctly according to its size
+          Show;
+          Update;
+          RepaintOnResize := true;
+          xw := 0;
+          yw := ywcenter;
+          if not StayOnTop_Ensured then
+          begin
+            StayOnTop_Ensured := true;
+            CityDlg.StayOnTop_Workaround;
+            CityTypeDlg.StayOnTop_Workaround;
+            DiaDlg.StayOnTop_Workaround;
+            DraftDlg.StayOnTop_Workaround;
+            EnhanceDlg.StayOnTop_Workaround;
+            HelpDlg.StayOnTop_Workaround;
+            NatStatDlg.StayOnTop_Workaround;
+            NegoDlg.StayOnTop_Workaround;
+            ModalSelectDlg.StayOnTop_Workaround;
+            ListDlg.StayOnTop_Workaround;
+            UnitStatDlg.StayOnTop_Workaround;
+            WondersDlg.StayOnTop_Workaround;
+            RatesDlg.StayOnTop_Workaround;
+          end;
+        end;
+
+      cShowTurnChange:
+        begin
+          if integer(Data) >= 0 then
+          begin
+            pLogo := integer(Data);
+            if G.RO[pLogo] = nil then
+            begin
+              if AILogo[pLogo] <> nil then
+                BitBlt(Canvas.Handle, (xRightPanel + 10) - (16 + 64),
+                  ClientHeight - PanelHeight, 64, 64,
+                  AILogo[pLogo].Canvas.Handle, 0, 0, SRCCOPY);
+            end
+          end
+        end;
+
+      cTurn, cResume, cContinue:
+        if not GameOK then
+          Server(sResign, NewPlayer, 0, nil^)
         else
+        begin
+          ClientMode := Command;
+          pTurn := NewPlayer;
+          pLogo := NewPlayer;
+
+          if Command = cResume then
+          begin // init non-original model pictures (maybe tribes not found)
+            for p1 := 0 to nPl - 1 do
+              if G.RO[p1] <> nil then
+              begin
+                ItsMeAgain(p1);
+                for mix := 0 to MyRO.nModel - 1 do
+                  if Tribe[me].ModelPicture[mix].HGr = 0 then
+                    InitMyModel(mix, true);
+              end;
+            me := -1;
+          end;
+
+          if Jump[pTurn] > 0 then
+            Application.ProcessMessages;
+          if Jump[pTurn] > 0 then
+            if G.RO[NewPlayer].Happened and phGameEnd <> 0 then
+              Jump[pTurn] := 0
+            else
+              dec(Jump[pTurn]);
+          SkipTurn := Jump[pTurn] > 0;
+          if SkipTurn then
           begin
-          s:=Tribe[me].TString(Phrases2.Lookup('AGE0'));
-          MessgText:=Format(s,[TurnToString(MyRO.Turn)]);
+            ItsMeAgain(NewPlayer);
+            MyData := G.RO[NewPlayer].Data;
+            SetTroopLoc(-1);
+            MiniPaint;
+            InitAllEnemyModels; // necessary for correct replay
+            if not EndTurn(true) then
+              SkipTurn := false;
+          end;
+          if not SkipTurn then
+          begin
+            if ((ClientMode < scDipStart) or (ClientMode > scDipBreak)) and
+              NegoDlg.Visible then
+              NegoDlg.Close;
+            skipped := false; // always show my moves during my turn
+            idle := true;
+            InitTurn(NewPlayer);
+            DipMem[me].pContact := -1;
+            (* if (me=0) and (MyRO.Alive and (1 shl me)=0)} then
+              begin
+              if SimpleQuery(Phrases.Lookup('RESIGN'))=mrIgnore then
+              Server(sResign,me,0,nil^)
+              else Server(sBreak,me,0,nil^)
+              end
+              else Play('TURNSTART'); *)
+          end;
+        end;
+
+      cMovieTurn:
+        begin
+          ClientMode := Command;
+          pTurn := NewPlayer;
+          pLogo := -1;
+          skipped := false; // always show my moves during my turn
+          idle := true;
+          if FirstMovieTurn then
+          begin
+            CheckMovieSpeedBtnState;
+            FirstMovieTurn := false;
+          end;
+          InitTurn(NewPlayer);
+          Application.ProcessMessages;
+          if MovieSpeed = 4 then
+          begin
+            Sleep(75);
+            // this break will ensure speed of fast forward does not depend on cpu speed
+            Application.ProcessMessages;
+          end
+        end;
+
+      cMovieEndTurn:
+        begin
+          RememberPeaceViolation;
+          pTurn := -1;
+          pLogo := -1;
+          MapValid := false;
+          ClientMode := -1;
+          idle := false;
+          skipped := false;
+        end;
+
+      cEditMap:
+        begin
+          ClientMode := cEditMap;
+          SetMapOptions;
+          IsoEngine.pDebugMap := -1;
+          ItsMeAgain(0);
+          MyData := nil;
+          UnitInfoBtn.Visible := false;
+          UnitBtn.Visible := false;
+          TerrainBtn.Visible := false;
+          MovieSpeed1Btn.Visible := false;
+          MovieSpeed2Btn.Visible := false;
+          MovieSpeed3Btn.Visible := false;
+          MovieSpeed4Btn.Visible := false;
+          EOT.Visible := false;
+          HelpDlg.Difficulty := 0;
+          BrushType := fGrass;
+          BrushLoc := -1;
+          Edited := false;
+          UnFocus := -1;
+          MarkCityLoc := -1;
+          Tracking := false;
+          TurnComplete := false;
+          MapValid := false;
+          FormResize(nil); // calculate geometrics and paint all
+          SetTroopLoc(-1);
+          idle := true
+        end;
+
+      (* cNewContact:
+        begin
+        end;
+      *)
+
+      scContact:
+        begin
+          DipMem[NewPlayer].pContact := integer(Data);
+          if Jump[NewPlayer] > 0 then
+            DipCall(scReject)
+          else
+          begin
+            ClientMode := Command;
+            InitTurn(NewPlayer);
+            MyData.ToldContact := MyData.ToldContact or (1 shl integer(Data));
+            // don't tell about new nation when already contacted by them
+            with MessgExDlg do
+            begin
+              OpenSound := 'CONTACT_' + char(48 + MyRO.EnemyReport[integer(Data)
+                ].Attitude);
+              MessgText := Tribe[integer(Data)].TPhrase('FRCONTACT');
+              Kind := mkYesNo;
+              IconKind := mikTribe;
+              IconIndex := integer(Data);
+              ShowModal;
+              if ModalResult = mrOK then
+              begin
+                NegoDlg.Respond;
+                DipMem[me].DeliveredPrices := [];
+                DipMem[me].ReceivedPrices := [];
+                DipCall(scDipStart)
+              end
+              else
+              begin
+                DipCall(scReject);
+                EndNego
+              end
+            end
+          end;
+        end;
+
+      scDipStart .. scDipBreak:
+        begin
+          ClientMode := Command;
+          InitTurn(NewPlayer);
+          if Command = scDipStart then
+            Play('CONTACT_' + char(48 + MyRO.Attitude[DipMem[NewPlayer]
+              .pContact]))
+          else if Command = scDipCancelTreaty then
+            Play('CANCELTREATY')
+          else if Command = scDipOffer then
+          begin
+            ReceivedOffer := TOffer(Data);
+            InitAllEnemyModels;
+          end
+          else if Command = scDipAccept then
+          begin // remember delivered and received prices
+            for i := 0 to DipMem[me].SentOffer.nDeliver - 1 do
+              include(DipMem[me].DeliveredPrices,
+                DipMem[me].SentOffer.Price[i] shr 24);
+            for i := 0 to DipMem[me].SentOffer.nCost - 1 do
+              include(DipMem[me].ReceivedPrices,
+                DipMem[me].SentOffer.Price[DipMem[me].SentOffer.nDeliver +
+                i] shr 24);
+            IsTreatyDeal := false;
+            for i := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
+              if DipMem[me].SentOffer.Price[i] and opMask = opTreaty then
+                IsTreatyDeal := true;
+            if IsTreatyDeal then
+              Play('NEWTREATY')
+            else
+              Play('ACCEPTOFFER');
+          end;
+          NegoDlg.Start;
+          idle := true
+        end;
+
+      cShowCancelTreaty:
+        if not IsMultiPlayerGame then
+        begin
+          case G.RO[NewPlayer].Treaty[integer(Data)] of
+            trPeace:
+              s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_PEACE');
+            trFriendlyContact:
+              s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_FRIENDLY');
+            trAlliance:
+              s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_ALLIANCE');
+          end;
+          TribeMessage(integer(Data), s, 'CANCELTREATY');
+        end;
+
+      cShowCancelTreatyByAlliance:
+        if idle and (NewPlayer = me) then
+          TribeMessage(integer(Data), Tribe[integer(Data)
+            ].TPhrase('FRENEMYALLIANCE'), 'CANCELTREATY');
+
+      cShowSupportAllianceAgainst:
+        if not IsMultiPlayerGame and (Jump[0] = 0) then
+          TribeMessage(integer(Data) and $F,
+            Tribe[integer(Data) and $F].TPhrase('FRMYALLIANCE1') + ' ' +
+            Tribe[integer(Data) shr 4].TPhrase('FRMYALLIANCE2'),
+            'CANCELTREATY');
+
+      cShowPeaceViolation:
+        if not IsMultiPlayerGame and (Jump[0] = 0) then
+          TribeMessage(integer(Data),
+            Format(Tribe[integer(Data)].TPhrase('EVIOLATION'),
+            [TurnToString(MyRO.Turn + PeaceEvaTurns - 1)]), 'MSG_WITHDRAW');
+
+      cShowEndContact:
+        EndNego;
+
+      cShowUnitChanged, cShowCityChanged, cShowAfterMove, cShowAfterAttack:
+        if (idle and (NewPlayer = me) or not idle and not skipped) and
+          not((GameMode = cMovie) and (MovieSpeed = 4)) then
+        begin
+          assert(NewPlayer = me);
+          if not idle or (GameMode = cMovie) then
+            Application.ProcessMessages;
+          if Command = cShowCityChanged then
+          begin
+            CurrentMoveInfo.DoShow := false;
+            if idle then
+              CurrentMoveInfo.DoShow := true
+            else if CurrentMoveInfo.IsAlly then
+              CurrentMoveInfo.DoShow := not mAlNoMoves.Checked
+            else
+              CurrentMoveInfo.DoShow := not mEnNoMoves.Checked
+          end
+          else if Command = cShowUnitChanged then
+          begin
+            CurrentMoveInfo.DoShow := false;
+            if idle then
+              CurrentMoveInfo.DoShow := not mEffectiveMovesOnly.Checked
+            else if CurrentMoveInfo.IsAlly then
+              CurrentMoveInfo.DoShow :=
+                not(mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked)
+            else
+              CurrentMoveInfo.DoShow :=
+                not(mEnNoMoves.Checked or mEnAttacks.Checked)
+          end;
+          // else keep DoShow from cShowMove/cShowAttack
+
+          if CurrentMoveInfo.DoShow then
+          begin
+            if Command = cShowCityChanged then
+              MapValid := false;
+            FocusOnLoc(integer(Data), flImmUpdate);
+            // OldUnFocus:=UnFocus;
+            // UnFocus:=-1;
+            if Command = cShowAfterMove then
+              PaintLoc(integer(Data), CurrentMoveInfo.AfterMovePaintRadius)
+              // show discovered areas
+            else
+              PaintLoc(integer(Data), 1);
+            // UnFocus:=OldUnFocus;
+            if (Command = cShowAfterAttack) and
+              (CurrentMoveInfo.AfterAttackExpeller >= 0) then
+            begin
+              SoundMessageEx(Tribe[CurrentMoveInfo.AfterAttackExpeller]
+                .TPhrase('EXPEL'), '');
+              CurrentMoveInfo.AfterAttackExpeller := -1;
+              Update; // remove message box from screen
+            end
+            else if not idle then
+              if Command = cShowCityChanged then
+                Sleep(MoveTime * WaitAfterShowMove div 16)
+              else if (Command = cShowUnitChanged) and
+                (MyMap[integer(Data)] and fUnit <> 0) then
+                Sleep(MoveTime * WaitAfterShowMove div 32)
+          end // if CurrentMoveInfo.DoShow
+          else
+            MapValid := false;
+        end;
+
+      cShowMoving, cShowCapturing:
+        if (idle and (NewPlayer = me) or not idle and not skipped and
+          (TShowMove(Data).emix <> $FFFF)) and
+          not((GameMode = cMovie) and (MovieSpeed = 4)) then
+        begin
+          assert(NewPlayer = me);
+          if not idle or (GameMode = cMovie) then
+            Application.ProcessMessages;
+          with TShowMove(Data) do
+          begin
+            CurrentMoveInfo.DoShow := false;
+            if not idle and (Tribe[Owner].ModelPicture[mix].HGr = 0) then
+              InitEnemyModel(emix);
+
+            ToLoc := dLoc(FromLoc, dx, dy);
+            if idle then
+            begin // own unit -- make discovered land visible
+              assert(Owner = me); // no foreign moves during my turn!
+              CurrentMoveInfo.DoShow := not mEffectiveMovesOnly.Checked or
+                (Command = cShowCapturing);
+              if CurrentMoveInfo.DoShow then
+              begin
+                if GameMode = cMovie then
+                begin
+                  if MovieSpeed = 3 then
+                    AnimationSpeed := 4
+                  else if MovieSpeed = 2 then
+                    AnimationSpeed := 8
+                  else
+                    AnimationSpeed := 16;
+                end
+                else
+                begin
+                  if mVeryFastMoves.Checked then
+                    AnimationSpeed := 4
+                  else if mFastMoves.Checked then
+                    AnimationSpeed := 8
+                  else
+                    AnimationSpeed := 16;
+                end;
+                with MyModel[mix] do
+                begin
+                  if (Kind = mkDiplomat) or (Domain = dAir) or
+                    (Cap[mcRadar] + Cap[mcCarrier] + Cap[mcAcademy] > 0) or
+                    (MyMap[ToLoc] and fTerrain = fMountains) or
+                    (MyMap[ToLoc] and fTerImp = tiFort) or
+                    (MyMap[ToLoc] and fTerImp = tiBase) then
+                    CurrentMoveInfo.AfterMovePaintRadius := 2
+                  else
+                    CurrentMoveInfo.AfterMovePaintRadius := 1;
+                  if (MyRO.Wonder[woShinkansen].EffectiveOwner = me) and
+                    (Domain = dGround) and
+                    (MyMap[FromLoc] and (fRR or fCity) <> 0) and
+                    (MyMap[ToLoc] and (fRR or fCity) <> 0) and
+                    (Flags and umPlaneUnloading = 0) then
+                    AnimationSpeed := 4;
+                  ShowMoveDomain := Domain;
+                  IsAlpine := Cap[mcAlpine] > 0;
+                end
+              end
+            end
+            else
+            begin
+              CurrentMoveInfo.IsAlly := MyRO.Treaty[Owner] = trAlliance;
+              if GameMode = cMovie then
+                CurrentMoveInfo.DoShow := true
+              else if CurrentMoveInfo.IsAlly then
+                CurrentMoveInfo.DoShow := not mAlNoMoves.Checked and
+                  not(mAlEffectiveMovesOnly.Checked and
+                  (Command <> cShowCapturing))
+              else
+                CurrentMoveInfo.DoShow := not mEnNoMoves.Checked and
+                  not(mEnAttacks.Checked and (Command <> cShowCapturing));
+              if CurrentMoveInfo.DoShow then
+              begin
+                if Command = cShowCapturing then
+                begin // show capture message
+                  if MyMap[ToLoc] and fOwned <> 0 then
+                  begin // own city, search
+                    cix := MyRO.nCity - 1;
+                    while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
+                      dec(cix);
+                    s := CityName(MyCity[cix].ID);
+                  end
+                  else
+                  begin // foreign city, search
+                    ecix := MyRO.nEnemyCity - 1;
+                    while (ecix >= 0) and (MyRO.EnemyCity[ecix].Loc <> ToLoc) do
+                      dec(ecix);
+                    s := CityName(MyRO.EnemyCity[ecix].ID);
+                  end;
+                  TribeMessage(Owner, Format(Tribe[Owner].TPhrase('CAPTURE'),
+                    [s]), '');
+                  Update; // remove message box from screen
+                end;
+
+                if CurrentMoveInfo.IsAlly then
+                begin // allied unit -- make discovered land visible
+                  if mAlFastMoves.Checked then
+                    AnimationSpeed := 8
+                  else
+                    AnimationSpeed := 16;
+                  with MyRO.EnemyModel[emix] do
+                    if (Kind = mkDiplomat) or (Domain = dAir) or
+                      (ATrans_Fuel > 0) or
+                      (Cap and (1 shl (mcRadar - mcFirstNonCap) or
+                      1 shl (mcAcademy - mcFirstNonCap)) <> 0) or
+                      (MyMap[ToLoc] and fTerrain = fMountains) or
+                      (MyMap[ToLoc] and fTerImp = tiFort) or
+                      (MyMap[ToLoc] and fTerImp = tiBase) then
+                      CurrentMoveInfo.AfterMovePaintRadius := 2
+                    else
+                      CurrentMoveInfo.AfterMovePaintRadius := 1
+                end
+                else
+                begin
+                  if mEnFastMoves.Checked then
+                    AnimationSpeed := 8
+                  else
+                    AnimationSpeed := 16;
+                  CurrentMoveInfo.AfterMovePaintRadius := 0;
+                  // enemy unit, nothing discovered
+                end;
+                if GameMode = cMovie then
+                begin
+                  if MovieSpeed = 3 then
+                    AnimationSpeed := 4
+                  else if MovieSpeed = 2 then
+                    AnimationSpeed := 8
+                  else
+                    AnimationSpeed := 16;
+                end;
+                ShowMoveDomain := MyRO.EnemyModel[emix].Domain;
+                IsAlpine := MyRO.EnemyModel[emix].Cap and
+                  (1 shl (mcAlpine - mcFirstNonCap)) <> 0;
+              end
+            end;
+
+            if CurrentMoveInfo.DoShow then
+            begin
+              if Command = cShowCapturing then
+                Play('MOVE_CAPTURE')
+              else if EndHealth <= 0 then
+                Play('MOVE_DIE')
+              else if Flags and umSpyMission <> 0 then
+                Play('MOVE_COVERT')
+              else if Flags and umShipLoading <> 0 then
+                if ShowMoveDomain = dAir then
+                  Play('MOVE_PLANELANDING')
+                else
+                  Play('MOVE_LOAD')
+              else if Flags and umPlaneLoading <> 0 then
+                Play('MOVE_LOAD')
+              else if Flags and umShipUnloading <> 0 then
+                if ShowMoveDomain = dAir then
+                  Play('MOVE_PLANESTART')
+                else
+                  Play('MOVE_UNLOAD')
+              else if Flags and umPlaneUnloading <> 0 then
+                if (MyMap[FromLoc] and fCity = 0) and
+                  (MyMap[FromLoc] and fTerImp <> tiBase) then
+                  Play('MOVE_PARACHUTE')
+                else
+                  Play('MOVE_UNLOAD')
+              else if (ShowMoveDomain = dGround) and not IsAlpine and
+                (MyMap[ToLoc] and fTerrain = fMountains) and
+                ((MyMap[FromLoc] and (fRoad or fRR or fCity) = 0) or
+                (MyMap[ToLoc] and (fRoad or fRR or fCity) = 0)) then
+                Play('MOVE_MOUNTAIN');
+
+              FocusOnLoc(FromLoc, flImmUpdate);
+              PaintLoc_BeforeMove(FromLoc);
+              if Command = cShowCapturing then
+                MoveOnScreen(TShowMove(Data), 1, 32, 32)
+              else
+                MoveOnScreen(TShowMove(Data), 1, AnimationSpeed, AnimationSpeed)
+            end // if CurrentMoveInfo.DoShow
+            else
+              MapValid := false;
+          end
+        end;
+
+      cShowAttacking:
+        if (idle and (NewPlayer = me) or not idle and not skipped and
+          (TShowMove(Data).emix <> $FFFF)) and
+          not((GameMode = cMovie) and (MovieSpeed = 4)) then
+        begin
+          assert(NewPlayer = me);
+          if not idle or (GameMode = cMovie) then
+            Application.ProcessMessages;
+          with TShowMove(Data) do
+          begin
+            CurrentMoveInfo.AfterAttackExpeller := -1;
+            CurrentMoveInfo.DoShow := false;
+            if idle then
+              CurrentMoveInfo.DoShow := true // own unit -- always show attacks
+            else
+            begin
+              CurrentMoveInfo.IsAlly := MyRO.Treaty[Owner] = trAlliance;
+              if CurrentMoveInfo.IsAlly then
+                CurrentMoveInfo.DoShow := not mAlNoMoves.Checked
+              else
+                CurrentMoveInfo.DoShow := not mEnNoMoves.Checked;
+            end;
+            if CurrentMoveInfo.DoShow then
+            begin
+              ToLoc := dLoc(FromLoc, dx, dy);
+              if Tribe[Owner].ModelPicture[mix].HGr = 0 then
+                InitEnemyModel(emix);
+
+              if (MyMap[ToLoc] and (fCity or fUnit or fOwned) = fCity or fOwned)
+              then
+              begin // tell about bombardment
+                cix := MyRO.nCity - 1;
+                while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
+                  dec(cix);
+                if MyCity[cix].Status and csToldBombard = 0 then
+                begin
+                  if not supervising then
+                    MyCity[cix].Status := MyCity[cix].Status or csToldBombard;
+                  s := CityName(MyCity[cix].ID);
+                  SoundMessageEx(Format(Tribe[Owner].TPhrase('BOMBARD'),
+                    [s]), '');
+                  Update; // remove message box from screen
+                end;
+              end
+              else if Flags and umExpelling <> 0 then
+                CurrentMoveInfo.AfterAttackExpeller := Owner;
+
+              if Flags and umExpelling <> 0 then
+                Play('MOVE_EXPEL')
+              else if Owner = me then
+              begin
+                MakeModelInfo(me, mix, MyModel[mix], mi);
+                Play(AttackSound(ModelCode(mi)));
+              end
+              else
+                Play(AttackSound(ModelCode(MyRO.EnemyModel[emix])));
+
+              FocusOnLoc(FromLoc, flImmUpdate);
+
+              // before combat
+              MainMap.AttackBegin(TShowMove(Data));
+              if MyMap[ToLoc] and fCity <> 0 then
+                PaintLoc(ToLoc);
+              PaintLoc(FromLoc);
+              MoveOnScreen(TShowMove(Data), 1, 9, 16);
+              MoveOnScreen(TShowMove(Data), 17, 12, 32);
+              MoveOnScreen(TShowMove(Data), 7, 11, 16);
+
+              // after combat
+              MainMap.AttackEffect(TShowMove(Data));
+              PaintLoc(ToLoc);
+              if EndHealth > 0 then
+              begin
+                Health := EndHealth;
+                MoveOnScreen(TShowMove(Data), 10, 0, 16);
+              end
+              else if not idle then
+                Sleep(MoveTime div 2);
+              MainMap.AttackEnd;
+            end // if CurrentMoveInfo.DoShow
+            else
+              MapValid := false;
+          end
+        end;
+
+      cShowMissionResult:
+        if Cardinal(Data) = 0 then
+          SoundMessageEx(Phrases.Lookup('NOFOREIGNINFO'), '')
+        else
+        begin
+          s := Phrases.Lookup('FOREIGNINFO');
+          for p1 := 0 to nPl - 1 do
+            if 3 shl (p1 * 2) and Cardinal(Data) <> 0 then
+              s := s + '\' + Tribe[p1].TPhrase('SHORTNAME');
+          SoundMessageEx(s, '')
+        end;
+
+      cShowShipChange:
+        if not IsMultiPlayerGame and (Jump[0] = 0) then
+          ShowEnemyShipChange(TShowShipChange(Data));
+
+      cShowGreatLibTech:
+        if not IsMultiPlayerGame and (Jump[0] = 0) then
+          with MessgExDlg do
+          begin
+            MessgText := Format(Phrases.Lookup('GRLIB_GENERAL'),
+              [Phrases.Lookup('ADVANCES', integer(Data))]);
+            OpenSound := 'NEWADVANCE_GRLIB';
+            Kind := mkOk;
+            IconKind := mikImp;
+            IconIndex := woGrLibrary;
+            ShowModal;
+          end;
+
+      cRefreshDebugMap:
+        begin
+          if integer(Data) = IsoEngine.pDebugMap then
+          begin
+            MapValid := false;
+            MainOffscreenPaint;
+            Update;
+          end
+        end;
+
+    else
+      if Command >= cClientEx then
+        case Command and $FFF0 of
+
+          cSetTribe:
+            with TTribeInfo(Data) do
+            begin
+              i := UnusedTribeFiles.Count - 1;
+              while (i >= 0) and
+                (AnsiCompareFileName(UnusedTribeFiles[i], FileName) <> 0) do
+                dec(i);
+              if i >= 0 then
+                UnusedTribeFiles.Delete(i);
+              CreateTribe(trix, FileName, true);
+            end;
+
+          cSetNewModelPicture, cSetModelPicture:
+            if TribeOriginal[TModelPictureInfo(Data).trix] then
+              Tribe[TModelPictureInfo(Data).trix].SetModelPicture
+                (TModelPictureInfo(Data), Command and
+                $FFF0 = cSetNewModelPicture);
+
+          cSetSlaveIndex and $FFF0:
+            Tribe[integer(Data) shr 16].mixSlaves := integer(Data) and $FFFF;
+
+          cSetCityName:
+            with TCityNameInfo(Data) do
+              if TribeOriginal[ID shr 12] then
+                Tribe[ID shr 12].SetCityName(ID and $FFF, NewName);
+
+          cSetModelName:
+            with TModelNameInfo(Data) do
+              if TribeOriginal[NewPlayer] then
+                Tribe[NewPlayer].ModelName[mix] := NewName;
+        end
+    end
+  end; { <<<client }
+
+  { *** main part *** }
+
+  procedure TMainScreen.CreateParams(var p: TCreateParams);
+  var
+    DefaultOptionChecked: integer;
+    Reg: TRegistry;
+    doinit: boolean;
+  begin
+    inherited;
+
+    // define which menu settings to save
+    SaveOption[0] := mAlEffectiveMovesOnly.Tag;
+    SaveOption[1] := mEnMoves.Tag;
+    SaveOption[2] := mEnAttacks.Tag;
+    SaveOption[3] := mEnNoMoves.Tag;
+    SaveOption[4] := mWaitTurn.Tag;
+    SaveOption[5] := mEffectiveMovesOnly.Tag;
+    SaveOption[6] := mEnFastMoves.Tag;
+    SaveOption[7] := mSlowMoves.Tag;
+    SaveOption[8] := mFastMoves.Tag;
+    SaveOption[9] := mVeryFastMoves.Tag;
+    SaveOption[10] := mNames.Tag;
+    SaveOption[11] := mRepList.Tag;
+    SaveOption[12] := mRepScreens.Tag;
+    SaveOption[13] := mSoundOff.Tag;
+    SaveOption[14] := mSoundOn.Tag;
+    SaveOption[15] := mSoundOnAlt.Tag;
+    SaveOption[16] := mScrollSlow.Tag;
+    SaveOption[17] := mScrollFast.Tag;
+    SaveOption[18] := mScrollOff.Tag;
+    SaveOption[19] := mAlSlowMoves.Tag;
+    SaveOption[20] := mAlFastMoves.Tag;
+    SaveOption[21] := mAlNoMoves.Tag;
+    DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
+      1 shl 18 + 1 shl 19;
+
+    Reg := TRegistry.Create;
+    doinit := true;
+    if Reg.KeyExists('SOFTWARE\cevo\RegVer9') then
+    begin
+      doinit := false;
+      Reg.OpenKey('SOFTWARE\cevo\RegVer9', false);
+      try
+        xxt := Reg.ReadInteger('TileWidth') div 2;
+        yyt := Reg.ReadInteger('TileHeight') div 2;
+        OptionChecked := Reg.ReadInteger('OptionChecked');
+        MapOptionChecked := Reg.ReadInteger('MapOptionChecked');
+        CityRepMask := Cardinal(Reg.ReadInteger('CityReport'));
+      except
+        doinit := true;
+      end;
+      Reg.closekey;
+      if OptionChecked and (7 shl 16) = 0 then
+        OptionChecked := OptionChecked or (1 shl 16);
+      // old regver with no scrolling
+    end;
+    Reg.free;
+    if doinit then
+    begin
+      xxt := 48;
+      yyt := 24;
+      OptionChecked := DefaultOptionChecked;
+      MapOptionChecked := 1 shl moCityNames;
+      CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
+        not chCaptured);
+    end;
+
+    if FullScreen then
+    begin
+      p.Style := $87000000;
+      BorderStyle := bsNone;
+      BorderIcons := [];
+    end;
+
+    if 1 shl 13 and OptionChecked <> 0 then
+      SoundMode := smOff
+    else if 1 shl 15 and OptionChecked <> 0 then
+      SoundMode := smOnAlt
+    else
+      SoundMode := smOn
+  end;
+
+  procedure TMainScreen.FormCreate(Sender: TObject);
+  var
+    i, j: integer;
+  begin
+    Screen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
+    Screen.Cursors[crFlatHand] := LoadCursor(HInstance, 'FLATHAND');
+
+    // tag-controlled language
+    for i := 0 to ComponentCount - 1 do
+      if Components[i].Tag and $FF <> 0 then
+        if Components[i] is TMenuItem then
+        begin
+          TMenuItem(Components[i]).Caption := Phrases.Lookup('CONTROLS',
+            -1 + Components[i].Tag and $FF);
+          for j := 0 to nSaveOption - 1 do
+            if Components[i].Tag and $FF = SaveOption[j] then
+              TMenuItem(Components[i]).Checked := 1 shl j and
+                OptionChecked <> 0;
+        end
+        else if Components[i] is TButtonBase then
+        begin
+          TButtonBase(Components[i]).Hint := Phrases.Lookup('CONTROLS',
+            -1 + Components[i].Tag and $FF);
+          if (Components[i] is TButtonC) and
+            (TButtonC(Components[i]).ButtonIndex <> 1) then
+            TButtonC(Components[i]).ButtonIndex :=
+              MapOptionChecked shr (Components[i].Tag shr 8) and 1 + 2
+        end;
+
+    // non-tag-controlled language
+    mTechTree.Caption := Phrases2.Lookup('MENU_ADVTREE');
+    mViewpoint.Caption := Phrases2.Lookup('MENU_VIEWPOINT');
+    if not Phrases2FallenBackToEnglish then
+    begin
+      MenuArea.Hint := Phrases2.Lookup('BTN_MENU');
+      TreasuryArea.Hint := Phrases2.Lookup('TIP_TREASURY');
+      ResearchArea.Hint := Phrases.Lookup('SCIENCE');
+      ManagementArea.Hint := Phrases2.Lookup('BTN_MANAGE');
+    end;
+    for i := 0 to mRep.Count - 1 do
+    begin
+      j := mRep[i].Tag shr 8;
+      mRep[i].Caption := CityEventName(j);
+      mRep[i].Checked := CityRepMask and (1 shl j) <> 0;
+    end;
+
+    Mini := TBitmap.Create;
+    Mini.PixelFormat := pf24bit;
+    Panel := TBitmap.Create;
+    Panel.PixelFormat := pf24bit;
+    Panel.Canvas.Font.Assign(UniFont[ftSmall]);
+    Panel.Canvas.Brush.Style := bsClear;
+    TopBar := TBitmap.Create;
+    TopBar.PixelFormat := pf24bit;
+    TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
+    TopBar.Canvas.Brush.Style := bsClear;
+    Buffer := TBitmap.Create;
+    Buffer.PixelFormat := pf24bit;
+    if 2 * lxmax > 3 * xSizeBig then
+      Buffer.width := 2 * lxmax
+    else
+      Buffer.width := 3 * xSizeBig;
+    if lymax > 3 * ySizeBig then
+      Buffer.height := lymax
+    else
+      Buffer.height := 3 * ySizeBig;
+    Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
+    for i := 0 to nPl - 1 do
+      AILogo[i] := nil;
+    Canvas.Font.Assign(UniFont[ftSmall]);
+    InitButtons();
+    EOT.Template := Templates;
+  end;
+
+  procedure TMainScreen.FormDestroy(Sender: TObject);
+  var
+    i: integer;
+  begin
+    Mini.free;
+    Buffer.free;
+    Panel.free;
+    for i := 0 to nPl - 1 do
+      if AILogo[i] <> nil then
+        AILogo[i].free;
+  end;
+
+  procedure TMainScreen.FormResize(Sender: TObject);
+  var
+    MiniFrame, MaxMapWidth: integer;
+  begin
+    SmallScreen := ClientWidth < 1024;
+    MaxMapWidth := (G.lx * 2 - 3) * xxt;
+    // avoide the same tile being visible left and right
+    if ClientWidth <= MaxMapWidth then
+    begin
+      MapWidth := ClientWidth;
+      MapOffset := 0;
+    end
+    else
+    begin
+      MapWidth := MaxMapWidth;
+      MapOffset := (ClientWidth - MapWidth) div 2;
+    end;
+    MapHeight := ClientHeight - TopBarHeight - PanelHeight + overlap;
+    Panel.width := ClientWidth;
+    Panel.height := PanelHeight;
+    TopBar.width := ClientWidth;
+    TopBar.height := TopBarHeight;
+    MiniFrame := (lxmax_xxx - G.ly) div 2;
+    xMidPanel := (G.lx + MiniFrame) * 2 + 1;
+    xRightPanel := ClientWidth - LeftPanelWidth - 10;
+    if ClientMode = cEditMap then
+      TrPitch := 2 * xxt
+    else
+      TrPitch := 66;
+    xMini := MiniFrame - 5;
+    yMini := (PanelHeight - 26 - lxmax_xxx) div 2 + MiniFrame;
+    ywmax := (G.ly - MapHeight div yyt + 1) and not 1;
+    ywcenter := -((MapHeight - yyt * (G.ly - 1)) div (4 * yyt)) * 2;
+    // only for ywmax<=0
+    if ywmax <= 0 then
+      yw := ywcenter
+    else if yw < 0 then
+      yw := 0
+    else if yw > ywmax then
+      yw := ywmax;
+    UnitInfoBtn.Top := ClientHeight - 29;
+    UnitInfoBtn.Left := xMidPanel + 7 + 99;
+    UnitBtn.Top := ClientHeight - 29;
+    UnitBtn.Left := xMidPanel + 7 + 99 + 31;
+    TerrainBtn.Top := ClientHeight - 29;
+    TerrainBtn.Left := xMidPanel + 7 + 99 + 62;
+    MovieSpeed1Btn.Top := ClientHeight - 91;
+    MovieSpeed1Btn.Left := ClientWidth div 2 - 62;
+    MovieSpeed2Btn.Top := ClientHeight - 91;
+    MovieSpeed2Btn.Left := ClientWidth div 2 - 62 + 29;
+    MovieSpeed3Btn.Top := ClientHeight - 91;
+    MovieSpeed3Btn.Left := ClientWidth div 2 - 62 + 2 * 29;
+    MovieSpeed4Btn.Top := ClientHeight - 91;
+    MovieSpeed4Btn.Left := ClientWidth div 2 - 62 + 3 * 29 + 12;
+    EOT.Top := ClientHeight - 64;
+    EOT.Left := ClientWidth - 62;
+    SetWindowPos(sb.h, 0, xRightPanel + 10 - 14 -
+      GetSystemMetrics(SM_CXVSCROLL), ClientHeight - MidPanelHeight + 8, 0, 0,
+      SWP_NOSIZE or SWP_NOZORDER);
+    MapBtn0.Left := xMini + G.lx - 44;
+    MapBtn0.Top := ClientHeight - 15;
+    MapBtn1.Left := xMini + G.lx - 28;
+    MapBtn1.Top := ClientHeight - 15;
+    { MapBtn2.Left:=xMini+G.lx-20;
+      MapBtn2.Top:=ClientHeight-15;
+      MapBtn3.Left:=xMini+G.lx-4;
+      MapBtn3.Top:=ClientHeight-15; }
+    MapBtn5.Left := xMini + G.lx - 12;
+    MapBtn5.Top := ClientHeight - 15;
+    MapBtn4.Left := xMini + G.lx + 20;
+    MapBtn4.Top := ClientHeight - 15;
+    MapBtn6.Left := xMini + G.lx + 36;
+    MapBtn6.Top := ClientHeight - 15;
+    TreasuryArea.Left := ClientWidth div 2 - 172;
+    ResearchArea.Left := ClientWidth div 2;
+    ManagementArea.Left := ClientWidth - xPalace;
+    ManagementArea.Top := TopBarHeight + MapHeight - overlap + yPalace;
+    ArrangeMidPanel;
+    if RepaintOnResize then
+    begin
+      RectInvalidate(0, TopBarHeight, ClientWidth, TopBarHeight + MapHeight);
+      MapValid := false;
+      PaintAll
+    end
+  end;
+
+  procedure TMainScreen.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+  begin
+    CanClose := Closable;
+    if not Closable and idle and (me = 0) and (ClientMode < scContact) then
+      MenuClick(mResign)
+  end;
+
+  procedure TMainScreen.OnScroll(var m: TMessage);
+  begin
+    if ProcessPVSB(sb, m) then
+    begin
+      PanelPaint;
+      Update
+    end
+  end;
+
+  procedure TMainScreen.OnEOT(var Msg: TMessage);
+  begin
+    EndTurn
+  end;
+
+  procedure TMainScreen.EOTClick(Sender: TObject);
+  begin
+    if GameMode = cMovie then
+    begin
+      MessgExDlg.CancelMovie;
+      Server(sBreak, me, 0, nil^)
+    end
+    else if ClientMode < 0 then
+      skipped := true
+    else if ClientMode >= scContact then
+      NegoDlg.ShowNewContent(wmPersistent)
+    else if Jump[pTurn] > 0 then
+    begin
+      Jump[pTurn] := 0;
+      StartRunning := false
+    end
+    else
+      EndTurn
+  end;
+
+  // set xTerrain, xTroop, and TrRow
+  procedure TMainScreen.ArrangeMidPanel;
+  begin
+    if ClientMode = cEditMap then
+      xTroop := xMidPanel + 15
+    else
+    begin
+      if supervising then
+        xTerrain := xMidPanel + 2 * xxt + 14
+      else if ClientWidth < 1280 then
+        xTerrain := ClientWidth div 2 + (1280 - ClientWidth) div 3
+      else
+        xTerrain := ClientWidth div 2;
+      xTroop := xTerrain + 2 * xxt + 12;
+      if SmallScreen and not supervising then
+        xTroop := xRightPanel + 10 - 3 * 66 -
+          GetSystemMetrics(SM_CXVSCROLL) - 19 - 4;
+      // not perfect but we assume almost no one is still playing on a 800x600 screen
+    end;
+    TrRow := (xRightPanel + 10 - xTroop - GetSystemMetrics(SM_CXVSCROLL) - 19)
+      div TrPitch;
+  end;
+
+  function TMainScreen.EndTurn(WasSkipped: boolean): boolean;
+
+    function IsResourceUnused(cix, NeedFood, NeedProd: integer): boolean;
+    var
+      dx, dy, fix: integer;
+      CityAreaInfo: TCityAreaInfo;
+      TileInfo: TTileInfo;
+    begin
+      Server(sGetCityAreaInfo, me, cix, CityAreaInfo);
+      for dy := -3 to 3 do
+        for dx := -3 to 3 do
+          if ((dx + dy) and 1 = 0) and (dx * dx * dy * dy < 81) then
+          begin
+            fix := (dy + 3) shl 2 + (dx + 3) shr 1;
+            if (MyCity[cix].Tiles and (1 shl fix) = 0) // not used yet
+              and (CityAreaInfo.Available[fix] = faAvailable) then // usable
+            begin
+              TileInfo.ExplCity := cix;
+              Server(sGetHypoCityTileInfo, me, dLoc(MyCity[cix].Loc, dx, dy),
+                TileInfo);
+              if (TileInfo.Food >= NeedFood) and (TileInfo.Prod >= NeedProd)
+              then
+              begin
+                result := true;
+                exit
+              end;
+            end
+          end;
+      result := false;
+    end;
+
+  var
+    i, p1, uix, cix, CenterLoc: integer;
+    MsgItem: string;
+    CityReport: TCityReport;
+    PlaneReturnData: TPlaneReturnData;
+    Zoom: boolean;
+  begin
+    result := false;
+    if ClientMode >= scDipOffer then
+      exit;
+
+    if supervising and (me <> 0) then
+    begin
+      for i := 0 to Screen.FormCount - 1 do
+        if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+        then
+          Screen.Forms[i].Close; // close windows
+      ItsMeAgain(0);
+    end;
+
+    CityOptimizer_EndOfTurn;
+
+    if not WasSkipped then // check warnings
+    begin
+      // need to move planes home?
+      for uix := 0 to MyRO.nUn - 1 do
+        with MyUn[uix] do
+          if (Loc >= 0) and (MyModel[mix].Domain = dAir) and
+            (Status and usToldNoReturn = 0) and (Master < 0) and
+            (MyMap[Loc] and fCity = 0) and (MyMap[Loc] and fTerImp <> tiBase)
+          then
+          begin
+            PlaneReturnData.Fuel := Fuel;
+            PlaneReturnData.Loc := Loc;
+            PlaneReturnData.Movement := 0; // end turn without further movement?
+            if Server(sGetPlaneReturn, me, uix, PlaneReturnData) = eNoWay then
+            begin
+              CenterLoc := Loc + G.lx * 6;
+              // centering the unit itself would make it covered by the query dialog
+              while CenterLoc >= G.lx * G.ly do
+                dec(CenterLoc, G.lx * 2);
+              Centre(CenterLoc);
+              SetTroopLoc(-1);
+              PaintAll;
+
+              if MyModel[mix].Kind = mkSpecial_Glider then
+                MsgItem := 'LOWFUEL_GLIDER'
+              else
+                MsgItem := 'LOWFUEL';
+              if SimpleQuery(mkYesNo, Phrases.Lookup(MsgItem),
+                'WARNING_LOWSUPPORT') <> mrOK then
+              begin
+                SetUnFocus(uix);
+                SetTroopLoc(Loc);
+                PanelPaint;
+                exit;
+              end;
+              MyUn[uix].Status := MyUn[uix].Status or usToldNoReturn;
+            end
+          end;
+
+      if not supervising and (MyRO.TestFlags and tfImmImprove = 0) and
+        (MyRO.Government <> gAnarchy) and (MyRO.Money + TaxSum < 0) and
+        (MyRO.TaxRate < 100) then // low funds!
+        with MessgExDlg do
+        begin
+          OpenSound := 'WARNING_LOWFUNDS';
+          MessgText := Phrases.Lookup('LOWFUNDS');
+          Kind := mkYesNo;
+          IconKind := mikImp;
+          IconIndex := imTrGoods;
+          ShowModal;
+          if ModalResult <> mrOK then
+            exit
+        end;
+
+      if MyRO.Government <> gAnarchy then
+        for cix := 0 to MyRO.nCity - 1 do
+          with MyCity[cix] do
+            if (Loc >= 0) and (Flags and chCaptured = 0) then
+            begin
+              Zoom := false;
+              CityReport.HypoTiles := -1;
+              CityReport.HypoTax := -1;
+              CityReport.HypoLux := -1;
+              Server(sGetCityReport, me, cix, CityReport);
+
+              if (CityReport.Working - CityReport.Happy > Size shr 1) and
+                (Flags and chCaptured <= $10000) then
+                with MessgExDlg do
+                begin
+                  OpenSound := 'WARNING_DISORDER';
+                  if Status and csResourceWeightsMask = 0 then
+                    MsgItem := 'DISORDER'
+                  else
+                    MsgItem := 'DISORDER_UNREST';
+                  MessgText := Format(Phrases.Lookup(MsgItem), [CityName(ID)]);
+                  Kind := mkYesNo;
+                  // BigIcon:=29;
+                  ShowModal;
+                  Zoom := ModalResult <> mrOK;
+                end;
+              if not Zoom and (Food + CityReport.FoodRep - CityReport.Eaten < 0)
+              then
+                with MessgExDlg do
+                begin
+                  OpenSound := 'WARNING_FAMINE';
+                  if Status and csResourceWeightsMask = 0 then
+                    MsgItem := 'FAMINE'
+                  else if (CityReport.Deployed <> 0) and
+                    IsResourceUnused(cix, 1, 0) then
+                    MsgItem := 'FAMINE_UNREST'
+                  else
+                    MsgItem := 'FAMINE_TILES';
+                  MessgText := Format(Phrases.Lookup(MsgItem), [CityName(ID)]);
+                  Kind := mkYesNo;
+                  IconKind := mikImp;
+                  IconIndex := 22;
+                  ShowModal;
+                  Zoom := ModalResult <> mrOK;
+                end;
+              if not Zoom and (CityReport.ProdRep < CityReport.Support) then
+                with MessgExDlg do
+                begin
+                  OpenSound := 'WARNING_LOWSUPPORT';
+                  if Status and csResourceWeightsMask = 0 then
+                    MsgItem := 'LOWSUPPORT'
+                  else if (CityReport.Deployed <> 0) and
+                    IsResourceUnused(cix, 0, 1) then
+                    MsgItem := 'LOWSUPPORT_UNREST'
+                  else
+                    MsgItem := 'LOWSUPPORT_TILES';
+                  MessgText := Format(Phrases.Lookup(MsgItem), [CityName(ID)]);
+                  Kind := mkYesNo;
+                  IconKind := mikImp;
+                  IconIndex := 29;
+                  ShowModal;
+                  Zoom := ModalResult <> mrOK;
+                end;
+              if Zoom then
+              begin // zoom to city
+                ZoomToCity(Loc);
+                exit
+              end
+            end;
+
+      if (MyRO.Happened and phTech <> 0) and (MyRO.ResearchTech < 0) and
+        (MyData.FarTech <> adNexus) then
+        if not ChooseResearch then
+          exit;
+    end;
+
+    RememberPeaceViolation;
+
+    SetUnFocus(-1);
+    for uix := 0 to MyRO.nUn - 1 do
+      MyUn[uix].Status := MyUn[uix].Status and usPersistent;
+
+    CityDlg.CloseAction := None;
+    if IsMultiPlayerGame then
+    begin // close windows for next player
+      for i := 0 to Screen.FormCount - 1 do
+        if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+        then
+          Screen.Forms[i].Close;
+    end
+    else
+    begin
+      if CityDlg.Visible then
+        CityDlg.Close;
+      if UnitStatDlg.Visible then
+        UnitStatDlg.Close;
+    end;
+    for i := 0 to Screen.FormCount - 1 do
+      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
+        Screen.Forms[i].Enabled := false;
+
+    if Server(sTurn, pTurn, 0, nil^) >= rExecuted then
+    begin
+      if Jump[pTurn] > 0 then
+        EOT.Hint := Phrases.Lookup('BTN_STOP')
+      else
+        EOT.Hint := Phrases.Lookup('BTN_SKIP');
+      result := true;
+      SetTroopLoc(-1);
+      pTurn := -1;
+      pLogo := -1;
+      UnitInfoBtn.Visible := false;
+      UnitBtn.Visible := false;
+      TerrainBtn.Visible := false;
+      EOT.ButtonIndex := eotCancel;
+      EOT.Visible := true;
+      MapValid := false;
+      PanelPaint;
+      Update;
+      ClientMode := -1;
+      idle := false;
+      skipped := WasSkipped;
+      for p1 := 1 to nPl - 1 do
+        if G.RO[p1] <> nil then
+          skipped := true; // don't show enemy moves in hotseat mode
+    end
+    else
+      PanelPaint
+  end; // EndTurn
+
+  procedure TMainScreen.EndNego;
+  begin
+    if NegoDlg.Visible then
+      NegoDlg.Close;
+    HaveStrategyAdvice := false;
+    // AdvisorDlg.HaveStrategyAdvice;
+    // negotiation might have changed advices
+    EOT.ButtonIndex := eotCancel;
+    EOT.Visible := true;
+    PanelPaint;
+    Update;
+    ClientMode := -1;
+    idle := false;
+  end;
+
+  procedure TMainScreen.ProcessRect(x0, y0, nx, ny, Options: integer);
+  var
+    xs, ys, xl, yl: integer;
+  begin
+    xl := nx * xxt + xxt;
+    yl := ny * yyt + yyt * 2;
+    xs := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
+    // |xs+xl/2-MapWidth/2| -> min
+    while abs(2 * (xs + G.lx * (xxt * 2)) + xl - MapWidth) <
+      abs(2 * xs + xl - MapWidth) do
+      inc(xs, G.lx * (xxt * 2));
+    ys := (y0 - yw) * yyt - yyt;
+    if xs + xl > MapWidth then
+      xl := MapWidth - xs;
+    if ys + yl > MapHeight then
+      yl := MapHeight - ys;
+    if (xl <= 0) or (yl <= 0) then
+      exit;
+    if Options and prPaint <> 0 then
+    begin
+      if Options and prAutoBounds <> 0 then
+        MainMap.SetPaintBounds(xs, ys, xs + xl, ys + yl);
+      MainMap.Paint(xs, ys, x0 + G.lx * y0, nx, ny, -1, -1);
+    end;
+    if Options and prInvalidate <> 0 then
+      RectInvalidate(MapOffset + xs, TopBarHeight + ys, MapOffset + xs + xl,
+        TopBarHeight + ys + yl)
+  end;
+
+  procedure TMainScreen.PaintLoc(Loc: integer; Radius: integer = 0);
+  var
+    yLoc, x0: integer;
+  begin
+    if MapValid then
+    begin
+      yLoc := (Loc + G.lx * 1024) div G.lx - 1024;
+      x0 := (Loc + (yLoc and 1 - 2 * Radius + G.lx * 1024) div 2) mod G.lx;
+      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      ProcessRect(x0, yLoc - 2 * Radius, 4 * Radius + 1, 4 * Radius + 1,
+        prPaint or prAutoBounds or prInvalidate);
+      Update;
+    end
+  end;
+
+  procedure TMainScreen.PaintLocTemp(Loc, Style: integer);
+  var
+    y0, x0, xMap, yMap: integer;
+  begin
+    if not MapValid then
+      exit;
+    Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
+    y0 := Loc div G.lx;
+    x0 := Loc mod G.lx;
+    xMap := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
+    // |xMap+xxt-MapWidth/2| -> min
+    while abs(2 * (xMap + G.lx * (xxt * 2)) + 2 * xxt - MapWidth) <
+      abs(2 * xMap + 2 * xxt - MapWidth) do
+      inc(xMap, G.lx * (xxt * 2));
+    yMap := (y0 - yw) * yyt - yyt;
+    NoMap.SetOutput(Buffer);
+    NoMap.SetPaintBounds(0, 0, 2 * xxt, 3 * yyt);
+    NoMap.Paint(0, 0, Loc, 1, 1, -1, -1, Style = pltsBlink);
+    PaintBufferToScreen(xMap, yMap, 2 * xxt, 3 * yyt);
+  end;
+
+  // paint content of buffer directly to screen instead of offscreen
+  // panel protusions are added
+  // NoMap must be set to buffer and bounds before
+  procedure TMainScreen.PaintBufferToScreen(xMap, yMap, width, height: integer);
+  begin
+    if xMap + width > MapWidth then
+      width := MapWidth - xMap;
+    if yMap + height > MapHeight then
+      height := MapHeight - yMap;
+    if (width <= 0) or (height <= 0) or (width + xMap <= 0) or
+      (height + yMap <= 0) then
+      exit;
+
+    NoMap.BitBlt(Panel, -xMap - MapOffset, -yMap + MapHeight - overlap,
+      xMidPanel, overlap, 0, 0, SRCCOPY);
+    NoMap.BitBlt(Panel, -xMap - MapOffset + xRightPanel,
+      -yMap + MapHeight - overlap, Panel.width - xRightPanel, overlap,
+      xRightPanel, 0, SRCCOPY);
+    if yMap < 0 then
+    begin
+      if xMap < 0 then
+        BitBlt(Canvas.Handle, MapOffset, TopBarHeight, width + xMap,
+          height + yMap, Buffer.Canvas.Handle, -xMap, -yMap, SRCCOPY)
+      else
+        BitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight, width,
+          height + yMap, Buffer.Canvas.Handle, 0, -yMap, SRCCOPY)
+    end
+    else
+    begin
+      if xMap < 0 then
+        BitBlt(Canvas.Handle, MapOffset, TopBarHeight + yMap, width + xMap,
+          height, Buffer.Canvas.Handle, -xMap, 0, SRCCOPY)
+      else
+        BitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight + yMap, width,
+          height, Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+    end
+  end;
+
+  procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: integer);
+  var
+    yLoc, x0: integer;
+  begin
+    if MapValid then
+    begin
+      yLoc := (FromLoc + G.lx * 1024) div G.lx - 1024;
+      x0 := (FromLoc + (yLoc and 1 + G.lx * 1024) div 2) mod G.lx;
+      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      ProcessRect(x0, yLoc, 1, 1, prPaint or prAutoBounds);
+    end
+  end;
+
+  procedure TMainScreen.PaintDestination;
+  var
+    Destination: integer;
+  begin
+    if (UnFocus >= 0) and (MyUn[UnFocus].Status and usGoto <> 0) then
+    begin
+      Destination := MyUn[UnFocus].Status shr 16;
+      if (Destination <> $7FFF) and (Destination <> MyUn[UnFocus].Loc) then
+        PaintLocTemp(Destination, pltsBlink);
+    end;
+  end;
+
+  procedure TMainScreen.MiniPaint;
+  type
+    TLine = array [0 .. 99999999, 0 .. 2] of Byte;
+  var
+    uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
+    PrevMiniLine, MiniLine: ^TLine;
+  begin
+    cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
+    cmPolNone := GrExt[HGrSystem].Data.Canvas.Pixels[102, 67];
+    hw := MapWidth div (xxt * 2);
+    with Mini.Canvas do
+    begin
+      Brush.Color := $000000;
+      FillRect(Rect(0, 0, Mini.width, Mini.height));
+    end;
+    MiniLine := nil;
+    for y := 0 to G.ly - 1 do
+    begin
+      PrevMiniLine := MiniLine;
+      MiniLine := Mini.ScanLine[y];
+      for x := 0 to G.lx - 1 do
+        if MyMap[x + G.lx * y] and fTerrain <> fUNKNOWN then
+        begin
+          Loc := x + G.lx * y;
+          for i := 0 to 1 do
+          begin
+            xm := ((x - xwMini) * 2 + i + y and 1 - hw + G.lx * 5)
+              mod (G.lx * 2);
+            cm := MiniColors[MyMap[Loc] and fTerrain, i];
+            if ClientMode = cEditMap then
+            begin
+              if MyMap[Loc] and (fPrefStartPos or fStartPos) <> 0 then
+                cm := $FFFFFF;
+            end
+            else if MyMap[Loc] and fCity <> 0 then
+            begin
+              cix := MyRO.nCity - 1;
+              while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
+                dec(cix);
+              if cix >= 0 then
+                cm := Tribe[me].Color
+              else
+              begin
+                cix := MyRO.nEnemyCity - 1;
+                while (cix >= 0) and (MyRO.EnemyCity[cix].Loc <> Loc) do
+                  dec(cix);
+                if cix >= 0 then
+                  cm := Tribe[MyRO.EnemyCity[cix].Owner].Color
+              end;
+              cm := $808080 or cm shr 1; { increase brightness }
+              if PrevMiniLine <> nil then
+              begin // 2x2 city dot covers two scanlines
+                PrevMiniLine[xm, 0] := cm shr 16;
+                PrevMiniLine[xm, 1] := cm shr 8 and $FF;
+                PrevMiniLine[xm, 2] := cm and $FF;
+              end
+            end
+            else if (i = 0) and (MyMap[Loc] and fUnit <> 0) then
+            begin
+              uix := MyRO.nUn - 1;
+              while (uix >= 0) and (MyUn[uix].Loc <> Loc) do
+                dec(uix);
+              if uix >= 0 then
+                cm := Tribe[me].Color
+              else
+              begin
+                uix := MyRO.nEnemyUn - 1;
+                while (uix >= 0) and (MyRO.EnemyUn[uix].Loc <> Loc) do
+                  dec(uix);
+                if uix >= 0 then
+                  cm := Tribe[MyRO.EnemyUn[uix].Owner].Color
+              end;
+              cm := $808080 or cm shr 1; { increase brightness }
+            end
+            else if MapOptionChecked and (1 shl moPolitical) <> 0 then
+            begin
+              if MyMap[Loc] and fTerrain < fGrass then
+                cm := cmPolOcean
+              else if MyRO.Territory[Loc] < 0 then
+                cm := cmPolNone
+              else
+                cm := Tribe[MyRO.Territory[Loc]].Color;
+            end;
+            MiniLine[xm, 0] := cm shr 16;
+            MiniLine[xm, 1] := cm shr 8 and $FF;
+            MiniLine[xm, 2] := cm and $FF;
+          end;
+        end
+    end;
+  end;
+
+  procedure TMainScreen.MainOffscreenPaint;
+  var
+    ProcessOptions: integer;
+    rec: TRect;
+    DoInvalidate: boolean;
+  begin
+    if me < 0 then
+      with offscreen.Canvas do
+      begin
+        Brush.Color := $000000;
+        FillRect(Rect(0, 0, MapWidth, MapHeight));
+        Brush.Style := bsClear;
+        OffscreenUser := self;
+        exit
+      end;
+
+    MainMap.SetPaintBounds(0, 0, MapWidth, MapHeight);
+    if OffscreenUser <> self then
+    begin
+      if OffscreenUser <> nil then
+        OffscreenUser.Update;
+      // complete working with old owner to prevent rebound
+      if MapValid and (xwd = xw) and (ywd = yw) then
+        MainMap.SetPaintBounds(0, 0, UsedOffscreenWidth, UsedOffscreenHeight);
+      MapValid := false;
+      OffscreenUser := self;
+    end;
+
+    if xw - xwd > G.lx div 2 then
+      xwd := xwd + G.lx
+    else if xwd - xw > G.lx div 2 then
+      xwd := xwd - G.lx;
+    if not MapValid or (xw - xwd > MapWidth div (xxt * 2)) or
+      (xwd - xw > MapWidth div (xxt * 2)) or (yw - ywd > MapHeight div yyt) or
+      (ywd - yw > MapHeight div yyt) then
+    begin
+      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      ProcessRect(xw, yw, MapWidth div xxt, MapHeight div yyt,
+        prPaint or prInvalidate)
+    end
+    else
+    begin
+      if (xwd = xw) and (ywd = yw) then
+        exit; { map window not moved }
+      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      rec := Rect(0, 0, MapWidth, MapHeight);
+      ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2),
+        (ywd - yw) * yyt, rec, rec, 0, nil);
+      for DoInvalidate := false to FastScrolling do
+      begin
+        if DoInvalidate then
+        begin
+          rec.Bottom := MapHeight - overlap;
+          ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
+            rec, 0, nil);
+          ProcessOptions := prInvalidate;
+        end
+        else
+          ProcessOptions := prPaint or prAutoBounds;
+        if yw < ywd then
+        begin
+          ProcessRect(xw, yw, MapWidth div xxt, ywd - yw - 1, ProcessOptions);
+          if xw < xwd then
+            ProcessRect(xw, ywd, (xwd - xw) * 2 - 1, MapHeight div yyt - ywd +
+              yw, ProcessOptions)
+          else if xw > xwd then
+            ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, ywd,
+              (xw - xwd) * 2 + 1, MapHeight div yyt - ywd + yw, ProcessOptions)
+        end
+        else if yw > ywd then
+        begin
+          if DoInvalidate then
+            RectInvalidate(MapOffset, TopBarHeight + MapHeight - overlap -
+              (yw - ywd) * yyt, MapOffset + MapWidth, TopBarHeight + MapHeight
+              - overlap)
+          else
+            ProcessRect(xw, (ywd + MapHeight div (yyt * 2) * 2),
+              MapWidth div xxt, yw - ywd + 1, ProcessOptions);
+          if xw < xwd then
+            ProcessRect(xw, yw, (xwd - xw) * 2 - 1, MapHeight div yyt - yw + ywd
+              - 2, ProcessOptions)
+          else if xw > xwd then
+            ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, yw,
+              (xw - xwd) * 2 + 1, MapHeight div yyt - yw + ywd - 2,
+              ProcessOptions)
+        end
+        else if xw < xwd then
+          ProcessRect(xw, yw, (xwd - xw) * 2 - 1, MapHeight div yyt,
+            ProcessOptions)
+        else if xw > xwd then
+          ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, yw,
+            (xw - xwd) * 2 + 1, MapHeight div yyt, ProcessOptions);
+      end;
+      if not FastScrolling then
+        RectInvalidate(MapOffset, TopBarHeight, MapOffset + MapWidth,
+          TopBarHeight + MapHeight - overlap);
+      RectInvalidate(xMidPanel, TopBarHeight + MapHeight - overlap, xRightPanel,
+        TopBarHeight + MapHeight)
+    end;
+    // if (xwd<>xw) or (ywd<>yw) then
+    // Server(sChangeSuperView,me,yw*G.lx+xw,nil^); // for synchronizing client side viewer, not used currently
+    xwd := xw;
+    ywd := yw;
+    MapValid := true;
+  end;
+
+  procedure TMainScreen.PaintAll;
+  begin
+    MainOffscreenPaint;
+    xwMini := xw;
+    ywMini := yw;
+    MiniPaint;
+    PanelPaint;
+  end;
+
+  procedure TMainScreen.PaintAllMaps;
+  begin
+    MainOffscreenPaint;
+    xwMini := xw;
+    ywMini := yw;
+    MiniPaint;
+    CopyMiniToPanel;
+    RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
+      xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini +
+      2 + G.ly);
+  end;
+
+  procedure TMainScreen.CopyMiniToPanel;
+  begin
+    BitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      Mini.Canvas.Handle, 0, 0, SRCCOPY);
+    if MarkCityLoc >= 0 then
+      Sprite(Panel, HGrSystem,
+        xMini - 2 + (4 * G.lx + 2 * (MarkCityLoc mod G.lx) +
+        (G.lx - MapWidth div (xxt * 2)) - 2 * xwd) mod (2 * G.lx) +
+        MarkCityLoc div G.lx and 1, yMini - 3 + MarkCityLoc div G.lx, 10,
+        10, 77, 47)
+    else if ywmax <= 0 then
+      Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2,
+        xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + 2 + G.ly - 1,
+        MainTexture.clMark, MainTexture.clMark)
+    else
+      Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (xxt * 2),
+        yMini + 2 + yw, xMini + 1 + G.lx + MapWidth div (xxt * 2),
+        yMini + yw + MapHeight div yyt, MainTexture.clMark, MainTexture.clMark);
+  end;
+
+  procedure TMainScreen.PanelPaint;
+
+    function MovementToString(var Un: TUn): string;
+    begin
+      result := ScreenTools.MovementToString(Un.Movement);
+      if Un.Master >= 0 then
+        result := '(' + result + ')'
+      else if (MyModel[Un.mix].Domain = dAir) and
+        (MyModel[Un.mix].Kind <> mkSpecial_Glider) then
+        result := Format('%s(%d)', [result, Un.Fuel]);
+    end;
+
+  var
+    i, uix, uixDefender, x, xSrc, ySrc, xSrcBase, ySrcBase, CostFactor, Count,
+      mixShow, xTreasurySection, xResearchSection, JobFocus, TrueMoney,
+      TrueResearch: integer;
+    Tile: Cardinal;
+    s: string;
+    unx: TUn;
+    UnitInfo: TUnitInfo;
+    JobProgressData: TJobProgressData;
+    Prio: boolean;
+  begin
+    with Panel.Canvas do
+    begin
+      Fill(Panel.Canvas, 0, 3, xMidPanel + 7 - 10, PanelHeight - 3,
+        wMainTexture - (xMidPanel + 7 - 10), hMainTexture - PanelHeight);
+      Fill(Panel.Canvas, xRightPanel + 10 - 7, 3, Panel.width - xRightPanel - 10
+        + 7, PanelHeight - 3, -(xRightPanel + 10 - 7),
+        hMainTexture - PanelHeight);
+      FillLarge(Panel.Canvas, xMidPanel - 2, PanelHeight - MidPanelHeight,
+        xRightPanel + 2, PanelHeight, ClientWidth div 2);
+
+      Brush.Style := bsClear;
+      Pen.Color := $000000;
+      MoveTo(0, 0);
+      LineTo(xMidPanel + 7 - 8, 0);
+      LineTo(xMidPanel + 7 - 8, PanelHeight - MidPanelHeight);
+      LineTo(xRightPanel, PanelHeight - MidPanelHeight);
+      LineTo(xRightPanel, 0);
+      LineTo(ClientWidth, 0);
+      Pen.Color := MainTexture.clBevelLight;
+      MoveTo(xMidPanel + 7 - 9, PanelHeight - MidPanelHeight + 2);
+      LineTo(xRightPanel + 10 - 8, PanelHeight - MidPanelHeight + 2);
+      Pen.Color := MainTexture.clBevelLight;
+      MoveTo(0, 1);
+      LineTo(xMidPanel + 7 - 9, 1);
+      Pen.Color := MainTexture.clBevelShade;
+      LineTo(xMidPanel + 7 - 9, PanelHeight - MidPanelHeight + 1);
+      Pen.Color := MainTexture.clBevelLight;
+      LineTo(xRightPanel + 10 - 9, PanelHeight - MidPanelHeight + 1);
+      Pen.Color := MainTexture.clBevelLight;
+      LineTo(xRightPanel + 10 - 9, 1);
+      LineTo(ClientWidth, 1);
+      MoveTo(ClientWidth, 2);
+      LineTo(xRightPanel + 10 - 8, 2);
+      LineTo(xRightPanel + 10 - 8, PanelHeight);
+      MoveTo(0, 2);
+      LineTo(xMidPanel + 7 - 10, 2);
+      Pen.Color := MainTexture.clBevelShade;
+      LineTo(xMidPanel + 7 - 10, PanelHeight);
+      Corner(Panel.Canvas, xMidPanel + 7 - 16, 1, 1, MainTexture);
+      Corner(Panel.Canvas, xRightPanel + 10 - 9, 1, 0, MainTexture);
+      if ClientMode <> cEditMap then
+      begin
+        if supervising then
+        begin
+          Frame(Panel.Canvas, ClientWidth - xPalace - 1, yPalace - 1,
+            ClientWidth - xPalace + xSizeBig, yPalace + ySizeBig,
+            $B0B0B0, $FFFFFF);
+          RFrame(Panel.Canvas, ClientWidth - xPalace - 2, yPalace - 2,
+            ClientWidth - xPalace + xSizeBig + 1, yPalace + ySizeBig + 1,
+            $FFFFFF, $B0B0B0);
+          BitBlt(Panel.Canvas.Handle, ClientWidth - xPalace, yPalace, xSizeBig,
+            ySizeBig, GrExt[HGrSystem2].Data.Canvas.Handle, 70, 123, SRCCOPY);
+        end
+        else if MyRO.NatBuilt[imPalace] > 0 then
+          ImpImage(Panel.Canvas, ClientWidth - xPalace, yPalace, imPalace, -1,
+            GameMode <> cMovie
+            { (GameMode<>cMovie) and (MyRO.Government<>gAnarchy) } )
+        else
+          ImpImage(Panel.Canvas, ClientWidth - xPalace, yPalace, 21, -1,
+            GameMode <> cMovie
+            { (GameMode<>cMovie) and (MyRO.Government<>gAnarchy) } );
+      end;
+
+      if GameMode = cMovie then
+        Frame(Panel.Canvas, xMini + 1, yMini + 1, xMini + 2 + G.lx * 2,
+          yMini + 2 + G.ly, $000000, $000000)
+      else
+      begin
+        Frame(Panel.Canvas, xMini + 1, yMini + 1, xMini + 2 + G.lx * 2,
+          yMini + 2 + G.ly, $B0B0B0, $FFFFFF);
+        RFrame(Panel.Canvas, xMini, yMini, xMini + 3 + G.lx * 2,
+          yMini + 3 + G.ly, $FFFFFF, $B0B0B0);
+      end;
+      CopyMiniToPanel;
+      if ClientMode <> cEditMap then // MapBtn icons
+        for i := 0 to 5 do
+          if i <> 3 then
+            Dump(Panel, HGrSystem, xMini + G.lx - 42 + 16 * i, PanelHeight - 26,
+              8, 8, 121 + i * 9, 61);
+
+      if ClientMode = cEditMap then
+      begin
+        for i := 0 to TrRow - 1 do
+          trix[i] := -1;
+        Count := 0;
+        for i := 0 to nBrushTypes - 1 do
+        begin // display terrain types
+          if (Count >= TrRow * sb.si.npos) and (Count < TrRow * (sb.si.npos + 1))
+          then
+          begin
+            trix[Count - TrRow * sb.si.npos] := BrushTypes[i];
+            x := (Count - TrRow * sb.si.npos) * TrPitch;
+            xSrcBase := -1;
+            case BrushTypes[i] of
+              0 .. 8:
+                begin
+                  xSrc := BrushTypes[i];
+                  ySrc := 0
+                end;
+              9 .. 30:
+                begin
+                  xSrcBase := 2;
+                  ySrcBase := 2;
+                  xSrc := 0;
+                  ySrc := 2 * integer(BrushTypes[i]) - 15
+                end;
+              fRiver:
+                begin
+                  xSrc := 7;
+                  ySrc := 14
+                end;
+              fRoad:
+                begin
+                  xSrc := 0;
+                  ySrc := 9
+                end;
+              fRR:
+                begin
+                  xSrc := 0;
+                  ySrc := 10
+                end;
+              fCanal:
+                begin
+                  xSrc := 0;
+                  ySrc := 11
+                end;
+              fPoll:
+                begin
+                  xSrc := 6;
+                  ySrc := 12
+                end;
+              fDeadLands, fDeadLands or fCobalt, fDeadLands or fUranium,
+                fDeadLands or fMercury:
+                begin
+                  xSrcBase := 6;
+                  ySrcBase := 2;
+                  xSrc := 8;
+                  ySrc := 12 + BrushTypes[i] shr 25;
+                end;
+              tiIrrigation, tiFarm, tiMine, tiBase:
+                begin
+                  xSrc := BrushTypes[i] shr 12 - 1;
+                  ySrc := 12
+                end;
+              tiFort:
+                begin
+                  xSrc := 3;
+                  ySrc := 12;
+                  xSrcBase := 7;
+                  ySrcBase := 12
+                end;
+              fPrefStartPos:
+                begin
+                  xSrc := 0;
+                  ySrc := 1
+                end;
+              fStartPos:
+                begin
+                  xSrc := 0;
+                  ySrc := 2
+                end;
+            end;
+            if xSrcBase >= 0 then
+              Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt,
+                xxt * 2, yyt * 3, 1 + xSrcBase * (xxt * 2 + 1),
+                1 + ySrcBase * (yyt * 3 + 1));
+            Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
+              yyt * 3, 1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
+            if BrushTypes[i] = BrushType then
+            begin
+              Frame(Panel.Canvas, xTroop + 2 + x, yTroop + 7 - yyt div 2,
+                xTroop + 2 * xxt + x, yTroop + 2 * yyt + 11, $000000, $000000);
+              Frame(Panel.Canvas, xTroop + 1 + x, yTroop + 6 - yyt div 2,
+                xTroop + 2 * xxt - 1 + x, yTroop + 2 * yyt + 10,
+                MainTexture.clMark, MainTexture.clMark);
+            end
+          end;
+          inc(Count)
+        end;
+        case BrushType of
+          fDesert, fPrairie, fTundra, fArctic, fSwamp, fHills, fMountains:
+            s := Phrases.Lookup('TERRAIN', BrushType);
+          fShore:
+            s := Format(Phrases.Lookup('TWOTERRAINS'),
+              [Phrases.Lookup('TERRAIN', fOcean), Phrases.Lookup('TERRAIN',
+              fShore)]);
+          fGrass:
+            s := Format(Phrases.Lookup('TWOTERRAINS'),
+              [Phrases.Lookup('TERRAIN', fGrass), Phrases.Lookup('TERRAIN',
+              fGrass + 12)]);
+          fForest:
+            s := Format(Phrases.Lookup('TWOTERRAINS'),
+              [Phrases.Lookup('TERRAIN', fForest), Phrases.Lookup('TERRAIN',
+              fJungle)]);
+          fRiver:
+            s := Phrases.Lookup('RIVER');
+          fDeadLands, fDeadLands or fCobalt, fDeadLands or fUranium,
+            fDeadLands or fMercury:
+            s := Phrases.Lookup('TERRAIN', 3 * 12 + BrushType shr 25);
+          fPrefStartPos:
+            s := Phrases.Lookup('MAP_PREFSTART');
+          fStartPos:
+            s := Phrases.Lookup('MAP_START');
+          fPoll:
+            s := Phrases.Lookup('POLL');
+        else // terrain improvements
+          begin
+            case BrushType of
+              fRoad:
+                i := 1;
+              fRR:
+                i := 2;
+              tiIrrigation:
+                i := 4;
+              tiFarm:
+                i := 5;
+              tiMine:
+                i := 7;
+              fCanal:
+                i := 8;
+              tiFort:
+                i := 10;
+              tiBase:
+                i := 12;
+            end;
+            s := Phrases.Lookup('JOBRESULT', i);
+          end
+        end;
+        LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 1,
+          PanelHeight - 19, s);
+      end
+      else if TroopLoc >= 0 then
+      begin
+        Brush.Style := bsClear;
+        if UnFocus >= 0 then
+          with MyUn[UnFocus], MyModel[mix] do
+          begin { display info about selected unit }
+            if Job = jCity then
+              mixShow := -1 // building site
+            else
+              mixShow := mix;
+            with Tribe[me].ModelPicture[mixShow] do
+            begin
+              Sprite(Panel, HGr, xMidPanel + 7 + 12, yTroop + 1, 64, 48,
+                pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
+              if MyUn[UnFocus].Flags and unFortified <> 0 then
+                Sprite(Panel, HGrStdUnits, xMidPanel + 7 + 12, yTroop + 1,
+                  xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);
+            end;
+
+            MakeBlue(Panel, xMidPanel + 7 + 12 + 10, yTroop - 13, 44, 12);
+            s := MovementToString(MyUn[UnFocus]);
+            RisedTextOut(Panel.Canvas, xMidPanel + 7 + 12 + 32 -
+              BiColorTextWidth(Panel.Canvas, s) div 2, yTroop - 16, s);
+
+            s := IntToStr(Health) + '%';
+            LightGradient(Panel.Canvas, xMidPanel + 7 + 12 + 7,
+              PanelHeight - 22, (Health + 1) div 2,
+              (ColorOfHealth(Health) and $FEFEFE shr 2) * 3);
+            if Health < 100 then
+              LightGradient(Panel.Canvas, xMidPanel + 7 + 12 + 7 + (Health + 1)
+                div 2, PanelHeight - 22, 50 - (Health + 1) div 2, $000000);
+            RisedTextOut(Panel.Canvas, xMidPanel + 7 + 12 + 32 -
+              BiColorTextWidth(Panel.Canvas, s) div 2, PanelHeight - 23, s);
+
+            FrameImage(Panel.Canvas, GrExt[HGrSystem].Data,
+              xMidPanel + 7 + xUnitText, yTroop + 15, 12, 14,
+              121 + Exp div ExpCost * 13, 28);
+            if Job = jCity then
+              s := Tribe[me].ModelName[-1]
+            else
+              s := Tribe[me].ModelName[mix];
+            if Home >= 0 then
+            begin
+              LoweredTextOut(Panel.Canvas, -1, MainTexture,
+                xMidPanel + 7 + xUnitText + 18, yTroop + 5, s);
+              LoweredTextOut(Panel.Canvas, -1, MainTexture,
+                xMidPanel + 7 + xUnitText + 18, yTroop + 21,
+                '(' + CityName(MyCity[Home].ID) + ')');
+            end
+            else
+              LoweredTextOut(Panel.Canvas, -1, MainTexture,
+                xMidPanel + 7 + xUnitText + 18, yTroop + 13, s);
+          end;
+
+        if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> TroopLoc) then
+        begin // divide panel
+          if SmallScreen and not supervising then
+            x := xTroop - 8
+          else
+            x := xTroop - 152;
+          Pen.Color := MainTexture.clBevelShade;
+          MoveTo(x - 1, PanelHeight - MidPanelHeight + 2);
+          LineTo(x - 1, PanelHeight);
+          Pen.Color := MainTexture.clBevelLight;
+          MoveTo(x, PanelHeight - MidPanelHeight + 2);
+          LineTo(x, PanelHeight);
+        end;
+
+        for i := 0 to 23 do
+          trix[i] := -1;
+        if MyMap[TroopLoc] and fUnit <> 0 then
+        begin
+          if MyMap[TroopLoc] and fOwned <> 0 then
+          begin
+            if (TrCnt > 1) or (UnFocus < 0) or (MyUn[UnFocus].Loc <> TroopLoc)
+            then
+            begin
+              LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 10,
+                PanelHeight - 24, Phrases.Lookup('PRESENT'));
+              Server(sGetDefender, me, TroopLoc, uixDefender);
+              Count := 0;
+              for Prio := true downto false do
+                for uix := 0 to MyRO.nUn - 1 do
+                  if (uix = uixDefender) = Prio then
+                  begin // display own units
+                    unx := MyUn[uix];
+                    if unx.Loc = TroopLoc then
+                    begin
+                      if (Count >= TrRow * sb.si.npos) and
+                        (Count < TrRow * (sb.si.npos + 1)) then
+                      begin
+                        trix[Count - TrRow * sb.si.npos] := uix;
+                        MakeUnitInfo(me, unx, UnitInfo);
+                        x := (Count - TrRow * sb.si.npos) * TrPitch;
+                        if uix = UnFocus then
+                        begin
+                          Frame(Panel.Canvas, xTroop + 4 + x, yTroop + 3,
+                            xTroop + 64 + x, yTroop + 47, $000000, $000000);
+                          Frame(Panel.Canvas, xTroop + 3 + x, yTroop + 2,
+                            xTroop + 63 + x, yTroop + 46, MainTexture.clMark,
+                            MainTexture.clMark);
+                        end
+                        else if (unx.Master >= 0) and (unx.Master = UnFocus)
+                        then
+                        begin
+                          CFrame(Panel.Canvas, xTroop + 4 + x, yTroop + 3,
+                            xTroop + 64 + x, yTroop + 47, 8, $000000);
+                          CFrame(Panel.Canvas, xTroop + 3 + x, yTroop + 2,
+                            xTroop + 63 + x, yTroop + 46, 8,
+                            MainTexture.clMark);
+                        end;
+                        NoMap.SetOutput(Panel);
+                        NoMap.PaintUnit(xTroop + 2 + x, yTroop + 1, UnitInfo,
+                          unx.Status);
+                        if (ClientMode < scContact) and
+                          ((unx.Job > jNone) or
+                          (unx.Status and (usStay or usRecover or usGoto) <> 0))
+                        then
+                          Sprite(Panel, HGrSystem, xTroop + 2 + 60 - 20 + x,
+                            yTroop + 35, 20, 20, 81, 25);
+
+                        if not supervising then
+                        begin
+                          MakeBlue(Panel, xTroop + 2 + 10 + x,
+                            yTroop - 13, 44, 12);
+                          s := MovementToString(unx);
+                          RisedTextOut(Panel.Canvas,
+                            xTroop + x + 34 - BiColorTextWidth(Panel.Canvas, s)
+                            div 2, yTroop - 16, s);
+                        end
+                      end;
+                      inc(Count)
+                    end;
+                  end; // for uix:=0 to MyRO.nUn-1
+              assert(Count = TrCnt);
+            end
+          end
+          else
+          begin
+            LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 8,
+              PanelHeight - 24, Phrases.Lookup('PRESENT'));
+            Server(sGetUnits, me, TroopLoc, Count);
+            for i := 0 to Count - 1 do
+              if (i >= TrRow * sb.si.npos) and (i < TrRow * (sb.si.npos + 1))
+              then
+              begin // display enemy units
+                trix[i - TrRow * sb.si.npos] := i;
+                x := (i - TrRow * sb.si.npos) * TrPitch;
+                NoMap.SetOutput(Panel);
+                NoMap.PaintUnit(xTroop + 2 + x, yTroop + 1,
+                  MyRO.EnemyUn[MyRO.nEnemyUn + i], 0);
+              end;
+          end;
+        end;
+        if not SmallScreen or supervising then
+        begin // show terrain and improvements
+          PaintZoomedTile(Panel, xTerrain - xxt * 2, 110 - yyt * 3, TroopLoc);
+          if (UnFocus >= 0) and (MyUn[UnFocus].Job <> jNone) then
+          begin
+            JobFocus := MyUn[UnFocus].Job;
+            Server(sGetJobProgress, me, MyUn[UnFocus].Loc, JobProgressData);
+            MakeBlue(Panel, xTerrain - 72, 148 - 17, 144, 31);
+            PaintRelativeProgressBar(Panel.Canvas, 3, xTerrain - 68, 148 + 3,
+              63, JobProgressData[JobFocus].Done,
+              JobProgressData[JobFocus].NextTurnPlus,
+              JobProgressData[JobFocus].Required, true, MainTexture);
+            s := Format('%s/%s',
+              [ScreenTools.MovementToString(JobProgressData[JobFocus].Done),
+              ScreenTools.MovementToString(JobProgressData[JobFocus]
+              .Required)]);
+            RisedTextOut(Panel.Canvas, xTerrain + 6, 148 - 3, s);
+            Tile := MyMap[MyUn[UnFocus].Loc];
+            if (JobFocus = jRoad) and (Tile and fRiver <> 0) then
+              JobFocus := nJob + 0
+            else if (JobFocus = jRR) and (Tile and fRiver <> 0) then
+              JobFocus := nJob + 1
+            else if JobFocus = jClear then
+            begin
+              if Tile and fTerrain = fForest then
+                JobFocus := nJob + 2
+              else if Tile and fTerrain = fDesert then
+                JobFocus := nJob + 3
+              else
+                JobFocus := nJob + 4
+            end;
+            s := Phrases.Lookup('JOBRESULT', JobFocus);
+            RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas,
+              s) div 2, 148 - 19, s);
+          end;
+          if MyMap[TroopLoc] and (fTerrain or fSpecial) = fGrass or fSpecial1
+          then
+            s := Phrases.Lookup('TERRAIN', fGrass + 12)
+          else if MyMap[TroopLoc] and fDeadLands <> 0 then
+            s := Phrases.Lookup('TERRAIN', 3 * 12)
+          else if (MyMap[TroopLoc] and fTerrain = fForest) and
+            IsJungle(TroopLoc div G.lx) then
+            s := Phrases.Lookup('TERRAIN', fJungle)
+          else
+            s := Phrases.Lookup('TERRAIN', MyMap[TroopLoc] and fTerrain);
+          RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas,
+            s) div 2, 99, s);
+        end;
+
+        if TerrainBtn.Visible then
+          with TerrainBtn do
+            RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
+              (PanelHeight - 1), Left + width, Top + height - self.ClientHeight
+              + PanelHeight, MainTexture.clBevelShade, MainTexture.clBevelLight)
+      end { if TroopLoc>=0 }
+    end;
+
+    for i := 0 to ControlCount - 1 do
+      if Controls[i] is TButtonB then
+        with TButtonB(Controls[i]) do
+        begin
+          if Visible then
+          begin
+            Dump(Panel, HGrSystem, Left, Top - self.ClientHeight + PanelHeight,
+              25, 25, 169, 243);
+            Sprite(Panel, HGrSystem, Left, Top - self.ClientHeight +
+              PanelHeight, 25, 25, 1 + 26 * ButtonIndex, 337);
+            RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
+              (PanelHeight - 1), Left + width, Top + height - self.ClientHeight
+              + PanelHeight, MainTexture.clBevelShade,
+              MainTexture.clBevelLight);
+          end;
+        end;
+
+    if ClientMode <> cEditMap then
+    begin
+      for i := 0 to ControlCount - 1 do
+        if Controls[i] is TButtonC then
+          with TButtonC(Controls[i]) do
+          begin
+            Dump(Panel, HGrSystem, Left, Top - self.ClientHeight + PanelHeight,
+              12, 12, 169, 178 + 13 * ButtonIndex);
+            RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
+              (PanelHeight - 1), Left + width, Top + height - self.ClientHeight
+              + PanelHeight, MainTexture.clBevelShade,
+              MainTexture.clBevelLight);
+          end
+    end;
+    EOT.SetBack(Panel.Canvas, EOT.Left, EOT.Top - (ClientHeight - PanelHeight));
+    SmartRectInvalidate(0, ClientHeight - PanelHeight, ClientWidth,
+      ClientHeight);
+
+    // topbar
+    xTreasurySection := ClientWidth div 2 - 172;
+    xResearchSection := ClientWidth div 2;
+    // ClientWidth div 2+68 = maximum to right
+    FillLarge(TopBar.Canvas, 0, 0, ClientWidth, TopBarHeight - 3,
+      ClientWidth div 2);
+    with TopBar.Canvas do
+    begin
+      Pen.Color := $000000;
+      MoveTo(0, TopBarHeight - 1);
+      LineTo(ClientWidth, TopBarHeight - 1);
+      Pen.Color := MainTexture.clBevelShade;
+      MoveTo(0, TopBarHeight - 2);
+      LineTo(ClientWidth, TopBarHeight - 2);
+      MoveTo(0, TopBarHeight - 3);
+      LineTo(ClientWidth, TopBarHeight - 3);
+      Pen.Color := MainTexture.clBevelLight;
+      Frame(TopBar.Canvas, 40, -1, xTreasurySection - 1, TopBarHeight - 7,
+        MainTexture.clBevelShade, MainTexture.clBevelLight);
+      Frame(TopBar.Canvas, xResearchSection + 332, -1, ClientWidth,
+        TopBarHeight - 7, MainTexture.clBevelShade, MainTexture.clBevelLight);
+    end;
+    if GameMode <> cMovie then
+      ImageOp_BCC(TopBar, Templates, 2, 1, 145, 38, 36, 36, $BFBF20, $4040DF);
+    if MyRO.nCity > 0 then
+    begin
+      TrueMoney := MyRO.Money;
+      TrueResearch := MyRO.Research;
+      if supervising then
+      begin // normalize values from after-turn state
+        dec(TrueMoney, TaxSum);
+        if TrueMoney < 0 then
+          TrueMoney := 0; // shouldn't happen
+        dec(TrueResearch, ScienceSum);
+        if TrueResearch < 0 then
+          TrueResearch := 0; // shouldn't happen
+      end;
+
+      // treasury section
+      ImageOp_BCC(TopBar, Templates, xTreasurySection + 8, 1, 145, 1, 36, 36,
+        $40A040, $4030C0);
+      s := IntToStr(TrueMoney);
+      LoweredTextOut(TopBar.Canvas, -1, MainTexture, xTreasurySection + 48, 0,
+        s + '%c');
+      if MyRO.Government <> gAnarchy then
+      begin
+        ImageOp_BCC(TopBar, Templates, xTreasurySection + 48, 22, 124, 1, 14,
+          14, $0000C0, $0080C0);
+        if TaxSum >= 0 then
+          s := Format(Phrases.Lookup('MONEYGAINPOS'), [TaxSum])
+        else
+          s := Format(Phrases.Lookup('MONEYGAINNEG'), [TaxSum]);
+        LoweredTextOut(TopBar.Canvas, -1, MainTexture,
+          xTreasurySection + 48 + 15, 18, s);
+      end;
+
+      // research section
+      ImageOp_BCC(TopBar, Templates, xResearchSection + 8, 1, 145, 75, 36, 36,
+        $FF0000, $00FFE0);
+      if MyData.FarTech <> adNexus then
+      begin
+        if MyRO.ResearchTech < 0 then
+          CostFactor := 2
+        else if (MyRO.ResearchTech = adMilitary) or
+          (MyRO.Tech[MyRO.ResearchTech] = tsSeen) then
+          CostFactor := 1
+        else if MyRO.ResearchTech in FutureTech then
+          if MyRO.Government = gFuture then
+            CostFactor := 4
+          else
+            CostFactor := 8
+        else
+          CostFactor := 2;
+        Server(sGetTechCost, me, 0, i);
+        CostFactor := CostFactor * 22; // length of progress bar
+        PaintRelativeProgressBar(TopBar.Canvas, 2, xResearchSection + 48 + 1,
+          26, CostFactor, TrueResearch, ScienceSum, i, true, MainTexture);
+
+        if MyRO.ResearchTech < 0 then
+          s := Phrases.Lookup('SCIENCE')
+        else if MyRO.ResearchTech = adMilitary then
+          s := Phrases.Lookup('INITUNIT')
+        else
+        begin
+          s := Phrases.Lookup('ADVANCES', MyRO.ResearchTech);
+          if MyRO.ResearchTech in FutureTech then
+            if MyRO.Tech[MyRO.ResearchTech] >= 1 then
+              s := s + ' ' + IntToStr(MyRO.Tech[MyRO.ResearchTech] + 1)
+            else
+              s := s + ' 1';
+        end;
+        if ScienceSum > 0 then
+        begin
+          { j:=(i-MyRO.Research-1) div ScienceSum +1;
+            if j<1 then j:=1;
+            if j>1 then
+            s:=Format(Phrases.Lookup('TECHWAIT'),[s,j]); }
+          LoweredTextOut(TopBar.Canvas, -1, MainTexture,
+            xResearchSection + 48, 0, s);
+        end
+        else
+          LoweredTextOut(TopBar.Canvas, -1, MainTexture,
+            xResearchSection + 48, 0, s);
+      end
+      else
+        CostFactor := 0;
+      if (MyData.FarTech <> adNexus) and (ScienceSum > 0) then
+      begin
+        ImageOp_BCC(TopBar, Templates, xResearchSection + 48 + CostFactor + 11,
+          22, 124, 1, 14, 14, $0000C0, $0080C0);
+        s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);
+        LoweredTextOut(TopBar.Canvas, -1, MainTexture, xResearchSection + 48 +
+          CostFactor + 26, 18, s);
+      end
+    end;
+    if ClientMode <> cEditMap then
+    begin
+      TopBar.Canvas.Font.Assign(UniFont[ftCaption]);
+      s := TurnToString(MyRO.Turn);
+      RisedTextOut(TopBar.Canvas,
+        40 + (xTreasurySection - 40 - BiColorTextWidth(TopBar.Canvas, s))
+        div 2, 6, s);
+      TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
+    end;
+    RectInvalidate(0, 0, ClientWidth, TopBarHeight);
+  end; { PanelPaint }
+
+  procedure TMainScreen.FocusOnLoc(Loc: integer; Options: integer = 0);
+  var
+    dx: integer;
+    Outside, Changed: boolean;
+  begin
+    dx := G.lx + 1 - (xw - Loc + G.lx * 1024 + 1) mod G.lx;
+    Outside := (dx >= (MapWidth + 1) div (xxt * 2) - 2) or (ywmax > 0) and
+      ((yw > 0) and (Loc div G.lx <= yw + 1) or (yw < ywmax) and
+      (Loc div G.lx >= yw + (MapHeight - 1) div yyt - 2));
+    Changed := true;
+    if Outside then
+    begin
+      Centre(Loc);
+      PaintAllMaps
+    end
+    else if not MapValid then
+      PaintAllMaps
+    else
+      Changed := false;
+    if Options and flRepaintPanel <> 0 then
+      PanelPaint;
+    if Changed and (Options and flImmUpdate <> 0) then
+      Update;
+  end;
+
+  procedure TMainScreen.NextUnit(NearLoc: integer; AutoTurn: boolean);
+  var
+    Dist, TestDist: single;
+    i, uix, NewFocus: integer;
+    GotoOnly: boolean;
+  begin
+    if ClientMode >= scContact then
+      exit;
+    DestinationMarkON := false;
+    PaintDestination;
+    for GotoOnly := GoOnPhase downto false do
+    begin
+      NewFocus := -1;
+      for i := 1 to MyRO.nUn do
+      begin
+        uix := (UnFocus + i) mod MyRO.nUn;
+        if (MyUn[uix].Loc >= 0) and (MyUn[uix].Job = jNone) and
+          (MyUn[uix].Status and (usStay or usRecover or usWaiting) = usWaiting)
+          and (not GotoOnly or (MyUn[uix].Status and usGoto <> 0)) then
+          if NearLoc < 0 then
+          begin
+            NewFocus := uix;
+            Break
+          end
+          else
+          begin
+            TestDist := Distance(NearLoc, MyUn[uix].Loc);
+            if (NewFocus < 0) or (TestDist < Dist) then
+            begin
+              NewFocus := uix;
+              Dist := TestDist
+            end
+          end
+      end;
+      if GotoOnly then
+        if NewFocus < 0 then
+          GoOnPhase := false
+        else
+          Break;
+    end;
+    if NewFocus >= 0 then
+    begin
+      SetUnFocus(NewFocus);
+      SetTroopLoc(MyUn[NewFocus].Loc);
+      FocusOnLoc(TroopLoc, flRepaintPanel)
+    end
+    else if AutoTurn and not mWaitTurn.Checked then
+    begin
+      TurnComplete := true;
+      SetUnFocus(-1);
+      SetTroopLoc(-1);
+      PostMessage(Handle, WM_EOT, 0, 0)
+    end
+    else
+    begin
+      if { (UnFocus>=0) and } not TurnComplete and EOT.Visible then
+        Play('TURNEND');
+      TurnComplete := true;
+      SetUnFocus(-1);
+      SetTroopLoc(-1);
+      PanelPaint;
+    end;
+  end; { NextUnit }
+
+  procedure TMainScreen.Scroll(dx, dy: integer);
+  begin
+    xw := (xw + G.lx + dx) mod G.lx;
+    if ywmax > 0 then
+    begin
+      yw := yw + 2 * dy;
+      if yw < 0 then
+        yw := 0
+      else if yw > ywmax then
+        yw := ywmax;
+    end;
+    MainOffscreenPaint;
+    xwMini := xw;
+    ywMini := yw;
+    MiniPaint;
+    CopyMiniToPanel;
+    RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
+      xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini +
+      2 + G.ly);
+    Update;
+  end;
+
+  procedure TMainScreen.Timer1Timer(Sender: TObject);
+  var
+    dx, dy, speed: integer;
+  begin
+    if idle and (me >= 0) and (GameMode <> cMovie) then
+      if (fsModal in Screen.ActiveForm.FormState) or
+        (Screen.ActiveForm is TBufferedDrawDlg) and
+        (TBufferedDrawDlg(Screen.ActiveForm).WindowMode <> wmPersistent) then
+      begin
+        BlinkTime := BlinkOnTime + BlinkOffTime - 1;
+        if not BlinkON then
+        begin
+          BlinkON := true;
+          if UnFocus >= 0 then
+            PaintLocTemp(MyUn[UnFocus].Loc)
+          else if TurnComplete and not supervising then
+            EOT.SetButtonIndexFast(eotBlinkOn)
+        end
+      end
+      else
+      begin
+        if Application.Active and not mScrollOff.Checked then
+        begin
+          if mScrollFast.Checked then
+            speed := 2
+          else
+            speed := 1;
+          dx := 0;
+          dy := 0;
+          if Mouse.CursorPos.y < Screen.height - PanelHeight then
+            if Mouse.CursorPos.x = 0 then
+              dx := -speed // scroll left
+            else if Mouse.CursorPos.x = Screen.width - 1 then
+              dx := speed; // scroll right
+          if Mouse.CursorPos.y = 0 then
+            dy := -speed // scroll up
+          else if (Mouse.CursorPos.y = Screen.height - 1) and
+            (Mouse.CursorPos.x >= TerrainBtn.Left + TerrainBtn.width) and
+            (Mouse.CursorPos.x < xRightPanel + 10 - 8) then
+            dy := speed; // scroll down
+          if (dx <> 0) or (dy <> 0) then
+          begin
+            if (Screen.ActiveForm <> MainScreen) and
+              (@Screen.ActiveForm.OnDeactivate <> nil) then
+              Screen.ActiveForm.OnDeactivate(nil);
+            Scroll(dx, dy);
+          end
+        end;
+
+        BlinkTime := (BlinkTime + 1) mod (BlinkOnTime + BlinkOffTime);
+        BlinkON := BlinkTime >= BlinkOffTime;
+        DestinationMarkON := true;
+        if UnFocus >= 0 then
+        begin
+          if (BlinkTime = 0) or (BlinkTime = BlinkOffTime) then
+          begin
+            PaintLocTemp(MyUn[UnFocus].Loc, pltsBlink);
+            PaintDestination;
+            // if MoveHintToLoc>=0 then
+            // ShowMoveHint(MoveHintToLoc, true);
           end
         end
-      else
-        begin
-        s:=Tribe[me].TPhrase('AGE'+char(48+Age));
-        MessgText:=Format(s,[TurnToString(MyRO.Turn)]);
-        end;
-      IconKind:=mikAge;
-      IconIndex:=Age;
-      {if age=0 then} Kind:=mkOK
-      {else begin Kind:=mkOkHelp; HelpKind:=hkAdv; HelpNo:=AgePreq[age]; end};
-      CenterTo:=NewAgeCenterTo;
-      OpenSound:='AGE_'+char(48+Age);
-      ShowModal;
-      MyData.ToldAge:=Age;
-      if Age>0 then
-        MyData.ToldTech[AgePreq[Age]]:=MyRO.Tech[AgePreq[Age]];
-      end;
-
-    if MyData.ToldAlive<>MyRO.Alive then
-      begin
-      for p1:=0 to nPl-1 do
-        if (MyData.ToldAlive-MyRO.Alive) and (1 shl p1)<>0 then
-          with MessgExDlg do
-            begin
-            OpenSound:='MSG_EXTINCT';
-            s:=Tribe[p1].TPhrase('EXTINCT');
-            MessgText:=Format(s,[TurnToString(MyRO.Turn)]);
-            if MyRO.Alive=1 shl me then
-              MessgText:=MessgText+Phrases.Lookup('EXTINCTALL');
-            Kind:=mkOK;
-            IconKind:=mikImp;
-            IconIndex:=21;
-            ShowModal;
+        else if TurnComplete and not supervising then
+        begin
+          if BlinkTime = 0 then
+            EOT.SetButtonIndexFast(eotBlinkOff)
+          else if BlinkTime = BlinkOffTime then
+            EOT.SetButtonIndexFast(eotBlinkOn)
+        end
+      end
+  end;
+
+  procedure TMainScreen.Centre(Loc: integer);
+  begin
+    if FastScrolling and MapValid then
+      Update;
+    // necessary because ScrollDC for form canvas is called after
+    xw := (Loc mod G.lx - (MapWidth - xxt * 2 * ((Loc div G.lx) and 1))
+      div (xxt * 4) + G.lx) mod G.lx;
+    if ywmax <= 0 then
+      yw := ywcenter
+    else
+    begin
+      yw := (Loc div G.lx - MapHeight div (yyt * 2) + 1) and not 1;
+      if yw < 0 then
+        yw := 0
+      else if yw > ywmax then
+        yw := ywmax;
+    end
+  end;
+
+  function TMainScreen.ZoomToCity(Loc: integer;
+    NextUnitOnClose: boolean = false; ShowEvent: integer = 0): boolean;
+  begin
+    result := MyMap[Loc] and (fOwned or fSpiedOut) <> 0;
+    if result then
+      with CityDlg do
+      begin
+        if ClientMode >= scContact then
+        begin
+          CloseAction := None;
+          RestoreUnFocus := -1;
+        end
+        else if NextUnitOnClose then
+        begin
+          CloseAction := StepFocus;
+          RestoreUnFocus := -1;
+        end
+        else if not Visible then
+        begin
+          CloseAction := RestoreFocus;
+          RestoreUnFocus := UnFocus;
+        end;
+        SetUnFocus(-1);
+        SetTroopLoc(Loc);
+        MarkCityLoc := Loc;
+        PanelPaint;
+        ShowNewContent(wmPersistent, Loc, ShowEvent);
+      end
+  end;
+
+  function TMainScreen.LocationOfScreenPixel(x, y: integer): integer;
+  var
+    qx, qy: integer;
+  begin
+    qx := (x * (yyt * 2) + y * (xxt * 2) + xxt * yyt * 2)
+      div (xxt * yyt * 4) - 1;
+    qy := (y * (xxt * 2) - x * (yyt * 2) - xxt * yyt * 2 + 4000 * xxt * yyt)
+      div (xxt * yyt * 4) - 999;
+    result := (xw + (qx - qy + 2048) div 2 - 1024 + G.lx) mod G.lx + G.lx *
+      (yw + qx + qy);
+  end;
+
+  procedure TMainScreen.MapBoxMouseDown(Sender: TObject; Button: TMouseButton;
+    Shift: TShiftState; x, y: integer);
+  var
+    i, uix, emix, p1, dx, dy, MouseLoc: integer;
+    EditTileData: TEditTileData;
+    m, m2: TMenuItem;
+    MoveAdviceData: TMoveAdviceData;
+    DoCenter: boolean;
+  begin
+    if GameMode = cMovie then
+      exit;
+
+    if CityDlg.Visible then
+      CityDlg.Close;
+    if UnitStatDlg.Visible then
+      UnitStatDlg.Close;
+    MouseLoc := LocationOfScreenPixel(x, y);
+    if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then
+      exit;
+    if (Button = mbLeft) and not(ssShift in Shift) then
+    begin
+      DoCenter := true;
+      if ClientMode = cEditMap then
+      begin
+        DoCenter := false;
+        EditTileData.Loc := MouseLoc;
+        if ssCtrl in Shift then // toggle special resource
+          case MyMap[MouseLoc] and fTerrain of
+            fOcean:
+              EditTileData.NewTile := MyMap[MouseLoc];
+            fGrass, fArctic:
+              EditTileData.NewTile := MyMap[MouseLoc] and not fSpecial or
+                ((MyMap[MouseLoc] shr 5 and 3 + 1) mod 2 shl 5);
+          else
+            EditTileData.NewTile := MyMap[MouseLoc] and not fSpecial or
+              ((MyMap[MouseLoc] shr 5 and 3 + 1) mod 3 shl 5)
+          end
+        else if BrushType <= fTerrain then
+          EditTileData.NewTile := MyMap[MouseLoc] and not fTerrain or
+            fSpecial or BrushType
+        else if BrushType and fDeadLands <> 0 then
+          if MyMap[MouseLoc] and (fDeadLands or fModern) = BrushType and
+            (fDeadLands or fModern) then
+            EditTileData.NewTile := MyMap[MouseLoc] and
+              not(fDeadLands or fModern)
+          else
+            EditTileData.NewTile := MyMap[MouseLoc] and
+              not(fDeadLands or fModern) or BrushType
+        else if BrushType and fTerImp <> 0 then
+          if MyMap[MouseLoc] and fTerImp = BrushType then
+            EditTileData.NewTile := MyMap[MouseLoc] and not fTerImp
+          else
+            EditTileData.NewTile := MyMap[MouseLoc] and not fTerImp or BrushType
+        else if BrushType and (fPrefStartPos or fStartPos) <> 0 then
+          if MyMap[MouseLoc] and (fPrefStartPos or fStartPos) = BrushType and
+            (fPrefStartPos or fStartPos) then
+            EditTileData.NewTile := MyMap[MouseLoc] and
+              not(fPrefStartPos or fStartPos)
+          else
+            EditTileData.NewTile := MyMap[MouseLoc] and
+              not(fPrefStartPos or fStartPos) or BrushType
+        else
+          EditTileData.NewTile := MyMap[MouseLoc] xor BrushType;
+        Server(sEditTile, me, 0, EditTileData);
+        Edited := true;
+        BrushLoc := MouseLoc;
+        PaintLoc(MouseLoc, 2);
+        MiniPaint;
+        BitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+          Mini.Canvas.Handle, 0, 0, SRCCOPY);
+        if ywmax <= 0 then
+          Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
+            yMini + 2, xMini + 1 + G.lx + MapWidth div (2 * xxt),
+            yMini + 2 + G.ly - 1, MainTexture.clMark, MainTexture.clMark)
+        else
+          Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
+            yMini + 2 + yw, xMini + 2 + G.lx + MapWidth div (2 * xxt) - 1,
+            yMini + 2 + yw + MapHeight div yyt - 2, MainTexture.clMark,
+            MainTexture.clMark);
+        RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini +
+          2, xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini
+          + 2 + G.ly)
+      end
+      else if MyMap[MouseLoc] and fCity <> 0 then { city clicked }
+      begin
+        if MyMap[MouseLoc] and (fOwned or fSpiedOut) <> 0 then
+        begin
+          ZoomToCity(MouseLoc);
+          DoCenter := false;
+        end
+        else
+        begin
+          UnitStatDlg.ShowNewContent_EnemyCity(wmPersistent, MouseLoc);
+          DoCenter := false;
+        end
+      end
+      else if MyMap[MouseLoc] and fUnit <> 0 then { unit clicked }
+        if MyMap[MouseLoc] and fOwned <> 0 then
+        begin
+          DoCenter := false;
+          if not supervising and (ClientMode < scContact) then
+          begin // not in negotiation mode
+            if (UnFocus >= 0) and (MyUn[UnFocus].Loc = MouseLoc) then
+            begin // rotate
+              uix := (UnFocus + 1) mod MyRO.nUn;
+              i := MyRO.nUn - 1;
+              while i > 0 do
+              begin
+                if (MyUn[uix].Loc = MouseLoc) and (MyUn[uix].Job = jNone) and
+                  (MyUn[uix].Status and (usStay or usRecover or usEnhance or
+                  usWaiting) = usWaiting) then
+                  Break;
+                dec(i);
+                uix := (uix + 1) mod MyRO.nUn;
+              end;
+              if i = 0 then
+                uix := UnFocus
+            end
+            else
+              Server(sGetDefender, me, MouseLoc, uix);
+            if uix <> UnFocus then
+              SetUnFocus(uix);
+            TurnComplete := false;
+            EOT.ButtonIndex := eotGray;
+          end;
+          SetTroopLoc(MouseLoc);
+          PanelPaint;
+        end // own unit
+        else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not(ssCtrl in Shift)
+        then
+        begin
+          DoCenter := false;
+          SetTroopLoc(MouseLoc);
+          PanelPaint;
+        end
+        else
+        begin
+          DoCenter := false;
+          UnitStatDlg.ShowNewContent_EnemyLoc(wmPersistent, MouseLoc);
+        end;
+      if DoCenter then
+      begin
+        Centre(MouseLoc);
+        PaintAllMaps
+      end
+    end
+    else if (ClientMode <> cEditMap) and (Button = mbRight) and
+      not(ssShift in Shift) then
+    begin
+      if supervising then
+      begin
+        EditLoc := MouseLoc;
+        Server(sGetModels, me, 0, nil^);
+        EmptyMenu(mCreateUnit);
+        for p1 := 0 to nPl - 1 do
+          if 1 shl p1 and MyRO.Alive <> 0 then
+          begin
+            m := TMenuItem.Create(mCreateUnit);
+            m.Caption := Tribe[p1].TPhrase('SHORTNAME');
+            for emix := MyRO.nEnemyModel - 1 downto 0 do
+              if (MyRO.EnemyModel[emix].Owner = p1) and
+                (Server(sCreateUnit - sExecute + p1 shl 4, me,
+                MyRO.EnemyModel[emix].mix, MouseLoc) >= rExecuted) then
+              begin
+                if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr = 0
+                then
+                  InitEnemyModel(emix);
+                m2 := TMenuItem.Create(m);
+                m2.Caption := Tribe[p1].ModelName[MyRO.EnemyModel[emix].mix];
+                m2.Tag := p1 shl 16 + MyRO.EnemyModel[emix].mix;
+                m2.OnClick := CreateUnitClick;
+                m.Add(m2);
+              end;
+            m.Visible := m.Count > 0;
+            mCreateUnit.Add(m);
+          end;
+        if FullScreen then
+          EditPopup.Popup(Left + x, Top + y)
+        else
+          EditPopup.Popup(Left + x + 4,
+            Top + y + GetSystemMetrics(SM_CYCAPTION) + 4);
+      end
+      else if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> MouseLoc) then
+        with MyUn[UnFocus] do
+        begin
+          dx := ((MouseLoc mod G.lx * 2 + MouseLoc div G.lx and 1) -
+            (Loc mod G.lx * 2 + Loc div G.lx and 1) + 3 * G.lx)
+            mod (2 * G.lx) - G.lx;
+          dy := MouseLoc div G.lx - Loc div G.lx;
+          if abs(dx) + abs(dy) < 3 then
+          begin
+            DestinationMarkON := false;
+            PaintDestination;
+            Status := Status and
+              ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
+            MoveUnit(dx, dy, muAutoNext) { simple move }
+          end
+          else if GetMoveAdvice(UnFocus, MouseLoc, MoveAdviceData) >= rExecuted
+          then
+          begin
+            if MyMap[MouseLoc] and (fUnit or fOwned) = fUnit then
+            begin // check for suicide mission before movement
+              with MyUn[UnFocus], BattleDlg.Forecast do
+              begin
+                pAtt := me;
+                mixAtt := mix;
+                HealthAtt := Health;
+                ExpAtt := Exp;
+                FlagsAtt := Flags;
+              end;
+              BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
+              if (Server(sGetBattleForecastEx, me, MouseLoc, BattleDlg.Forecast)
+                >= rExecuted) and (BattleDlg.Forecast.EndHealthAtt <= 0) then
+              begin
+                BattleDlg.uix := UnFocus;
+                BattleDlg.ToLoc := MouseLoc;
+                BattleDlg.IsSuicideQuery := true;
+                BattleDlg.ShowModal;
+                if BattleDlg.ModalResult <> mrOK then
+                  exit;
+              end
             end;
-      if (ClientMode<>cMovieTurn) and not supervising then
-        DiaDlg.ShowNewContent_Charts(wmModal);
-      end;
-
-    // tell changes of own credibility
-    if not supervising then
-      begin
-      if RoughCredibility(MyRO.Credibility)
-        <>RoughCredibility(MyData.ToldOwnCredibility) then
-        begin
-        if RoughCredibility(MyRO.Credibility)
-          >RoughCredibility(MyData.ToldOwnCredibility) then
-          s:=Phrases.Lookup('CREDUP')
-        else s:=Phrases.Lookup('CREDDOWN');
-        TribeMessage(me, Format(s,[Phrases.Lookup('CREDIBILITY',
-          RoughCredibility(MyRO.Credibility))]), '');
-        end;
-      MyData.ToldOwnCredibility:=MyRO.Credibility;
-      end;
-
-    for i:=0 to 27 do
-      begin
-      OwnWonder:=false;
-      for cix:=0 to MyRO.nCity-1 do
-        if (MyCity[cix].Loc>=0) and (MyCity[cix].ID=MyRO.Wonder[i].CityID) then
-          OwnWonder:=true;
-      if MyRO.Wonder[i].CityID<>MyData.ToldWonders[i].CityID then
-        begin
-        if MyRO.Wonder[i].CityID=-2 then with MessgExDlg do
-          begin {tell about destroyed wonders}
-          OpenSound:='WONDER_DESTROYED';
-          MessgText:=Format(Phrases.Lookup('WONDERDEST'),
-            [Phrases.Lookup('IMPROVEMENTS',i)]);
-          Kind:=mkOkHelp;
-          HelpKind:=hkImp;
-          HelpNo:=i;
-          IconKind:=mikImp;
-          IconIndex:=i;
-          ShowModal;
-          end
-        else
-          begin
-          if i=woManhattan then
-            if MyRO.Wonder[i].EffectiveOwner>me then
-              MyData.ColdWarStart:=MyRO.Turn-1
-            else MyData.ColdWarStart:=MyRO.Turn;
-          if not OwnWonder then with MessgExDlg do
-            begin {tell about newly built wonders}
-            if i=woManhattan then
-              begin
-              OpenSound:='MSG_COLDWAR';
-              s:=Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR')
-              end
-            else if MyRO.Wonder[i].EffectiveOwner>=0 then
-              begin
-              OpenSound:='WONDER_BUILT';
-              s:=Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('WONDERBUILT')
-              end
-            else
-              begin
-              OpenSound:='MSG_DEFAULT';
-              s:=Phrases.Lookup('WONDERBUILTEXP'); // already expired when built
-              end;
-            MessgText:=Format(s, [Phrases.Lookup('IMPROVEMENTS',i),
-              CityName(MyRO.Wonder[i].CityID)]);
-            Kind:=mkOkHelp;
-            HelpKind:=hkImp;
-            HelpNo:=i;
-            IconKind:=mikImp;
-            IconIndex:=i;
-            ShowModal;
-            end
+            DestinationMarkON := false;
+            PaintDestination;
+            Status := Status and not(usStay or usRecover or usEnhance) or
+              usWaiting;
+            MoveToLoc(MouseLoc, false); { goto }
           end
         end
-      else if (MyRO.Wonder[i].EffectiveOwner<>MyData.ToldWonders[i].EffectiveOwner)
-        and (MyRO.Wonder[i].CityID>-2) then
-        if MyRO.Wonder[i].EffectiveOwner<0 then
+    end
+    else if (Button = mbMiddle) and (UnFocus >= 0) and
+      (MyModel[MyUn[UnFocus].mix].Kind in [mkSettler, mkSlaves]) then
+    begin
+      DestinationMarkON := false;
+      PaintDestination;
+      MyUn[UnFocus].Status := MyUn[UnFocus].Status and
+        ($FFFF - usStay - usRecover - usGoto) or usEnhance;
+      uix := UnFocus;
+      if MouseLoc <> MyUn[uix].Loc then
+        MoveToLoc(MouseLoc, true); { goto }
+      if (UnFocus = uix) and (MyUn[uix].Loc = MouseLoc) then
+        MenuClick(mEnhance)
+    end
+    else if (Button = mbLeft) and (ssShift in Shift) and
+      (MyMap[MouseLoc] and fTerrain <> fUNKNOWN) then
+      HelpOnTerrain(MouseLoc, wmPersistent)
+    else if (ClientMode <= cContinue) and (Button = mbRight) and
+      (ssShift in Shift) and (UnFocus >= 0) and
+      (MyMap[MouseLoc] and (fUnit or fOwned) = fUnit) then
+    begin // battle forecast
+      with MyUn[UnFocus], BattleDlg.Forecast do
+      begin
+        pAtt := me;
+        mixAtt := mix;
+        HealthAtt := Health;
+        ExpAtt := Exp;
+        FlagsAtt := Flags;
+      end;
+      BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
+      if Server(sGetBattleForecastEx, me, MouseLoc, BattleDlg.Forecast) >= rExecuted
+      then
+      begin
+        BattleDlg.uix := UnFocus;
+        BattleDlg.ToLoc := MouseLoc;
+        BattleDlg.Left := x - BattleDlg.width div 2;
+        if BattleDlg.Left < 0 then
+          BattleDlg.Left := 0
+        else if BattleDlg.Left + BattleDlg.width > Screen.width then
+          BattleDlg.Left := Screen.width - BattleDlg.width;
+        BattleDlg.Top := y - BattleDlg.height div 2;
+        if BattleDlg.Top < 0 then
+          BattleDlg.Top := 0
+        else if BattleDlg.Top + BattleDlg.height > Screen.height then
+          BattleDlg.Top := Screen.height - BattleDlg.height;
+        BattleDlg.IsSuicideQuery := false;
+        BattleDlg.Show;
+      end
+    end
+  end;
+
+  function TMainScreen.MoveUnit(dx, dy: integer; Options: integer): integer;
+  // move focused unit to adjacent tile
+  var
+    i, cix, uix, euix, FromLoc, ToLoc, DirCode, UnFocus0, Defender, Mission, p1,
+      NewTiles, cixChanged: integer;
+    OldToTile: Cardinal;
+    CityCaptured, IsAttack, OldUnrest, NewUnrest, NeedEcoUpdate,
+      NeedRepaintPanel, ToTransport, ToShip: boolean;
+    PlaneReturnData: TPlaneReturnData;
+    QueryItem: string;
+  begin
+    result := eInvalid;
+    UnFocus0 := UnFocus;
+    FromLoc := MyUn[UnFocus].Loc;
+    ToLoc := dLoc(FromLoc, dx, dy);
+    if (ToLoc < 0) or (ToLoc >= G.lx * G.ly) then
+    begin
+      result := eInvalid;
+      exit;
+    end;
+    if MyMap[ToLoc] and fStealthUnit <> 0 then
+    begin
+      SoundMessage(Phrases.Lookup('ATTACKSTEALTH'), '');
+      exit;
+    end;
+    if MyMap[ToLoc] and fHiddenUnit <> 0 then
+    begin
+      SoundMessage(Phrases.Lookup('ATTACKSUB'), '');
+      exit;
+    end;
+
+    if MyMap[ToLoc] and (fUnit or fOwned) = fUnit then
+    begin // attack -- search enemy unit
+      if (MyModel[MyUn[UnFocus].mix].Attack = 0) and
+        not((MyModel[MyUn[UnFocus].mix].Cap[mcBombs] > 0) and
+        (MyUn[UnFocus].Flags and unBombsLoaded <> 0)) then
+      begin
+        SoundMessage(Phrases.Lookup('NOATTACKER'), '');
+        exit;
+      end;
+      euix := MyRO.nEnemyUn - 1;
+      while (euix >= 0) and (MyRO.EnemyUn[euix].Loc <> ToLoc) do
+        dec(euix);
+    end;
+
+    DirCode := dx and 7 shl 4 + dy and 7 shl 7;
+    result := Server(sMoveUnit - sExecute + DirCode, me, UnFocus, nil^);
+    if (result < rExecuted) and (MyUn[UnFocus].Job > jNone) then
+      Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+    if (result < rExecuted) and (result <> eNoTime_Move) then
+    begin
+      case result of
+        eNoTime_Load:
+          if MyModel[MyUn[UnFocus].mix].Domain = dAir then
+            SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+          else
+            SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+              [MovementToString(MyModel[MyUn[UnFocus].mix].speed)]),
+              'NOMOVE_TIME');
+        eNoTime_Bombard:
+          SoundMessage(Phrases.Lookup('NOTIMEBOMBARD'), 'NOMOVE_TIME');
+        eNoTime_Expel:
+          SoundMessage(Phrases.Lookup('NOTIMEEXPEL'), 'NOMOVE_TIME');
+        eNoRoad:
+          SoundMessage(Phrases.Lookup('NOROAD'), 'NOMOVE_DEFAULT');
+        eNoNav:
+          SoundMessage(Phrases.Lookup('NONAV'), 'NOMOVE_DEFAULT');
+        eNoCapturer:
+          SoundMessage(Phrases.Lookup('NOCAPTURER'), 'NOMOVE_DEFAULT');
+        eNoBombarder:
+          SoundMessage(Phrases.Lookup('NOBOMBARDER'), 'NOMOVE_DEFAULT');
+        eZOC:
+          ContextMessage(Phrases.Lookup('ZOC'), 'NOMOVE_ZOC', hkText,
+            HelpDlg.TextIndex('MOVEMENT'));
+        eTreaty:
+          if MyMap[ToLoc] and (fUnit or fOwned) <> fUnit
+          then { no enemy unit -- move }
+            SoundMessage(Tribe[MyRO.Territory[ToLoc]].TPhrase('PEACE_NOMOVE'),
+              'NOMOVE_TREATY')
+          else
+            SoundMessage(Tribe[MyRO.EnemyUn[euix].Owner]
+              .TPhrase('PEACE_NOATTACK'), 'NOMOVE_TREATY');
+        eDomainMismatch:
           begin
-          if i<>woMir then with MessgExDlg do
-            begin {tell about expired wonders}
-            OpenSound:='WONDER_EXPIRED';
-            MessgText:=Format(Phrases.Lookup('WONDEREXP'),
-              [Phrases.Lookup('IMPROVEMENTS',i),
-              CityName(MyRO.Wonder[i].CityID)]);
-            Kind:=mkOkHelp;
-            HelpKind:=hkImp;
-            HelpNo:=i;
-            IconKind:=mikImp;
-            IconIndex:=i;
-            ShowModal;
+            if (MyModel[MyUn[UnFocus].mix].Domain < dSea) and
+              (MyMap[ToLoc] and (fUnit or fOwned) = fUnit or fOwned) then
+            begin // false load attempt
+              ToShip := false;
+              ToTransport := false;
+              for uix := 0 to MyRO.nUn - 1 do
+                if (MyUn[uix].Loc = ToLoc) and
+                  (MyModel[MyUn[uix].mix].Domain = dSea) then
+                begin
+                  ToShip := true;
+                  if MyModel[MyUn[uix].mix].Cap[mcSeaTrans] > 0 then
+                    ToTransport := true;
+                end;
+              if ToTransport then
+                SoundMessage(Phrases.Lookup('FULLTRANSPORT'), 'NOMOVE_DEFAULT')
+              else if ToShip then
+                SoundMessage(Phrases.Lookup('NOTRANSPORT'), 'NOMOVE_DEFAULT')
+              else
+                Play('NOMOVE_DOMAIN');
             end
+            else
+              Play('NOMOVE_DOMAIN');
           end
-        else if (MyData.ToldWonders[i].EffectiveOwner>=0) and not OwnWonder then
-          with MessgExDlg do
-            begin {tell about capture of wonders}
-            OpenSound:='WONDER_CAPTURED';
-            s:=Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('WONDERCAPT');
-            MessgText:=Format(s, [Phrases.Lookup('IMPROVEMENTS',i),
-              CityName(MyRO.Wonder[i].CityID)]);
-            Kind:=mkOkHelp;
-            HelpKind:=hkImp;
-            HelpNo:=i;
-            IconKind:=mikImp;
-            IconIndex:=i;
-            ShowModal;
+      else
+        Play('NOMOVE_DEFAULT');
+      end;
+      exit;
+    end;
+
+    if ((result = eWon) or (result = eLost) or (result = eBloody)) and
+      (MyUn[UnFocus].Movement < 100) and
+      (MyModel[MyUn[UnFocus].mix].Cap[mcWill] = 0) then
+    begin
+      if SimpleQuery(mkYesNo, Format(Phrases.Lookup('FASTATTACK'),
+        [MyUn[UnFocus].Movement]), 'NOMOVE_TIME') <> mrOK then
+      begin
+        result := eInvalid;
+        exit;
+      end;
+      Update; // remove message box from screen
+    end;
+
+    OldUnrest := false;
+    NewUnrest := false;
+    if (result >= rExecuted) and (result and rUnitRemoved = 0) and
+      (MyMap[ToLoc] and (fUnit or fOwned) <> fUnit) then
+    begin
+      OldUnrest := UnrestAtLoc(UnFocus, FromLoc);
+      NewUnrest := UnrestAtLoc(UnFocus, ToLoc);
+      if NewUnrest > OldUnrest then
+      begin
+        if MyRO.Government = gDemocracy then
+        begin
+          QueryItem := 'UNREST_NOTOWN';
+          p1 := me;
+        end
+        else
+        begin
+          QueryItem := 'UNREST_FOREIGN';
+          p1 := MyRO.Territory[ToLoc];
+        end;
+        with MessgExDlg do
+        begin
+          MessgText := Format(Tribe[p1].TPhrase(QueryItem),
+            [Phrases.Lookup('GOVERNMENT', MyRO.Government)]);
+          Kind := mkYesNo;
+          IconKind := mikImp;
+          IconIndex := imPalace;
+          ShowModal;
+          if ModalResult <> mrOK then
+          begin
+            result := eInvalid;
+            exit;
+          end;
+        end;
+        Update; // remove message box from screen
+      end
+    end;
+
+    if (result >= rExecuted) and (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
+      (MyUn[UnFocus].Status and usToldNoReturn = 0) then
+    begin // can plane return?
+      PlaneReturnData.Fuel := MyUn[UnFocus].Fuel;
+      if (MyMap[ToLoc] and (fUnit or fOwned) = fUnit) or
+        (MyMap[ToLoc] and (fCity or fOwned) = fCity) then
+      begin // attack/expel/bombard -> 100MP
+        PlaneReturnData.Loc := FromLoc;
+        PlaneReturnData.Movement := MyUn[UnFocus].Movement - 100;
+        if PlaneReturnData.Movement < 0 then
+          PlaneReturnData.Movement := 0;
+      end
+      else // move
+      begin
+        PlaneReturnData.Loc := ToLoc;
+        if dx and 1 <> 0 then
+          PlaneReturnData.Movement := MyUn[UnFocus].Movement - 100
+        else
+          PlaneReturnData.Movement := MyUn[UnFocus].Movement - 150;
+      end;
+      if Server(sGetPlaneReturn, me, UnFocus, PlaneReturnData) = eNoWay then
+      begin
+        if MyModel[MyUn[UnFocus].mix].Kind = mkSpecial_Glider then
+          QueryItem := 'LOWFUEL_GLIDER'
+        else
+          QueryItem := 'LOWFUEL';
+        if SimpleQuery(mkYesNo, Phrases.Lookup(QueryItem), 'WARNING_LOWSUPPORT')
+          <> mrOK then
+        begin
+          result := eInvalid;
+          exit;
+        end;
+        Update; // remove message box from screen
+        MyUn[UnFocus].Status := MyUn[UnFocus].Status or usToldNoReturn;
+      end
+    end;
+
+    if result = eMissionDone then
+    begin
+      ModalSelectDlg.ShowNewContent(wmModal, kMission);
+      Update; // dialog still on screen
+      Mission := ModalSelectDlg.result;
+      if Mission < 0 then
+        exit;
+      Server(sSetSpyMission + Mission shl 4, me, 0, nil^);
+    end;
+
+    CityCaptured := false;
+    if result = eNoTime_Move then
+      Play('NOMOVE_TIME')
+    else
+    begin
+      NeedEcoUpdate := false;
+      DestinationMarkON := false;
+      PaintDestination;
+      if result and rUnitRemoved <> 0 then
+        CityOptimizer_BeforeRemoveUnit(UnFocus);
+      IsAttack := (result = eBombarded) or (result <> eMissionDone) and
+        (MyMap[ToLoc] and (fUnit or fOwned) = fUnit);
+      if not IsAttack then
+      begin // move
+        cix := MyRO.nCity - 1; { look for own city at dest location }
+        while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
+          dec(cix);
+        if (result <> eMissionDone) and (MyMap[ToLoc] and fCity <> 0) and
+          (cix < 0) then
+          CityCaptured := true;
+        result := Server(sMoveUnit + DirCode, me, UnFocus, nil^);
+        case result of
+          eHiddenUnit:
+            begin
+              Play('NOMOVE_SUBMARINE');
+              PaintLoc(ToLoc)
             end;
-      end;
-
-    if MyRO.Turn=MyData.ColdWarStart+ColdWarTurns then
-      begin
-      SoundMessageEx(Phrases.Lookup('COLDWAREND'),'MSG_DEFAULT');
-      MyData.ColdWarStart:=-ColdWarTurns-1
-      end;
-
-    TellNewModels;
-    end; // ClientMode<>cResume
-  MyData.ToldAlive:=MyRO.Alive;
-  move(MyRO.Wonder,MyData.ToldWonders,SizeOf(MyData.ToldWonders));
-
-  NewGovAvailable:=-1;
-  if ClientMode<>cResume then
-    begin // tell about new techs
-    for ad:=0 to nAdv-1 do
-      if (MyRO.TestFlags and tfAllTechs=0)
-          and ((MyRO.Tech[ad]>=tsApplicable)<>(MyData.ToldTech[ad]>=tsApplicable))
-        or (ad in FutureTech ) and (MyRO.Tech[ad]<>MyData.ToldTech[ad]) then
-        with MessgExDlg do
-          begin
-          Item:='RESEARCH_GENERAL';
-          if GameMode<>cMovie then
-            OpenSound:='NEWADVANCE_'+char(48+Age);
-          Item2:=Phrases.Lookup('ADVANCES',ad);
-          if ad in FutureTech then Item2:=Item2+' '+IntToStr(MyRO.Tech[ad]);
-          MessgText:=Format(Phrases.Lookup(Item),[Item2]);
-          Kind:=mkOkHelp;
-          HelpKind:=hkAdv;
-          HelpNo:=ad;
-          IconKind:=mikBook;
-          IconIndex:=-1;
-          for i:=0 to nAdvBookIcon-1 do if AdvBookIcon[i].Adv=ad then
-            IconIndex:=AdvBookIcon[i].Icon;
-          ShowModal;
-          MyData.ToldTech[ad]:=MyRO.Tech[ad];
-          for i:=gMonarchy to nGov-1 do if GovPreq[i]=ad then
-            NewGovAvailable:=i;
-          end;
-    end;
-
-  ShowCityList:=false;
-  if ClientMode=cTurn then
-    begin
-    if (MyRO.Happened and phTech<>0) and (MyData.FarTech<>adNexus) then
-      ChooseResearch;
-
-    UpdatePanel:=false;
-    if MyRO.Happened and phChangeGov<>0 then
-      begin
-      ModalSelectDlg.ShowNewContent(wmModal,kGov);
-      Play('NEWGOV');
-      Server(sSetGovernment,me,ModalSelectDlg.result,nil^);
-      CityOptimizer_BeginOfTurn;
-      UpdatePanel:=true;
-      end;
-    end; // ClientMode=cTurn
-
-  if not supervising and ((ClientMode=cTurn) or (ClientMode=cMovieTurn)) then
-    for cix:=0 to MyRO.nCity-1 do with MyCity[cix] do
-      Status:=Status and not csToldBombard;
-
-  if ((ClientMode=cTurn) or (ClientMode=cMovieTurn))
-    and (MyRO.Government<>gAnarchy) then
-    begin
-    // tell what happened in cities
-    for WondersOnly:=true downto false do
-      for cix:=0 to MyRO.nCity-1 do with MyCity[cix] do
-        if (MyRO.Turn>0) and (Loc>=0) and (Flags and chCaptured=0)
-          and (WondersOnly=(Flags and chProduction<>0)
-            and (Project0 and cpImp<>0) and (Project0 and cpIndex<28)) then
-          begin
-          if WondersOnly then with MessgExDlg do
-            begin {tell about newly built wonder}
-            OpenSound:='WONDER_BUILT';
-            s:=Tribe[me].TPhrase('WONDERBUILTOWN');
-            MessgText:=Format(s, [Phrases.Lookup('IMPROVEMENTS',Project0 and cpIndex),
-              CityName(ID)]);
-            Kind:=mkOkHelp;
-            HelpKind:=hkImp;
-            HelpNo:=Project0 and cpIndex;
-            IconKind:=mikImp;
-            IconIndex:=Project0 and cpIndex;
-            ShowModal;
+          eStealthUnit:
+            begin
+              Play('NOMOVE_STEALTH');
+              PaintLoc(ToLoc)
             end;
-          if not supervising and (ClientMode=cTurn) then
+          eZOC_EnemySpotted:
             begin
-            AllowCityScreen:=true;
-            if (Status and 7<>0) and (Project and (cpImp+cpIndex)=cpImp+imTrGoods) then
-              if (MyData.ImpOrder[Status and 7-1,0]>=0) then
+              Play('NOMOVE_ZOC');
+              PaintLoc(ToLoc, 1)
+            end;
+          rExecuted .. maxint:
+            begin
+              if result and rUnitRemoved <> 0 then
+                UnFocus := -1 // unit died
+              else
+              begin
+                assert(UnFocus >= 0);
+                MyUn[UnFocus].Status := MyUn[UnFocus].Status and
+                  not(usStay or usRecover);
+                for uix := 0 to MyRO.nUn - 1 do
+                  if MyUn[uix].Master = UnFocus then
+                    MyUn[uix].Status := MyUn[uix].Status and not usWaiting;
+                if CityCaptured and
+                  (MyRO.Government in [gRepublic, gDemocracy, gFuture]) then
+                begin // borders have moved, unrest might have changed in any city
+                  CityOptimizer_BeginOfTurn;
+                  NeedEcoUpdate := true;
+                end
+                else
                 begin
-                if AutoBuild(cix,MyData.ImpOrder[Status and 7-1]) then
-                  AllowCityScreen:=false
-                else if Flags and chProduction<>0 then
-                  Flags:=(Flags and not chProduction) or chAllImpsMade
-                end
-              else Flags:=Flags or chTypeDel;
-            if (Size>=NeedAqueductSize) and (MyRO.Tech[Imp[imAqueduct].Preq]<tsApplicable)
-              or (Size>=NeedSewerSize) and (MyRO.Tech[Imp[imSewer].Preq]<tsApplicable) then
-              Flags:=Flags and not chNoGrowthWarning; // don't remind of unknown building
-            if Flags and chNoSettlerProd=0 then
-              Status:=Status and not csToldDelay
-            else if Status and csToldDelay=0 then
-              Status:=Status or csToldDelay
-            else Flags:=Flags and not chNoSettlerProd;
-            if mRepScreens.Checked then
-              begin
-              if (Flags and CityRepMask<>0) and AllowCityScreen then
-                begin {show what happened in cities}
-                SetTroopLoc(MyCity[cix].Loc);
-                MarkCityLoc:=MyCity[cix].Loc;
-                PanelPaint;
-                CityDlg.CloseAction:=None;
-                CityDlg.ShowNewContent(wmModal, MyCity[cix].Loc, Flags and CityRepMask);
-                UpdatePanel:=true;
-                end
-              end
-            else {if mRepList.Checked then}
-              begin
-              if Flags and CityRepMask<>0 then
-                ShowCityList:=true
-              end
-            end
-          end; {city loop}
-    end; // ClientMode=cTurn
-
-  if ClientMode=cTurn then
-    begin
-    if NewGovAvailable>=0 then with MessgExDlg do
-      begin
-      MessgText:=Format(Phrases.Lookup('AUTOREVOLUTION'),
-        [Phrases.Lookup('GOVERNMENT',NewGovAvailable)]);
-      Kind:=mkYesNo;
-      IconKind:=mikPureIcon;
-      IconIndex:=6+NewGovAvailable;
-      ShowModal;
-      if ModalResult=mrOK then
-        begin
-        Play('REVOLUTION');
-        Server(sRevolution,me,0,nil^);
-        end
-      end;
-    end; // ClientMode=cTurn
-
-  if (ClientMode=cTurn) or (ClientMode=cMovieTurn) then
-    begin
-    if MyRO.Happened and phGliderLost<>0 then
-      ContextMessage(Phrases.Lookup('GLIDERLOST'), 'MSG_DEFAULT', hkModel, 200);
-    if MyRO.Happened and phPlaneLost<>0 then
-      ContextMessage(Phrases.Lookup('PLANELOST'), 'MSG_DEFAULT', hkFeature,
-        mcFuel);
-    if MyRO.Happened and phPeaceEvacuation<>0 then
-      for p1:=0 to nPl-1 do if 1 shl p1 and MyData.PeaceEvaHappened<>0 then
-        SoundMessageEx(Tribe[p1].TPhrase('WITHDRAW'), 'MSG_DEFAULT');
-    if MyRO.Happened and phPeaceViolation<>0 then
-      for p1:=0 to nPl-1 do
-        if (1 shl p1 and MyRO.Alive<>0) and (MyRO.EvaStart[p1]=MyRO.Turn) then
-          SoundMessageEx(Format(Tribe[p1].TPhrase('VIOLATION'),
-            [TurnToString(MyRO.Turn+PeaceEvaTurns-1)]), 'MSG_WITHDRAW');
-    TellNewContacts;
-    end;
-
-  if ClientMode=cMovieTurn then Update
-  else if ClientMode=cTurn then
-    begin
-    if UpdatePanel then UpdateViews;
-    Application.ProcessMessages;
-
-    if not supervising then
-      for uix:=0 to MyRO.nUn-1 do with MyUn[uix] do if Loc>=0 then
-        begin
-        if Flags and unWithdrawn<>0 then Status:=0;
-        if Health=100 then
-          Status:=Status and not usRecover;
-        if (Master>=0) or UnitExhausted(uix) then
-          Status:=Status and not usWaiting
-        else Status:=Status or usWaiting;
-        CheckToldNoReturn(uix);
-        if Status and usGoto<>0 then
-          begin {continue multi-turn goto}
-          SetUnFocus(uix);
-          SetTroopLoc(Loc);
-          FocusOnLoc(TroopLoc,flRepaintPanel or flImmUpdate);
-          if Status shr 16=$7FFF then
-            MoveResult:=GetMoveAdvice(UnFocus,maNextCity,MoveAdviceData)
-          else MoveResult:=GetMoveAdvice(UnFocus,Status shr 16,MoveAdviceData);
-          if MoveResult>=rExecuted then
-            begin // !!! Shinkansen
-            MoveResult:=eOK;
-            ok:=true;
-            for i:=0 to MoveAdviceData.nStep-1 do
-              begin
-              Loc1:=dLoc(Loc,MoveAdviceData.dx[i],MoveAdviceData.dy[i]);
-              if (MyMap[Loc1] and (fCity or fOwned)=fCity) // don't capture cities during auto move
-                or (MyMap[Loc1] and (fUnit or fOwned)=fUnit) then // don't attack during auto move
-                begin ok:=false; Break end
-              else
-                begin
-                if (Loc1=MoveAdviceData.ToLoc) or (MoveAdviceData.ToLoc=maNextCity)
-                  and (MyMap[dLoc(Loc,MoveAdviceData.dx[i],MoveAdviceData.dy[i])] and fCity<>0) then
-                  MoveOptions:=muAutoNoWait
-                else MoveOptions:=0;
-                MoveResult:=MoveUnit(MoveAdviceData.dx[i],MoveAdviceData.dy[i],MoveOptions);
-                if (MoveResult<rExecuted) or (MoveResult=eEnemySpotted) then
-                  begin ok:=false; Break end;
+                  if OldUnrest <> NewUnrest then
+                  begin
+                    CityOptimizer_CityChange(MyUn[UnFocus].Home);
+                    for uix := 0 to MyRO.nUn - 1 do
+                      if MyUn[uix].Master = UnFocus then
+                        CityOptimizer_CityChange(MyUn[uix].Home);
+                    NeedEcoUpdate := true;
+                  end;
+                  if (MyRO.Government = gDespotism) and
+                    (MyModel[MyUn[UnFocus].mix].Kind = mkSpecial_TownGuard) then
+                  begin
+                    if MyMap[FromLoc] and fCity <> 0 then
+                    begin // town guard moved out of city in despotism -- reoptimize!
+                      cixChanged := MyRO.nCity - 1;
+                      while (cixChanged >= 0) and
+                        (MyCity[cixChanged].Loc <> FromLoc) do
+                        dec(cixChanged);
+                      assert(cixChanged >= 0);
+                      if cixChanged >= 0 then
+                      begin
+                        CityOptimizer_CityChange(cixChanged);
+                        NeedEcoUpdate := true;
+                      end;
+                    end;
+                    if (MyMap[ToLoc] and fCity <> 0) and not CityCaptured then
+                    begin // town guard moved into city in despotism -- reoptimize!
+                      cixChanged := MyRO.nCity - 1;
+                      while (cixChanged >= 0) and
+                        (MyCity[cixChanged].Loc <> ToLoc) do
+                        dec(cixChanged);
+                      assert(cixChanged >= 0);
+                      if cixChanged >= 0 then
+                      begin
+                        CityOptimizer_CityChange(cixChanged);
+                        NeedEcoUpdate := true;
+                      end
+                    end
+                  end
                 end
               end;
-            Stop:=not ok or (Loc=MoveAdviceData.ToLoc)
-              or (MoveAdviceData.ToLoc=maNextCity) and (MyMap[Loc] and fCity<>0)
-            end
-          else
-            begin
-            MoveResult:=eOK;
-            Stop:=true;
             end;
-
-          if MoveResult<>eDied then
-            if Stop then Status:=Status and ($FFFF-usGoto)
-            else Status:=Status and not usWaiting;
+        else
+          assert(false);
+        end;
+        SetTroopLoc(ToLoc);
+      end
+      else
+      begin { enemy unit -- attack }
+        if result = eBombarded then
+          Defender := MyRO.Territory[ToLoc]
+        else
+          Defender := MyRO.EnemyUn[euix].Owner;
+        { if MyRO.Treaty[Defender]=trCeaseFire then
+          if SimpleQuery(mkYesNo,Phrases.Lookup('FRCANCELQUERY_CEASEFIRE'),
+          'MSG_DEFAULT')<>mrOK then
+          exit; }
+        if (Options and muNoSuicideCheck = 0) and (result and rUnitRemoved <> 0)
+          and (result <> eMissionDone) then
+        begin // suicide query
+          with MyUn[UnFocus], BattleDlg.Forecast do
+          begin
+            pAtt := me;
+            mixAtt := mix;
+            HealthAtt := Health;
+            ExpAtt := Exp;
+            FlagsAtt := Flags;
           end;
-
-        if Status and (usEnhance or usGoto)=usEnhance then
-          // continue terrain enhancement
+          BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
+          Server(sGetBattleForecastEx, me, ToLoc, BattleDlg.Forecast);
+          BattleDlg.uix := UnFocus;
+          BattleDlg.ToLoc := ToLoc;
+          BattleDlg.IsSuicideQuery := true;
+          BattleDlg.ShowModal;
+          if BattleDlg.ModalResult <> mrOK then
+            exit;
+        end;
+
+        cixChanged := -1;
+        if (result and rUnitRemoved <> 0) and (MyRO.Government = gDespotism) and
+          (MyModel[MyUn[UnFocus].mix].Kind = mkSpecial_TownGuard) and
+          (MyMap[FromLoc] and fCity <> 0) then
+        begin // town guard died in city in despotism -- reoptimize!
+          cixChanged := MyRO.nCity - 1;
+          while (cixChanged >= 0) and (MyCity[cixChanged].Loc <> FromLoc) do
+            dec(cixChanged);
+          assert(cixChanged >= 0);
+        end;
+
+        for i := 0 to MyRO.nEnemyModel - 1 do
+          LostArmy[i] := MyRO.EnemyModel[i].Lost;
+        OldToTile := MyMap[ToLoc];
+        result := Server(sMoveUnit + DirCode, me, UnFocus, nil^);
+        nLostArmy := 0;
+        for i := 0 to MyRO.nEnemyModel - 1 do
+        begin
+          LostArmy[i] := MyRO.EnemyModel[i].Lost - LostArmy[i];
+          inc(nLostArmy, LostArmy[i])
+        end;
+        if result and rUnitRemoved <> 0 then
+        begin
+          UnFocus := -1;
+          SetTroopLoc(FromLoc);
+        end;
+        if (OldToTile and not MyMap[ToLoc] and fCity <> 0) and
+          (MyRO.Government in [gRepublic, gDemocracy, gFuture]) then
+        begin // city was destroyed, borders have moved, unrest might have changed in any city
+          CityOptimizer_BeginOfTurn;
+          NeedEcoUpdate := true;
+        end
+        else
+        begin
+          if cixChanged >= 0 then
           begin
-          MoveResult:=ProcessEnhancement(uix,MyData.EnhancementJobs);
-          if MoveResult<>eDied then
-            if MoveResult=eJobDone then Status:=Status and not usEnhance
-            else Status:=Status and not usWaiting;
-          end
-        end;
-    end; // ClientMode=cTurn
-
-  HaveStrategyAdvice:= false;
-//    (GameMode<>cMovie) and not supervising
-//    and AdvisorDlg.HaveStrategyAdvice;
-  GoOnPhase:=true;
-  if supervising or (GameMode=cMovie) then
-    begin SetTroopLoc(-1); PaintAll end {supervisor}
-{  else if (ClientMode=cTurn) and (MyRO.Turn=0) then
-    begin
-    SetUnFocus(0);
-    ZoomToCity(MyCity[0].Loc)
-    end}
-  else
-    begin
-    if ClientMode>=scContact then SetUnFocus(-1)
-    else NextUnit(-1,false);
-    if UnFocus<0 then
-      begin
-      UnStartLoc:=-1;
-      if IsMultiPlayerGame or (ClientMode=cResume) then
-        if MyRO.nCity>0 then FocusOnLoc(MyCity[0].Loc)
-        else FocusOnLoc(G.lx*G.ly div 2);
-      SetTroopLoc(-1);
-      PanelPaint
-      end;
-    if ShowCityList then
-      ListDlg.ShowNewContent(wmPersistent,kCityEvents);
-    end;
-  end;{InitTurn}
-
-var
-i,j,p1,mix,ToLoc,AnimationSpeed,ShowMoveDomain,cix,ecix: integer;
-Color: TColor;
-Name,s: string;
-TribeInfo: TTribeInfo;
-mi: TModelInfo;
-SkipTurn,IsAlpine,IsTreatyDeal: boolean;
-
-begin {>>>client}
-case command of
-  cTurn,cResume,cContinue,cMovieTurn,scContact,scDipStart..scDipBreak:
-    begin
-    supervising:= G.Difficulty[NewPlayer]=0;
-    ArrangeMidPanel;
-    end
-  end;  
-case Command of
-  cDebugMessage:
-    LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(@Data));
-
-  cShowNego: with TShowNegoData(Data) do
-    begin
-    s:=Format('P%d to P%d: ',[pSender,pTarget]);
-    if (Action=scDipOffer) and (Offer.nDeliver+Offer.nCost>0) then
-      begin
-      s:=s+'Offer ';
-      for i:=0 to Offer.nDeliver+Offer.nCost-1 do
-        begin
-        if i=Offer.nDeliver then s:=s+' for '
-        else if i>0 then s:=s+'+';
-        case Offer.Price[i] and opMask of
-          opChoose: s:=s+'Price of choice';
-          opCivilReport: s:=s+'State report';
-          opMilReport: s:=s+'Military report';
-          opMap: s:=s+'Map';
-          opTreaty: s:=s+'Treaty';
-          opShipParts: s:=s+'Ship part';
-          opMoney: s:=s+InttoStr(Offer.Price[i] and $FFFFFF)+'o';
-          opTribute: s:=s+InttoStr(Offer.Price[i] and $FFFFFF)+'o tribute';
-          opTech: s:=s+Phrases.Lookup('ADVANCES', Offer.Price[i] and $FFFFFF);
-          opAllTech: s:=s+'All advances';
-          opModel: s:=s+Tribe[pSender].ModelName[Offer.Price[i] and $FFFFFF];
-          opAllModel: s:=s+'All models';
-          end
-        end;
-      LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
-      end
-    else if Action=scDipAccept then
-      begin
-      s:=s+'--- ACCEPTED! ---';
-      LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
-      end
-    end;
-
-  cInitModule:
-    begin
-    Server:=TInitModuleData(Data).Server;
-    //AdvisorDlg.Init;
-    InitModule;
-    TInitModuleData(Data).DataSize:=SizeOf(TPersistentData);
-    TInitModuleData(Data).Flags:=aiThreaded;
-    end;
-
-  cReleaseModule:
-    begin
-    SmallImp.Free;
-    UnusedTribeFiles.Free;
-    TribeNames.Free;
-    MainMap.Free;
-    IsoEngine.Done;
-    //AdvisorDlg.DeInit;
-    end;
-
-  cHelpOnly,cStartHelp,cStartCredits:
-    begin
-    Age:=0;
-    if Command=cHelpOnly then
-      SetMainTextureByAge(-1);
-    Tribes.Init;
-    HelpDlg.UserLeft:=(Screen.Width-HelpDlg.Width) div 2;
-    HelpDlg.UserTop:=(Screen.Height-HelpDlg.Height) div 2;
-    HelpDlg.Difficulty:=0;
-    if Command=cStartCredits then
-      HelpDlg.ShowNewContent(wmModal, hkMisc, miscCredits)
-    else HelpDlg.ShowNewContent(wmModal, hkMisc, miscMain);
-    Tribes.Done;
-    end;
-
-  cNewGame,cLoadGame,cMovie,cNewMap:
-    begin
-    {if (Command=cNewGame) or (Command=cLoadGame) then
-      AdvisorDlg.NewGame(Data);}
-    GenerateNames:=mNames.Checked;
-    GameOK:=true;
-    G:=TNewGameData(Data);
-    me:=-1;
-    pLogo:=-1;
-    ClientMode:=-1;
-    SetMapOptions;
-    IsoEngine.pDebugMap:=-1;
-    idle:=false;
-    FillChar(Jump,SizeOf(Jump),0);
-    if StartRunning then Jump[0]:=999999;
-    GameMode:=Command;
-    for i:=0 to nGrExt-1 do
-      FillChar(GrExt[i].pixUsed,GrExt[i].Data.Height div 49 *10,0);
-    IsoEngine.Reset;
-    Tribes.Init;
-    GetTribeList;
-    for p1:=0 to nPl-1 do if (G.RO[p1]<>nil) and (G.RO[p1].Data<>nil) then
-      with TPersistentData(G.RO[p1].Data^) do
-        begin
-        FarTech:=adNone;
-        FillChar(EnhancementJobs,SizeOf(EnhancementJobs),jNone);
-        FillChar(ImpOrder,SizeOf(ImpOrder),-1);
-        ColdWarStart:=-ColdWarTurns-1;
-        ToldAge:=-1;
-        ToldModels:=3;
-        ToldAlive:=0;
-        ToldContact:=0;
-        ToldOwnCredibility:=InitialCredibility;
-        for i:=0 to nPl-1 do if G.Difficulty[i]>0 then inc(ToldAlive,1 shl i);
-        PeaceEvaHappened:=0;
-        for i:=0 to 27 do with ToldWonders[i] do
-          begin CityID:=-1; EffectiveOwner:=-1 end;
-        FillChar(ToldTech,SizeOf(ToldTech),tsNA);
-        if G.Difficulty[p1]>0 then
-          SoundPreload(sbStart);
-        end;
-
-    // arrange dialogs
-    ListDlg.UserLeft:=8;
-    ListDlg.UserTop:=TopBarHeight+8;
-    HelpDlg.UserLeft:=Screen.Width-HelpDlg.Width-8;
-    HelpDlg.UserTop:=TopBarHeight+8;
-    UnitStatDlg.UserLeft:=397;
-    UnitStatDlg.UserTop:=TopBarHeight+64;
-    DiaDlg.UserLeft:=(Screen.Width-DiaDlg.Width) div 2;
-    DiaDlg.UserTop:=(Screen.Height-DiaDlg.Height) div 2;
-    NatStatDlg.UserLeft:=Screen.Width-NatStatDlg.Width-8;
-    NatStatDlg.UserTop:=Screen.Height-PanelHeight-NatStatDlg.Height-8;
-    if NatStatDlg.UserTop<8 then
-      NatStatDlg.UserTop:=8;
-
-    Age:=0;
-    MovieSpeed:=1;
-    LogDlg.mSlot.Visible:=true;
-    LogDlg.Host:=self;
-    HelpDlg.ClearHistory;
-    CityDlg.Reset;
-
-    Mini.Width:=G.lx*2; Mini.Height:=G.ly;
-    for i:=0 to nPl-1 do
-      begin Tribe[i]:=nil; TribeOriginal[i]:=false; end;
-    ToldSlavery:=-1;
-    RepaintOnResize:=false;
-    Closable:=false;
-    FirstMovieTurn:=true;
-
-    MenuArea.Visible:= GameMode<>cMovie;
-    TreasuryArea.Visible:= GameMode<cMovie;
-    ResearchArea.Visible:= GameMode<cMovie;
-    ManagementArea.Visible:= GameMode<cMovie;
-    end;
-
-  cGetReady,cReplay: if NewPlayer=0 then
-    begin
-    i:=0;
-    for p1:=0 to nPl-1 do
-      if (G.Difficulty[p1]>0) and (Tribe[p1]=nil) then inc(i);
-    if i>UnusedTribeFiles.Count then
-      begin
-      GameOK:=false;
-      SimpleMessage(Phrases.Lookup('TOOFEWTRIBES'));
-      end
-    else
-      begin
-      for p1:=0 to nPl-1 do
-        if (G.Difficulty[p1]>0) and (Tribe[p1]=nil) and (G.RO[p1]<>nil) then
-          begin // let player select own tribes
-          TribeInfo.trix:=p1;
-          TribeNames.Clear;
-          for j:=0 to UnusedTribeFiles.Count-1 do
-            begin
-            GetTribeInfo(UnusedTribeFiles[j], Name, Color);
-            TribeNames.AddObject(Name,TObject(Color));
-            end;
-          assert(TribeNames.Count>0);
-          ModalSelectDlg.ShowNewContent(wmModal,kTribe);
-          Application.ProcessMessages;
-          TribeInfo.FileName:=UnusedTribeFiles[ModalSelectDlg.result];
-          UnusedTribeFiles.Delete(ModalSelectDlg.result);
-
-          if GameMode=cLoadGame then
-            CreateTribe(TribeInfo.trix,TribeInfo.FileName,false)
-          else Server(cSetTribe+(Length(TribeInfo.FileName)+1+7) div 4,
-            0,0,TribeInfo);
+            CityOptimizer_CityChange(cixChanged);
+            NeedEcoUpdate := true;
           end;
-
-      for p1:=0 to nPl-1 do
-        if (G.Difficulty[p1]>0) and (Tribe[p1]=nil) and (G.RO[p1]=nil) then
-          begin // autoselect enemy tribes
-          j:=ChooseUnusedTribe;
-          TribeInfo.FileName:=UnusedTribeFiles[j];
-          UnusedTribeFiles.Delete(j);
-          TribeInfo.trix:=p1;
-          if GameMode=cLoadGame then
-            CreateTribe(TribeInfo.trix,TribeInfo.FileName,false)
-          else Server(cSetTribe+(Length(TribeInfo.FileName)+1+7) div 4,
-            0,0,TribeInfo);
+          if (result = eWon) or (result = eBloody) or (result = eExpelled) then
+          begin
+            CityOptimizer_TileBecomesAvailable(ToLoc);
+            NeedEcoUpdate := true;
           end;
-      end;
-    if not mNames.Checked then
-      for p1:=0 to nPl-1 do if Tribe[p1]<>nil then
-        Tribe[p1].NumberName:=p1;
-    end;
-
-  cBreakGame:
-    begin
-    SaveSettings;
-    CityDlg.CloseAction:=None;
-    for i:=0 to Screen.FormCount-1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close;
-    if LogDlg.Visible then LogDlg.Close;
-    LogDlg.List.Clear;
-    StartRunning:=not idle and (Jump[0]>0); // AI called Reload
-    me:=-1;
-    idle:=false;
-    ClientMode:=-1;
-    UnitInfoBtn.Visible:=false;
-    UnitBtn.Visible:=false;
-    TerrainBtn.Visible:=false;
-    MovieSpeed1Btn.Visible:=false;
-    MovieSpeed2Btn.Visible:=false;
-    MovieSpeed3Btn.Visible:=false;
-    MovieSpeed4Btn.Visible:=false;
-    EOT.Visible:=false;
-    for i:=0 to ControlCount-1 do if Controls[i] is TButtonC then
-      Controls[i].visible:=false;
-    InitPVSB(sb,0,1);
-    for p1:=0 to nPl-1 do if Tribe[p1]<>nil then Tribe[p1].Free;
-    Tribes.Done;
-    RepaintOnResize:=false;
-    Closable:=true; Close;
-    {if (GameMode=cNewGame) or (GameMode=cLoadGame) then
-      AdvisorDlg.BreakGame;}
-    end;
-
-  cShowGame:
-    begin
-    with Panel.Canvas do
-      begin
-      Brush.Color:=$000000;
-      FillRect(Rect(0,0,Panel.Width,Panel.Height));
-      Brush.Style:=bsClear;
-      end;
-    with TopBar.Canvas do
-      begin
-      Brush.Color:=$000000;
-      FillRect(Rect(0,0,TopBar.Width,TopBar.Height));
-      Brush.Style:=bsClear;
-      end;
-    FormResize(nil); // place mini map correctly according to its size
-    Show;
-    Update;
-    RepaintOnResize:=true;
-    xw:=0; yw:=ywcenter;
-    if not StayOnTop_Ensured then
-      begin
-      StayOnTop_Ensured:=true;
-      CityDlg.StayOnTop_Workaround;
-      CityTypeDlg.StayOnTop_Workaround;
-      DiaDlg.StayOnTop_Workaround;
-      DraftDlg.StayOnTop_Workaround;
-      EnhanceDlg.StayOnTop_Workaround;
-      HelpDlg.StayOnTop_Workaround;
-      NatStatDlg.StayOnTop_Workaround;
-      NegoDlg.StayOnTop_Workaround;
-      ModalSelectDlg.StayOnTop_Workaround;
-      ListDlg.StayOnTop_Workaround;
-      UnitStatDlg.StayOnTop_Workaround;
-      WondersDlg.StayOnTop_Workaround;
-      RatesDlg.StayOnTop_Workaround;
-      end;
-    end;
-
-  cShowTurnChange:
-    begin
-    if integer(data)>=0 then
-      begin
-      pLogo:=integer(data);
-      if G.RO[pLogo]=nil then
-        begin
-        if AILogo[pLogo]<>nil then
-          BitBlt(Canvas.Handle, (xRightPanel+10)-(16+64), ClientHeight-PanelHeight, 64,64,
-            AILogo[pLogo].Canvas.Handle,0,0,SRCCOPY);
-        end
-      end  
-    end;
-
-  cTurn,cResume,cContinue:
-    if not GameOK then Server(sResign,NewPlayer,0,nil^)
-    else
-      begin
-      ClientMode:=Command;
-      pTurn:=NewPlayer;
-      pLogo:=NewPlayer;
-
-      if Command=cResume then
-        begin // init non-original model pictures (maybe tribes not found)
-        for p1:=0 to nPl-1 do if G.RO[p1]<>nil then
+        end;
+        if nLostArmy > 1 then
+        begin
+          with MessgExDlg do
           begin
-          ItsMeAgain(p1);
-          for mix:=0 to MyRO.nModel-1 do
-            if Tribe[me].ModelPicture[mix].HGr=0 then
-              InitMyModel(mix, true);
-          end;
-        me:=-1;
-        end;
-
-      if Jump[pTurn]>0 then
-        Application.ProcessMessages;
-      if Jump[pTurn]>0 then
-        if G.RO[NewPlayer].Happened and phGameEnd<>0 then Jump[pTurn]:=0
-        else dec(Jump[pTurn]);
-      SkipTurn:= Jump[pTurn]>0;
-      if SkipTurn then
-        begin
-        ItsMeAgain(NewPlayer);
-        MyData:=G.RO[NewPlayer].Data;
-        SetTroopLoc(-1);
-        MiniPaint;
-        InitAllEnemyModels; // necessary for correct replay
-        if not EndTurn(true) then SkipTurn:=false;
-        end;
-      if not SkipTurn then
-        begin
-        if ((ClientMode<scDipStart) or (ClientMode>scDipBreak))
-          and NegoDlg.Visible then
-          NegoDlg.Close;
-        skipped:=false; // always show my moves during my turn
-        idle:=true;
-        InitTurn(NewPlayer);
-        DipMem[me].pContact:=-1;
-  (*      if (me=0) and (MyRO.Alive and (1 shl me)=0)} then
-          begin
-          if SimpleQuery(Phrases.Lookup('RESIGN'))=mrIgnore then
-            Server(sResign,me,0,nil^)
-          else Server(sBreak,me,0,nil^)
-          end
-        else Play('TURNSTART');*)
-        end;
-      end;
-
-  cMovieTurn:
-    begin
-    ClientMode:=Command;
-    pTurn:=NewPlayer;
-    pLogo:=-1;
-    skipped:=false; // always show my moves during my turn
-    idle:=true;
-    if FirstMovieTurn then
-      begin
-      CheckMovieSpeedBtnState;
-      FirstMovieTurn:=false;
-      end;
-    InitTurn(NewPlayer);
-    Application.ProcessMessages;
-    if MovieSpeed=4 then
-      begin
-      Sleep(75); // this break will ensure speed of fast forward does not depend on cpu speed
-      Application.ProcessMessages;
-      end
-    end;
-
-  cMovieEndTurn:
-    begin
-    RememberPeaceViolation;
-    pTurn:=-1;
-    pLogo:=-1;
-    MapValid:=false;
-    ClientMode:=-1;
-    idle:=false;
-    skipped:=false;
-    end;
-
-  cEditMap:
-    begin
-    ClientMode:=cEditMap;
-    SetMapOptions;
-    IsoEngine.pDebugMap:=-1;
-    ItsMeAgain(0);
-    MyData:=nil;
-    UnitInfoBtn.Visible:=false;
-    UnitBtn.Visible:=false;
-    TerrainBtn.Visible:=false;
-    MovieSpeed1Btn.Visible:=false;
-    MovieSpeed2Btn.Visible:=false;
-    MovieSpeed3Btn.Visible:=false;
-    MovieSpeed4Btn.Visible:=false;
-    EOT.Visible:=false;
-    HelpDlg.Difficulty:=0;
-    BrushType:=fGrass;
-    BrushLoc:=-1;
-    Edited:=false;
-    UnFocus:=-1;
-    MarkCityLoc:=-1;
-    Tracking:=false;
-    TurnComplete:=false;
-    MapValid:=false;
-    FormResize(nil); // calculate geometrics and paint all
-    SetTroopLoc(-1);
-    idle:=true
-    end;
-
-(*  cNewContact:
-    begin
-    end;
-*)
-
-  scContact:
-    begin
-    DipMem[NewPlayer].pContact:=integer(Data);
-    if Jump[NewPlayer]>0 then DipCall(scReject)
-    else
-      begin
-      ClientMode:=Command;
-      InitTurn(NewPlayer);
-      MyData.ToldContact:=MyData.ToldContact or (1 shl integer(Data));
-        // don't tell about new nation when already contacted by them
-      with MessgExDlg do
-        begin
-        OpenSound:='CONTACT_'+char(48+MyRO.EnemyReport[integer(Data)].Attitude);
-        MessgText:=Tribe[integer(Data)].TPhrase('FRCONTACT');
-        Kind:=mkYesNo;
-        IconKind:=mikTribe;
-        IconIndex:=integer(Data);
-        ShowModal;
-        if ModalResult=mrOK then
-          begin
-          NegoDlg.Respond;
-          DipMem[me].DeliveredPrices:=[];
-          DipMem[me].ReceivedPrices:=[];
-          DipCall(scDipStart)
-          end
-        else
-          begin
-          DipCall(scReject);
-          EndNego
+            Kind := mkOk;
+            IconKind := mikEnemyArmy;
+            MessgText := Tribe[Defender].TString(Phrases.Lookup('ARMYLOST',
+              MyRO.EnemyModel[MyRO.EnemyUn[euix].emix].Domain));
+            ShowModal;
           end
         end
       end;
-    end;
-
-  scDipStart..scDipBreak:
-    begin
-    ClientMode:=Command;
-    InitTurn(NewPlayer);
-    if Command=scDipStart then
-      Play('CONTACT_'+char(48+MyRO.Attitude[DipMem[NewPlayer].pContact]))
-    else if Command=scDipCancelTreaty then
-      Play('CANCELTREATY')
-    else if Command=scDipOffer then
-      begin
-      ReceivedOffer:=TOffer(Data);
-      InitAllEnemyModels;
+      if result and rUnitRemoved <> 0 then
+      begin
+        CityOptimizer_AfterRemoveUnit;
+        ListDlg.RemoveUnit;
+        NeedEcoUpdate := true;
+      end;
+      if NeedEcoUpdate then
+      begin
+        UpdateViews(true);
+        Update
       end
-    else if Command=scDipAccept then
-      begin // remember delivered and received prices
-      for i:=0 to DipMem[me].SentOffer.nDeliver-1 do
-        include(DipMem[me].DeliveredPrices,DipMem[me].SentOffer.Price[i] shr 24);
-      for i:=0 to DipMem[me].SentOffer.nCost-1 do
-        include(DipMem[me].ReceivedPrices,
-          DipMem[me].SentOffer.Price[DipMem[me].SentOffer.nDeliver+i] shr 24);
-      IsTreatyDeal:=false;
-      for i:=0 to ReceivedOffer.nDeliver+ReceivedOffer.nCost-1 do
-        if DipMem[me].SentOffer.Price[i] and opMask=opTreaty then
-          IsTreatyDeal:=true;
-      if IsTreatyDeal then Play('NEWTREATY')
-      else Play('ACCEPTOFFER');
+    end;
+
+    if result = eMissionDone then
+    begin
+      p1 := MyRO.Territory[ToLoc];
+      case Mission of
+        smStealMap:
+          begin
+            MapValid := false;
+            PaintAllMaps
+          end;
+        smStealCivilReport:
+          TribeMessage(p1, Tribe[p1].TPhrase('DOSSIER_PREPARED'), '');
+        smStealMilReport:
+          ListDlg.ShowNewContent_MilReport(wmPersistent, p1);
       end;
-    NegoDlg.Start;
-    idle:=true
-    end;
-
-  cShowCancelTreaty:
-    if not IsMultiPlayerGame then
-      begin
-      case G.RO[NewPlayer].Treaty[integer(data)] of
-        trPeace: s:=Tribe[integer(data)].TPhrase('FRCANCELBYREJECT_PEACE');
-        trFriendlyContact: s:=Tribe[integer(data)].TPhrase('FRCANCELBYREJECT_FRIENDLY');
-        trAlliance: s:=Tribe[integer(data)].TPhrase('FRCANCELBYREJECT_ALLIANCE');
-        end;
-      TribeMessage(integer(data), s, 'CANCELTREATY');
+    end;
+
+    if UnFocus >= 0 then
+      CheckToldNoReturn(UnFocus);
+
+    NeedRepaintPanel := false;
+    if result >= rExecuted then
+    begin
+      if CityCaptured and (MyMap[ToLoc] and fCity = 0) then
+      begin // city destroyed
+        for i := 0 to 27 do { tell about destroyed wonders }
+          if (MyRO.Wonder[i].CityID = -2) and
+            (MyData.ToldWonders[i].CityID <> -2) then
+            with MessgExDlg do
+            begin
+              if WondersDlg.Visible then
+                WondersDlg.SmartUpdateContent(false);
+              OpenSound := 'WONDER_DESTROYED';
+              MessgText := Format(Phrases.Lookup('WONDERDEST'),
+                [Phrases.Lookup('IMPROVEMENTS', i)]);
+              Kind := mkOkHelp;
+              HelpKind := hkImp;
+              HelpNo := i;
+              IconKind := mikImp;
+              IconIndex := i;
+              ShowModal;
+              MyData.ToldWonders[i] := MyRO.Wonder[i];
+            end
       end;
-
-  cShowCancelTreatyByAlliance:
-    if idle and (NewPlayer=me) then
-      TribeMessage(integer(data), Tribe[integer(data)].TPhrase('FRENEMYALLIANCE'),
-        'CANCELTREATY');
-
-  cShowSupportAllianceAgainst:
-    if not IsMultiPlayerGame and (Jump[0]=0) then
-      TribeMessage(integer(data) and $F,
-        Tribe[integer(data) and $F].TPhrase('FRMYALLIANCE1')
-          +' '+Tribe[integer(data) shr 4].TPhrase('FRMYALLIANCE2'),
-        'CANCELTREATY');
-
-  cShowPeaceViolation:
-    if not IsMultiPlayerGame and (Jump[0]=0) then
-      TribeMessage(integer(data), Format(Tribe[integer(data)].TPhrase('EVIOLATION'),
-        [TurnToString(MyRO.Turn+PeaceEvaTurns-1)]), 'MSG_WITHDRAW');
-
-  cShowEndContact: EndNego;
-
-  cShowUnitChanged,cShowCityChanged,cShowAfterMove,cShowAfterAttack:
-    if (idle and (NewPlayer=me) or not idle and not skipped)
-      and not ((GameMode=cMovie) and (MovieSpeed=4)) then
-      begin
-      assert(NewPlayer=me);
-      if not idle or (GameMode=cMovie) then
-        Application.ProcessMessages;
-      if Command=cShowCityChanged then
-        begin
-        CurrentMoveInfo.DoShow:=false;
-        if idle then
-          CurrentMoveInfo.DoShow:=true
-        else if CurrentMoveInfo.IsAlly then
-          CurrentMoveInfo.DoShow:=not mAlNoMoves.Checked
-        else CurrentMoveInfo.DoShow:=not mEnNoMoves.Checked
+      if CityCaptured and (MyMap[ToLoc] and fCity <> 0) then
+      begin // city captured
+        ListDlg.AddCity;
+        for i := 0 to 27 do { tell about capture of wonders }
+          if MyRO.City[MyRO.nCity - 1].Built[i] > 0 then
+            with MessgExDlg do
+            begin
+              if WondersDlg.Visible then
+                WondersDlg.SmartUpdateContent(false);
+              OpenSound := 'WONDER_CAPTURED';
+              MessgText := Format(Tribe[me].TPhrase('WONDERCAPTOWN'),
+                [Phrases.Lookup('IMPROVEMENTS', i)]);
+              Kind := mkOkHelp;
+              HelpKind := hkImp;
+              HelpNo := i;
+              IconKind := mikImp;
+              IconIndex := i;
+              ShowModal;
+              MyData.ToldWonders[i] := MyRO.Wonder[i];
+            end;
+
+        if MyRO.Happened and phStealTech <> 0 then
+        begin { Temple of Zeus -- choose advance to steal }
+          ModalSelectDlg.ShowNewContent(wmModal, kStealTech);
+          Server(sStealTech, me, ModalSelectDlg.result, nil^);
+        end;
+        TellNewModels;
+
+        cix := MyRO.nCity - 1;
+        while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
+          dec(cix);
+        assert(cix >= 0);
+        MyCity[cix].Status := MyCity[cix].Status and
+          not csResourceWeightsMask or (3 shl 4);
+        // captured city, set to maximum growth
+        NewTiles := 1 shl 13; { exploit central tile only }
+        Server(sSetCityTiles, me, cix, NewTiles);
+      end
+      else
+        NeedRepaintPanel := true;
+    end;
+    TellNewContacts;
+
+    if (UnFocus >= 0) and (MyUn[UnFocus].Master >= 0) then
+      with MyUn[MyUn[UnFocus].Master] do
+        if Status and usStay <> 0 then
+        begin
+          Status := Status and not usStay;
+          if (Movement >= 100) and (Status and (usRecover or usGoto) = 0) then
+            Status := Status or usWaiting;
+        end;
+    if Options and (muAutoNoWait or muAutoNext) <> 0 then
+    begin
+      if (UnFocus >= 0) and ((result = eNoTime_Move) or UnitExhausted(UnFocus)
+        or (MyUn[UnFocus].Master >= 0) or
+        (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
+        ((MyMap[MyUn[UnFocus].Loc] and fCity <> 0) { aircrafts stop in cities }
+        or (MyMap[MyUn[UnFocus].Loc] and fTerImp = tiBase))) then
+      begin
+        MyUn[UnFocus].Status := MyUn[UnFocus].Status and not usWaiting;
+        if Options and muAutoNext <> 0 then
+          if CityCaptured and (MyMap[ToLoc] and fCity <> 0) then
+          begin
+            UnFocus := -1;
+            PaintLoc(ToLoc); // don't show unit in city if not selected
+          end
+          else
+            NextUnit(UnStartLoc, true)
+      end
+      else if (UnFocus < 0) and (Options and muAutoNext <> 0) then
+        NextUnit(UnStartLoc, result <> eMissionDone);
+    end;
+
+    if NeedRepaintPanel and (UnFocus = UnFocus0) then
+      if IsAttack then
+        PanelPaint
+      else
+      begin
+        assert(result <> eMissionDone);
+        CheckTerrainBtnVisible;
+        FocusOnLoc(ToLoc, flRepaintPanel or flImmUpdate)
+      end;
+
+    if (result >= rExecuted) and CityCaptured and (MyMap[ToLoc] and fCity <> 0)
+    then
+      ZoomToCity(ToLoc, UnFocus < 0, chCaptured); // show captured city
+  end; // moveunit
+
+  procedure TMainScreen.MoveOnScreen(ShowMove: TShowMove;
+    Step0, Step1, nStep: integer; Restore: boolean = true);
+  var
+    ToLoc, xFromLoc, yFromLoc, xToLoc, yToLoc, xFrom, yFrom, xTo, yTo, xMin,
+      yMin, xRange, yRange, xw1, Step, xMoving, yMoving, yl,
+      SliceCount: integer;
+    UnitInfo: TUnitInfo;
+    Ticks0, Ticks: int64;
+  begin
+    Timer1.Enabled := false;
+    QueryPerformanceCounter(Ticks0);
+    with ShowMove do
+    begin
+      UnitInfo.Owner := Owner;
+      UnitInfo.mix := mix;
+      UnitInfo.Health := Health;
+      UnitInfo.Job := jNone;
+      UnitInfo.Flags := Flags;
+      if Owner <> me then
+        UnitInfo.emix := emix;
+
+      ToLoc := dLoc(FromLoc, dx, dy);
+      xToLoc := ToLoc mod G.lx;
+      yToLoc := ToLoc div G.lx;
+      xFromLoc := FromLoc mod G.lx;
+      yFromLoc := FromLoc div G.lx;
+      if xToLoc > xFromLoc + 2 then
+        xToLoc := xToLoc - G.lx
+      else if xToLoc < xFromLoc - 2 then
+        xToLoc := xToLoc + G.lx;
+
+      xw1 := xw + G.lx;
+      // ((xFromLoc-xw1)*2+yFromLoc and 1+1)*xxt+dx*xxt/2-MapWidth/2 -> min
+      while abs(((xFromLoc - xw1 + G.lx) * 2 + yFromLoc and 1 + 1) * xxt * 2 +
+        dx * xxt - MapWidth) < abs(((xFromLoc - xw1) * 2 + yFromLoc and 1 + 1) *
+        xxt * 2 + dx * xxt - MapWidth) do
+        dec(xw1, G.lx);
+
+      xTo := (xToLoc - xw1) * (xxt * 2) + yToLoc and 1 * xxt + (xxt - xxu);
+      yTo := (yToLoc - yw) * yyt + (yyt - yyu_anchor);
+      xFrom := (xFromLoc - xw1) * (xxt * 2) + yFromLoc and 1 * xxt +
+        (xxt - xxu);
+      yFrom := (yFromLoc - yw) * yyt + (yyt - yyu_anchor);
+      if xFrom < xTo then
+      begin
+        xMin := xFrom;
+        xRange := xTo - xFrom
+      end
+      else
+      begin
+        xMin := xTo;
+        xRange := xFrom - xTo
+      end;
+      if yFrom < yTo then
+      begin
+        yMin := yFrom;
+        yRange := yTo - yFrom
+      end
+      else
+      begin
+        yMin := yTo;
+        yRange := yFrom - yTo
+      end;
+      inc(xRange, xxt * 2);
+      inc(yRange, yyt * 3);
+
+      MainOffscreenPaint;
+      NoMap.SetOutput(Buffer);
+      NoMap.SetPaintBounds(0, 0, xRange, yRange);
+      for Step := 0 to abs(Step1 - Step0) do
+      begin
+        BitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange,
+          offscreen.Canvas.Handle, xMin, yMin, SRCCOPY);
+        if Step1 <> Step0 then
+        begin
+          xMoving := xFrom +
+            Round((Step0 + Step * (Step1 - Step0) div abs(Step1 - Step0)) *
+            (xTo - xFrom) / nStep);
+          yMoving := yFrom +
+            Round((Step0 + Step * (Step1 - Step0) div abs(Step1 - Step0)) *
+            (yTo - yFrom) / nStep);
         end
-      else if Command=cShowUnitChanged then
-        begin
-        CurrentMoveInfo.DoShow:=false;
-        if idle then
-          CurrentMoveInfo.DoShow:=not mEffectiveMovesOnly.Checked
-        else if CurrentMoveInfo.IsAlly then
-          CurrentMoveInfo.DoShow:=not (mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked)
-        else CurrentMoveInfo.DoShow:=not (mEnNoMoves.Checked or mEnAttacks.Checked)
-        end;
-      // else keep DoShow from cShowMove/cShowAttack
-
-      if CurrentMoveInfo.DoShow then
-        begin
-        if Command=cShowCityChanged then MapValid:=false;
-        FocusOnLoc(integer(Data),flImmUpdate);
-//        OldUnFocus:=UnFocus;
-//        UnFocus:=-1;
-        if Command=cShowAfterMove then
-          PaintLoc(integer(Data),CurrentMoveInfo.AfterMovePaintRadius) // show discovered areas
-        else PaintLoc(integer(Data),1);
-//        UnFocus:=OldUnFocus;
-        if (Command=cShowAfterAttack) and (CurrentMoveInfo.AfterAttackExpeller>=0) then
+        else
+        begin
+          xMoving := xFrom;
+          yMoving := yFrom;
+        end;
+        NoMap.PaintUnit(xMoving - xMin, yMoving - yMin, UnitInfo, 0);
+        PaintBufferToScreen(xMin, yMin, xRange, yRange);
+
+        SliceCount := 0;
+        Ticks := Ticks0;
+        repeat
+          if (SliceCount = 0) or ((Ticks - Ticks0) * 12000 * (SliceCount + 1)
+            div SliceCount < MoveTime * PerfFreq) then
           begin
-          SoundMessageEx(Tribe[CurrentMoveInfo.AfterAttackExpeller].TPhrase('EXPEL'),'');
-          CurrentMoveInfo.AfterAttackExpeller:=-1;
-          Update; // remove message box from screen
+            if not idle or (GameMode = cMovie) then
+              Application.ProcessMessages;
+            Sleep(1);
+            inc(SliceCount)
+          end;
+          QueryPerformanceCounter(Ticks);
+        until (Ticks - Ticks0) * 12000 >= MoveTime * PerfFreq;
+        Ticks0 := Ticks
+      end;
+    end;
+    if Restore then
+    begin
+      BitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange,
+        offscreen.Canvas.Handle, xMin, yMin, SRCCOPY);
+      PaintBufferToScreen(xMin, yMin, xRange, yRange);
+    end;
+    BlinkTime := -1;
+    Timer1.Enabled := true;
+  end;
+
+  procedure TMainScreen.MoveToLoc(Loc: integer; CheckSuicide: boolean);
+  // path finder: move focused unit to loc, start multi-turn goto if too far
+  var
+    uix, i, MoveOptions, NextLoc, MoveResult: integer;
+    MoveAdviceData: TMoveAdviceData;
+    StopReason: (None, Arrived, Dead, NoTime, EnemySpotted, MoveError);
+  begin
+    if MyUn[UnFocus].Job > jNone then
+      Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+    if GetMoveAdvice(UnFocus, Loc, MoveAdviceData) >= rExecuted then
+    begin
+      uix := UnFocus;
+      StopReason := None;
+      repeat
+        for i := 0 to MoveAdviceData.nStep - 1 do
+        begin
+          if i = MoveAdviceData.nStep - 1 then
+            MoveOptions := muAutoNext
+          else
+            MoveOptions := 0;
+          NextLoc := dLoc(MyUn[uix].Loc, MoveAdviceData.dx[i],
+            MoveAdviceData.dy[i]);
+          if (NextLoc = Loc) or (Loc = maNextCity) and
+            (MyMap[NextLoc] and fCity <> 0) then
+            StopReason := Arrived;
+          if not CheckSuicide and (NextLoc = Loc) then
+            MoveOptions := MoveOptions or muNoSuicideCheck;
+          MoveResult := MoveUnit(MoveAdviceData.dx[i], MoveAdviceData.dy[i],
+            MoveOptions);
+          if MoveResult < rExecuted then
+            StopReason := MoveError
+          else if MoveResult and rUnitRemoved <> 0 then
+            StopReason := Dead
+          else if (StopReason = None) and (MoveResult and rEnemySpotted <> 0)
+          then
+            StopReason := EnemySpotted;
+          if StopReason <> None then
+            Break;
+        end;
+        if (StopReason = None) and
+          ((MoveAdviceData.nStep < 25) or
+          (MyRO.Wonder[woShinkansen].EffectiveOwner <> me)) then
+          StopReason := NoTime;
+        if StopReason <> None then
+          Break;
+        if GetMoveAdvice(UnFocus, Loc, MoveAdviceData) < rExecuted then
+        begin
+          assert(false);
+          Break
+        end
+        until false;
+
+        case StopReason of
+          None:
+            assert(false);
+          Arrived:
+            MyUn[uix].Status := MyUn[uix].Status and ($FFFF - usGoto);
+          Dead:
+            if UnFocus < 0 then
+              NextUnit(UnStartLoc, false);
+        else
+          begin // multi-turn goto
+            if Loc = maNextCity then
+              MyUn[uix].Status := MyUn[uix].Status and
+                ($FFFF - usStay - usRecover) or usGoto + $7FFF shl 16
+            else
+              MyUn[uix].Status := MyUn[uix].Status and
+                ($FFFF - usStay - usRecover) or usGoto + Loc shl 16;
+            PaintLoc(MyUn[uix].Loc);
+            if (StopReason = NoTime) and (UnFocus = uix) then
+            begin
+              MyUn[uix].Status := MyUn[uix].Status and not usWaiting;
+              NextUnit(UnStartLoc, true)
+            end;
           end
-        else if not idle then
-          if Command=cShowCityChanged then
-            Sleep(MoveTime*WaitAfterShowMove div 16)
-          else if (Command=cShowUnitChanged)
-            and (MyMap[integer(Data)] and fUnit<>0) then
-            Sleep(MoveTime*WaitAfterShowMove div 32)
-        end // if CurrentMoveInfo.DoShow
-      else MapValid:=false;
+        end
+      end
+    end;
+
+    procedure TMainScreen.PanelBoxMouseDown(Sender: TObject;
+      Button: TMouseButton; Shift: TShiftState; x, y: integer);
+    var
+      i, xMouse, MouseLoc, p1: integer;
+    begin
+      if GameMode = cMovie then
+        exit;
+
+      if Button = mbLeft then
+      begin
+        if (x >= xMini + 2) and (y >= yMini + 2) and (x < xMini + 2 + 2 * G.lx)
+          and (y < yMini + 2 + G.ly) then
+          if ssShift in Shift then
+          begin
+            xMouse := (xwMini + (x - (xMini + 2) + MapWidth div (xxt * 2) +
+              G.lx) div 2) mod G.lx;
+            MouseLoc := xMouse + G.lx * (y - (yMini + 2));
+            if MyMap[MouseLoc] and fTerrain <> fUNKNOWN then
+            begin
+              p1 := MyRO.Territory[MouseLoc];
+              if (p1 = me) or (p1 >= 0) and (MyRO.Treaty[p1] >= trNone) then
+                NatStatDlg.ShowNewContent(wmPersistent, p1);
+            end
+          end
+          else
+          begin
+            if CityDlg.Visible then
+              CityDlg.Close;
+            if UnitStatDlg.Visible then
+              UnitStatDlg.Close;
+            Tracking := true;
+            PanelBoxMouseMove(Sender, Shift + [ssLeft], x, y);
+          end
+        else if (ClientMode <> cEditMap) and (x >= ClientWidth - xPalace) and
+          (y >= yPalace) and (x < ClientWidth - xPalace + xSizeBig) and
+          (y < yPalace + ySizeBig) then
+        begin
+          InitPopup(StatPopup);
+          if FullScreen then
+            StatPopup.Popup(Left + ClientWidth - xPalace + xSizeBig + 2,
+              Top + ClientHeight - PanelHeight + yPalace - 1)
+          else
+            StatPopup.Popup(Left + ClientWidth - xPalace + 6,
+              Top + ClientHeight - PanelHeight + yPalace + ySizeBig +
+              GetSystemMetrics(SM_CYCAPTION) + 3)
+        end
+        (* else if (x>=xAdvisor-3) and (y>=yAdvisor-3)
+          and (x<xAdvisor+16+3) and (y<yAdvisor+16+3) and HaveStrategyAdvice then
+          AdviceBtnClick *)
+        else if (x >= xTroop + 1) and (y >= yTroop + 1) and
+          (x < xTroop + TrRow * TrPitch) and (y <= yTroop + 55) then
+        begin
+          i := (x - xTroop - 1) div TrPitch;
+          if trix[i] >= 0 then
+            if ClientMode = cEditMap then
+            begin
+              BrushType := trix[i];
+              PanelPaint
+            end
+            else if (TroopLoc >= 0) then
+              if MyMap[TroopLoc] and fOwned <> 0 then
+              begin
+                if ssShift in Shift then
+                  UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
+                    MyUn[trix[i]].mix)
+                else if not supervising and (ClientMode < scContact) and
+                  (x - xTroop - 1 - i * TrPitch >= 60 - 20) and
+                  (y >= yTroop + 35) and
+                  ((MyUn[trix[i]].Job > jNone) or (MyUn[trix[i]].Status and
+                  (usStay or usRecover or usGoto) <> 0)) then
+                begin // wake up
+                  MyUn[trix[i]].Status := MyUn[trix[i]].Status and
+                    ($FFFF - usStay - usRecover - usGoto - usEnhance) or
+                    usWaiting;
+                  if MyUn[trix[i]].Job > jNone then
+                    Server(sStartJob + jNone shl 4, me, trix[i], nil^);
+                  if (UnFocus < 0) and not CityDlg.Visible then
+                  begin
+                    SetUnFocus(trix[i]);
+                    SetTroopLoc(MyUn[trix[i]].Loc);
+                    FocusOnLoc(TroopLoc, flRepaintPanel)
+                  end
+                  else
+                  begin
+                    if CityDlg.Visible and (CityDlg.RestoreUnFocus < 0) then
+                      CityDlg.RestoreUnFocus := trix[i];
+                    PanelPaint;
+                  end
+                end
+                else if (ClientMode < scContact) then
+                begin
+                  if supervising then
+                    UnitStatDlg.ShowNewContent_OwnUnit(wmPersistent, trix[i])
+                  else if CityDlg.Visible then
+                  begin
+                    CityDlg.CloseAction := None;
+                    CityDlg.Close;
+                    SumCities(TaxSum, ScienceSum);
+                    SetUnFocus(trix[i]);
+                  end
+                  else
+                  begin
+                    DestinationMarkON := false;
+                    PaintDestination;
+                    UnFocus := trix[i];
+                    UnStartLoc := TroopLoc;
+                    BlinkTime := 0;
+                    BlinkON := false;
+                    PaintLoc(TroopLoc);
+                  end;
+                  if UnFocus >= 0 then
+                  begin
+                    UnitInfoBtn.Visible := true;
+                    UnitBtn.Visible := true;
+                    TurnComplete := false;
+                    EOT.ButtonIndex := eotGray;
+                  end;
+                  CheckTerrainBtnVisible;
+                  PanelPaint;
+                end
+              end
+              else if Server(sGetUnits, me, TroopLoc, TrCnt) >= rExecuted then
+                if ssShift in Shift then
+                  UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
+                    MyRO.EnemyUn[MyRO.nEnemyUn + trix[i]].emix) // model info
+                else
+                  UnitStatDlg.ShowNewContent_EnemyUnit(wmPersistent,
+                    MyRO.nEnemyUn + trix[i]); // unit info
+        end
+      end
+    end;
+
+    procedure TMainScreen.SetTroopLoc(Loc: integer);
+    var
+      trixFocus, uix, uixDefender: integer;
+      Prio: boolean;
+    begin
+      TroopLoc := Loc;
+      TrRow := (xRightPanel + 10 - xTroop - GetSystemMetrics(SM_CXVSCROLL) - 19)
+        div TrPitch;
+      TrCnt := 0;
+      trixFocus := -1;
+      if ClientMode = cEditMap then
+        TrCnt := nBrushTypes
+      else if (Loc >= 0) and (MyMap[Loc] and fUnit <> 0) then
+        if MyMap[Loc] and fOwned <> 0 then
+        begin // count own units here
+          Server(sGetDefender, me, TroopLoc, uixDefender);
+          for Prio := true downto false do
+            for uix := 0 to MyRO.nUn - 1 do
+              if ((uix = uixDefender) = Prio) and (MyUn[uix].Loc = Loc) then
+              begin
+                if uix = UnFocus then
+                  trixFocus := TrCnt;
+                inc(TrCnt);
+              end
+        end
+        else // count enemy units here
+          Server(sGetUnits, me, Loc, TrCnt);
+      if TrCnt = 0 then
+        InitPVSB(sb, 0, 1)
+      else
+      begin
+        InitPVSB(sb, (TrCnt + TrRow - 1) div TrRow - 1, 1);
+        with sb.si do
+          if (nMax >= integer(nPage)) and (trixFocus >= 0) then
+          begin
+            sb.si.npos := trixFocus div TrRow;
+            sb.si.FMask := SIF_POS;
+            SetScrollInfo(sb.h, SB_CTL, sb.si, true);
+          end
+      end
+    end;
+
+    (* procedure TMainScreen.ShowMoveHint(ToLoc: integer; Force: boolean = false);
+      var
+      Step,Loc,x0,y0,xs,ys: integer;
+      Info: string;
+      InfoSize: TSize;
+      MoveAdvice: TMoveAdviceData;
+      begin
+      if (ToLoc<0) or (ToLoc>=G.lx*G.ly)
+      or (UnFocus<0) or (MyUn[UnFocus].Loc=ToLoc) then
+      ToLoc:=-1
+      else
+      begin
+      MoveAdvice.ToLoc:=ToLoc;
+      MoveAdvice.MoreTurns:=0;
+      MoveAdvice.MaxHostile_MovementLeft:=MyUn[UnFocus].Health-50;
+      if Server(sGetMoveAdvice,me,UnFocus,MoveAdvice)<rExecuted then
+      ToLoc:=-1
       end;
-
-  cShowMoving,cShowCapturing:
-    if (idle and (NewPlayer=me)
-      or not idle and not skipped and (TShowMove(Data).emix<>$FFFF))
-      and not ((GameMode=cMovie) and (MovieSpeed=4)) then
-      begin
-      assert(NewPlayer=me);
-      if not idle or (GameMode=cMovie) then
-        Application.ProcessMessages;
-      with TShowMove(Data) do
-        begin
-        CurrentMoveInfo.DoShow:=false;
-        if not idle and (Tribe[Owner].ModelPicture[mix].HGr=0) then
-          InitEnemyModel(emix);
-
-        ToLoc:=dLoc(FromLoc,dx,dy);
-        if idle then
-          begin // own unit -- make discovered land visible
-          assert(Owner=me); // no foreign moves during my turn!
-          CurrentMoveInfo.DoShow:=not mEffectiveMovesOnly.Checked
-            or (Command=cShowCapturing);
-          if CurrentMoveInfo.DoShow then
+      if (ToLoc=MoveHintToLoc) and not Force then exit;
+      if (ToLoc<>MoveHintToLoc) and (MoveHintToLoc>=0) then
+      begin invalidate; update end; // clear old hint from screen
+      MoveHintToLoc:=ToLoc;
+      if ToLoc<0 then exit;
+
+      with canvas do
+      begin
+      Pen.Color:=$80C0FF;
+      Pen.Width:=3;
+      Loc:=MyUn[UnFocus].Loc;
+      for Step:=0 to MoveAdvice.nStep do
+      begin
+      y0:=(Loc+G.lx*1024) div G.lx -1024;
+      x0:=(Loc+(y0 and 1+G.lx*1024) div 2) mod G.lx;
+      xs:=(x0-xw)*66+y0 and 1*33-G.lx*66;
+      while abs(2*(xs+G.lx*66)-MapWidth)<abs(2*xs-MapWidth) do
+      inc(xs,G.lx*66);
+      ys:=(y0-yw)*16;
+      if Step=0 then moveto(xs+33,ys+16)
+      else lineto(xs+33,ys+16);
+      if Step<MoveAdvice.nStep then
+      Loc:=dLoc(Loc,MoveAdvice.dx[Step],MoveAdvice.dy[Step]);
+      end;
+      Brush.Color:=$80C0FF;
+      Info:=' '+inttostr(88)+' ';
+      InfoSize:=TextExtent(Info);
+      TextOut(xs+33-InfoSize.cx div 2, ys+16-InfoSize.cy div 2, Info);
+      Brush.Style:=bsClear;
+      end
+      end; *)
+
+    procedure TMainScreen.SetDebugMap(p: integer);
+    begin
+      IsoEngine.pDebugMap := p;
+      IsoEngine.Options := IsoEngine.Options and not(1 shl moLocCodes);
+      mLocCodes.Checked := false;
+      MapValid := false;
+      MainOffscreenPaint;
+    end;
+
+    procedure TMainScreen.SetViewpoint(p: integer);
+    var
+      i: integer;
+    begin
+      if supervising and (G.RO[0].Turn > 0) and
+        ((p = 0) or (1 shl p and G.RO[0].Alive <> 0)) then
+      begin
+        for i := 0 to Screen.FormCount - 1 do
+          if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+          then
+            Screen.Forms[i].Close; // close windows
+        ItsMeAgain(p);
+        SumCities(TaxSum, ScienceSum);
+        for i := 0 to MyRO.nModel - 1 do
+          if Tribe[me].ModelPicture[i].HGr = 0 then
+            InitMyModel(i, true);
+
+        SetTroopLoc(-1);
+        PanelPaint;
+        MapValid := false;
+        PaintAllMaps;
+      end
+    end;
+
+    procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: word;
+      Shift: TShiftState);
+
+      procedure MenuClick_Check(Popup: TPopupMenu; Item: TMenuItem);
+      begin
+        InitPopup(Popup);
+        if Item.Visible and Item.Enabled then
+          MenuClick(Item);
+      end;
+
+    var
+      dx, dy: integer;
+      time0, time1: int64;
+    begin
+      if GameMode = cMovie then
+      begin
+        case Key of
+          VK_F4:
+            MenuClick_Check(StatPopup, mScienceStat);
+          VK_F6:
+            MenuClick_Check(StatPopup, mDiagram);
+          VK_F7:
+            MenuClick_Check(StatPopup, mWonders);
+          VK_F8:
+            MenuClick_Check(StatPopup, mShips);
+        end;
+        exit;
+      end;
+
+      if not idle then
+        exit;
+
+      if ClientMode = cEditMap then
+      begin
+        if Shift = [ssCtrl] then
+          case char(Key) of
+            (* 'A':
+              begin // auto symmetry
+              Server($7F0,me,0,nil^);
+              MapValid:=false;
+              PaintAll;
+              end;
+              'B':
+              begin // land mass
+              dy:=0;
+              for dx:=G.lx to G.lx*(G.ly-1)-1 do
+              if MyMap[dx] and fTerrain>=fGrass then inc(dy);
+              dy:=dy
+              end; *)
+            'Q':
+              MenuClick(mResign);
+            'R':
+              MenuClick(mRandomMap);
+          end
+        else if Shift = [] then
+          case char(Key) of
+            char(VK_F1):
+              MenuClick(mHelp);
+          end;
+        exit;
+      end;
+
+      if Shift = [ssAlt] then
+        case char(Key) of
+          '0':
+            SetDebugMap(-1);
+          '1' .. '9':
+            SetDebugMap(ord(Key) - 48);
+        end
+      else if Shift = [ssCtrl] then
+        case char(Key) of
+          'J':
+            MenuClick(mJump);
+          'K':
+            mShowClick(mDebugMap);
+          'L':
+            mShowClick(mLocCodes);
+          'M':
+            if LogDlg.Visible then
+              LogDlg.Close
+            else
+              LogDlg.Show;
+          'N':
+            mNamesClick(mNames);
+          'Q':
+            MenuClick_Check(GamePopup, mResign);
+          'R':
+            MenuClick(mRun);
+          '0' .. '9':
             begin
-            if GameMode=cMovie then
+              if ord(Key) - 48 = me then
+                SetViewpoint(0)
+              else
+                SetViewpoint(ord(Key) - 48);
+            end;
+          ' ':
+            begin // test map repaint time
+              QueryPerformanceCounter(time0);
+              MapValid := false;
+              MainOffscreenPaint;
+              QueryPerformanceCounter(time1);
+              SimpleMessage(Format('Map repaint time: %.3f ms',
+                [{$IFDEF VER100}(time1.LowPart - time0.LowPart)
+{$ELSE}(time1 - time0){$ENDIF} * 1000.0 / PerfFreq]));
+            end
+        end
+      else if Shift = [] then
+        case char(Key) of
+          char(VK_F1):
+            MenuClick(mHelp);
+          char(VK_F2):
+            MenuClick_Check(StatPopup, mUnitStat);
+          char(VK_F3):
+            MenuClick_Check(StatPopup, mCityStat);
+          char(VK_F4):
+            MenuClick_Check(StatPopup, mScienceStat);
+          char(VK_F5):
+            MenuClick_Check(StatPopup, mEUnitStat);
+          char(VK_F6):
+            MenuClick_Check(StatPopup, mDiagram);
+          char(VK_F7):
+            MenuClick_Check(StatPopup, mWonders);
+          char(VK_F8):
+            MenuClick_Check(StatPopup, mShips);
+          char(VK_F9):
+            MenuClick_Check(StatPopup, mNations);
+          char(VK_F10):
+            MenuClick_Check(StatPopup, mEmpire);
+          char(VK_ADD):
+            EndTurn;
+          '1':
+            MapBtnClick(MapBtn0);
+          '2':
+            MapBtnClick(MapBtn1);
+          '3':
+            MapBtnClick(MapBtn4);
+          '4':
+            MapBtnClick(MapBtn5);
+          '5':
+            MapBtnClick(MapBtn6);
+          'T':
+            MenuClick(mTechTree);
+          'W':
+            MenuClick(mWait);
+        end;
+
+      if UnFocus >= 0 then
+        if Shift = [ssCtrl] then
+          case char(Key) of
+            'C':
+              MenuClick_Check(UnitPopup, mCancel);
+            'D':
+              MenuClick(mDisband);
+            'P':
+              MenuClick_Check(UnitPopup, mPillage);
+            'T':
+              MenuClick_Check(UnitPopup, mSelectTransport);
+          end
+        else if Shift = [] then
+          case char(Key) of
+            ' ':
+              MenuClick(mNoOrders);
+            'A':
+              MenuClick_Check(TerrainPopup, mAirBase);
+            'B':
+              MenuClick_Check(UnitPopup, mCity);
+            'C':
+              MenuClick(mCentre);
+            'E':
               begin
-              if MovieSpeed=3 then AnimationSpeed:=4
-              else if MovieSpeed=2 then AnimationSpeed:=8
-              else AnimationSpeed:=16;
+                InitPopup(TerrainPopup);
+                if mEnhance.Visible and mEnhance.Enabled then
+                  MenuClick(mEnhance)
+                else
+                  MenuClick(mEnhanceDef)
+              end;
+            'F':
+              MenuClick_Check(TerrainPopup, mFort);
+            'G':
+              MenuClick_Check(UnitPopup, mGoOn);
+            'H':
+              MenuClick_Check(UnitPopup, mHome);
+            'I':
+              if JobTest(UnFocus, jFarm, [eTreaty]) then
+                MenuClick(mFarm)
+              else if JobTest(UnFocus, jClear, [eTreaty]) then
+                MenuClick(mClear)
+              else
+                MenuClick_Check(TerrainPopup, mIrrigation);
+            'L':
+              MenuClick_Check(UnitPopup, mLoad);
+            'M':
+              if JobTest(UnFocus, jAfforest, [eTreaty]) then
+                MenuClick(mAfforest)
+              else
+                MenuClick_Check(TerrainPopup, mMine);
+            'N':
+              MenuClick_Check(TerrainPopup, mCanal);
+            'O':
+              MenuClick_Check(TerrainPopup, MTrans);
+            'P':
+              MenuClick_Check(TerrainPopup, mPollution);
+            'R':
+              if JobTest(UnFocus, jRR, [eTreaty]) then
+                MenuClick(mRR)
+              else
+                MenuClick_Check(TerrainPopup, mRoad);
+            'S':
+              MenuClick(mStay);
+            'U':
+              MenuClick_Check(UnitPopup, mUnload);
+            'V':
+              MenuClick_Check(UnitPopup, mRecover);
+            'Z':
+              MenuClick_Check(UnitPopup, mUtilize);
+            #33 .. #40, #97 .. #100, #102 .. #105:
+              begin { arrow keys }
+                DestinationMarkON := false;
+                PaintDestination;
+                MyUn[UnFocus].Status := MyUn[UnFocus].Status and
+                  ($FFFF - usStay - usRecover - usGoto - usEnhance) or
+                  usWaiting;
+                case Key of
+                  VK_NUMPAD1, VK_END:
+                    begin
+                      dx := -1;
+                      dy := 1
+                    end;
+                  VK_NUMPAD2, VK_DOWN:
+                    begin
+                      dx := 0;
+                      dy := 2
+                    end;
+                  VK_NUMPAD3, VK_NEXT:
+                    begin
+                      dx := 1;
+                      dy := 1
+                    end;
+                  VK_NUMPAD4, VK_LEFT:
+                    begin
+                      dx := -2;
+                      dy := 0
+                    end;
+                  VK_NUMPAD6, VK_RIGHT:
+                    begin
+                      dx := 2;
+                      dy := 0
+                    end;
+                  VK_NUMPAD7, VK_HOME:
+                    begin
+                      dx := -1;
+                      dy := -1
+                    end;
+                  VK_NUMPAD8, VK_UP:
+                    begin
+                      dx := 0;
+                      dy := -2
+                    end;
+                  VK_NUMPAD9, VK_PRIOR:
+                    begin
+                      dx := 1;
+                      dy := -1
+                    end;
+                end;
+                MoveUnit(dx, dy, muAutoNext)
+              end;
+          end
+    end;
+
+    procedure TMainScreen.MenuClick(Sender: TObject);
+
+      function DoJob(j0: integer): integer;
+      var
+        Loc0, Movement0: integer;
+      begin
+        with MyUn[UnFocus] do
+        begin
+          DestinationMarkON := false;
+          PaintDestination;
+          Loc0 := Loc;
+          Movement0 := Movement;
+          if j0 < 0 then
+            result := ProcessEnhancement(UnFocus, MyData.EnhancementJobs)
+            // terrain enhancement
+          else
+            result := Server(sStartJob + j0 shl 4, me, UnFocus, nil^);
+          if result >= rExecuted then
+          begin
+            if result = eDied then
+              UnFocus := -1;
+            PaintLoc(Loc0);
+            if UnFocus >= 0 then
+            begin
+              if (j0 < 0) and (result <> eJobDone) then
+              // multi-turn terrain enhancement
+                Status := Status and ($FFFF - usStay - usRecover - usGoto) or
+                  usEnhance
+              else
+                Status := Status and
+                  ($FFFF - usStay - usRecover - usGoto - usEnhance);
+              if (Job <> jNone) or (Movement0 < 100) then
+              begin
+                Status := Status and not usWaiting;
+                NextUnit(UnStartLoc, true);
               end
+              else
+                PanelPaint
+            end
             else
+              NextUnit(UnStartLoc, true);
+          end
+        end;
+        case result of
+          eNoBridgeBuilding:
+            SoundMessage(Phrases.Lookup('NOBB'), 'INVALID');
+          eNoCityTerrain:
+            SoundMessage(Phrases.Lookup('NOCITY'), 'INVALID');
+          eTreaty:
+            SoundMessage(Tribe[MyRO.Territory[Loc0]].TPhrase('PEACE_NOWORK'),
+              'NOMOVE_TREATY');
+        else
+          if result < rExecuted then
+            Play('INVALID')
+        end
+      end;
+
+    var
+      i, uix, NewFocus, Loc0, OldMaster, Destination, cix, cixOldHome,
+        ServerResult: integer;
+      AltGovs, Changed: boolean;
+      QueryText: string;
+
+    begin
+      if Sender = mResign then
+        if ClientMode = cEditMap then
+        begin
+          if Edited then
+          begin
+            QueryText := Phrases.Lookup('MAP_CLOSE');
+            case SimpleQuery(mkYesNoCancel, QueryText, '') of
+              mrIgnore:
+                Server(sAbandonMap, me, 0, nil^);
+              mrOK:
+                Server(sSaveMap, me, 0, nil^);
+            end
+          end
+          else
+            Server(sAbandonMap, me, 0, nil^)
+        end
+        else
+        begin
+          if Server(sGetGameChanged, 0, 0, nil^) = eOK then
+          begin
+            QueryText := Phrases.Lookup('RESIGN');
+            case SimpleQuery(mkYesNoCancel, QueryText, '') of
+              mrIgnore:
+                Server(sResign, 0, 0, nil^);
+              mrOK:
+                Server(sBreak, 0, 0, nil^)
+            end
+          end
+          else
+            Server(sResign, 0, 0, nil^)
+        end
+      else if Sender = mEmpire then
+        RatesDlg.ShowNewContent(wmPersistent)
+      else if Sender = mRevolution then
+      begin
+        AltGovs := false;
+        for i := 2 to nGov - 1 do
+          if (GovPreq[i] <> preNA) and
+            ((GovPreq[i] = preNone) or (MyRO.Tech[GovPreq[i]] >= tsApplicable))
+          then
+            AltGovs := true;
+
+        if not AltGovs then
+          SoundMessage(Phrases.Lookup('NOALTGOVS'), 'MSG_DEFAULT')
+        else
+        begin
+          Changed := false;
+          if MyRO.Happened and phChangeGov <> 0 then
+          begin
+            ModalSelectDlg.ShowNewContent(wmModal, kGov);
+            if ModalSelectDlg.result >= 0 then
+            begin
+              Play('NEWGOV');
+              Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
+              CityOptimizer_BeginOfTurn;
+              Changed := true;
+            end
+          end
+          else
+            with MessgExDlg do
+            begin // revolution!
+              MessgText := Tribe[me].TPhrase('REVOLUTION');
+              Kind := mkYesNo;
+              IconKind := mikPureIcon;
+              IconIndex := 72; // anarchy palace
+              ShowModal;
+              if ModalResult = mrOK then
               begin
-              if mVeryFastMoves.Checked then AnimationSpeed:=4
-              else if mFastMoves.Checked then AnimationSpeed:=8
-              else AnimationSpeed:=16;
-              end;
-            with MyModel[mix] do
+                Play('REVOLUTION');
+                Server(sRevolution, me, 0, nil^);
+                Changed := true;
+                if NatStatDlg.Visible then
+                  NatStatDlg.Close;
+                if CityDlg.Visible then
+                  CityDlg.Close;
+              end
+            end;
+          if Changed then
+            UpdateViews(true);
+        end
+      end
+      else if Sender = mWebsite then
+        ShellExecute(Handle, 'open', 'http://c-evo.org', '', '', SW_SHOWNORMAL)
+      else if Sender = mRandomMap then
+      begin
+        if not Edited or (SimpleQuery(mkYesNo, Phrases.Lookup('MAP_RANDOM'), '')
+          = mrOK) then
+        begin
+          Server(sRandomMap, me, 0, nil^);
+          Edited := true;
+          MapValid := false;
+          PaintAllMaps;
+        end
+      end
+      else if Sender = mJump then
+      begin
+        if supervising then
+          Jump[0] := 20
+        else
+          Jump[me] := 20;
+        EndTurn(true);
+      end
+      else if Sender = mRun then
+      begin
+        if supervising then
+          Jump[0] := 999999
+        else
+          Jump[me] := 999999;
+        EndTurn(true);
+      end
+      else if Sender = mEnhanceDef then
+      begin
+        if UnFocus >= 0 then
+          EnhanceDlg.ShowNewContent(wmPersistent,
+            MyMap[MyUn[UnFocus].Loc] and fTerrain)
+        else
+          EnhanceDlg.ShowNewContent(wmPersistent)
+      end
+      else if Sender = mCityTypes then
+        CityTypeDlg.ShowNewContent(wmModal)
+        // must be modal because types are not saved before closing
+      else if Sender = mUnitStat then
+      begin
+        if G.Difficulty[me] > 0 then
+          ListDlg.ShowNewContent_MilReport(wmPersistent, me)
+        else
+        begin
+          i := 1;
+          while (i < nPl) and (1 shl i and MyRO.Alive = 0) do
+            inc(i);
+          if i < nPl then
+            ListDlg.ShowNewContent_MilReport(wmPersistent, i);
+        end;
+      end
+      else if Sender = mEUnitStat then
+      begin
+        if MyRO.nEnemyModel > 0 then
+          ListDlg.ShowNewContent(wmPersistent, kAllEModels);
+      end
+      else if Sender = mCityStat then
+        ListDlg.ShowNewContent(wmPersistent, kCities)
+      else if Sender = mScienceStat then
+        ListDlg.ShowNewContent(wmPersistent, kScience)
+      else if Sender = mNations then
+        NatStatDlg.ShowNewContent(wmPersistent)
+      else if Sender = mHelp then
+        if ClientMode = cEditMap then
+          HelpDlg.ShowNewContent(wmPersistent, hkText,
+            HelpDlg.TextIndex('MAPEDIT'))
+        else
+          HelpDlg.ShowNewContent(wmPersistent, hkMisc, miscMain)
+      else if Sender = mTechTree then
+        TechTreeDlg.ShowModal
+      else if Sender = mWonders then
+        WondersDlg.ShowNewContent(wmPersistent)
+      else if Sender = mDiagram then
+        DiaDlg.ShowNewContent_Charts(wmPersistent)
+      else if Sender = mShips then
+        DiaDlg.ShowNewContent_Ship(wmPersistent)
+      else if Sender = mWait then
+      begin
+        if UnFocus >= 0 then
+        begin
+          DestinationMarkON := false;
+          PaintDestination;
+          MyUn[UnFocus].Status := MyUn[UnFocus].Status and
+            ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
+        end;
+        NextUnit(-1, false);
+      end
+      else if UnFocus >= 0 then
+        with MyUn[UnFocus] do
+          if Sender = mGoOn then
+          begin
+            if Status shr 16 = $7FFF then
+              Destination := maNextCity
+            else
+              Destination := Status shr 16;
+            Status := Status and not(usStay or usRecover) or usWaiting;
+            MoveToLoc(Destination, true);
+          end
+          else if Sender = mHome then
+            if MyMap[Loc] and fCity <> 0 then
+            begin
+              cixOldHome := Home;
+              if Server(sSetUnitHome, me, UnFocus, nil^) >= rExecuted then
               begin
-              if (Kind=mkDiplomat) or (Domain=dAir)
-                or (Cap[mcRadar]+Cap[mcCarrier]+Cap[mcAcademy]>0)
-                or (MyMap[ToLoc] and fTerrain=fMountains)
-                or (MyMap[ToLoc] and fTerImp=tiFort)
-                or (MyMap[ToLoc] and fTerImp=tiBase) then
-                CurrentMoveInfo.AfterMovePaintRadius:=2
-              else CurrentMoveInfo.AfterMovePaintRadius:=1;
-              if (MyRO.Wonder[woShinkansen].EffectiveOwner=me)
-                and (Domain=dGround)
-                and (MyMap[FromLoc] and (fRR or fCity)<>0)
-                and (MyMap[ToLoc] and (fRR or fCity)<>0)
-                and (Flags and umPlaneUnloading=0) then
-                AnimationSpeed:=4;
-              ShowMoveDomain:=Domain;
-              IsAlpine:= Cap[mcAlpine]>0;
+                CityOptimizer_CityChange(cixOldHome);
+                CityOptimizer_CityChange(Home);
+                UpdateViews(true);
+              end
+              else
+                Play('INVALID');
+            end
+            else
+            begin
+              Status := Status and not(usStay or usRecover or usEnhance);
+              MoveToLoc(maNextCity, true)
+            end
+          else if Sender = mCentre then
+          begin
+            Centre(Loc);
+            PaintAllMaps
+          end
+          else if Sender = mCity then
+          begin
+            Loc0 := Loc;
+            if MyMap[Loc] and fCity = 0 then
+            begin // build city
+              if DoJob(jCity) = eCity then
+              begin
+                MapValid := false;
+                PaintAll;
+                ZoomToCity(Loc0, true, chFounded);
               end
             end
+            else
+            begin
+              CityOptimizer_BeforeRemoveUnit(UnFocus);
+              ServerResult := Server(sAddToCity, me, UnFocus, nil^);
+              if ServerResult >= rExecuted then
+              begin
+                cix := MyRO.nCity - 1;
+                while (cix >= 0) and (MyCity[cix].Loc <> Loc0) do
+                  dec(cix);
+                assert(cix >= 0);
+                CityOptimizer_CityChange(cix);
+                CityOptimizer_AfterRemoveUnit; // does nothing here
+                SetTroopLoc(Loc0);
+                UpdateViews(true);
+                DestinationMarkON := false;
+                PaintDestination;
+                UnFocus := -1;
+                PaintLoc(Loc0);
+                NextUnit(UnStartLoc, true);
+              end
+              else if ServerResult = eMaxSize then
+                SimpleMessage(Phrases.Lookup('ADDTOMAXSIZE'));
+            end
           end
+          else if Sender = mRoad then
+            DoJob(jRoad)
+          else if Sender = mRR then
+            DoJob(jRR)
+          else if Sender = mClear then
+            DoJob(jClear)
+          else if Sender = mIrrigation then
+            DoJob(jIrr)
+          else if Sender = mFarm then
+            DoJob(jFarm)
+          else if Sender = mAfforest then
+            DoJob(jAfforest)
+          else if Sender = mMine then
+            DoJob(jMine)
+          else if Sender = mCanal then
+            DoJob(jCanal)
+          else if Sender = MTrans then
+            DoJob(jTrans)
+          else if Sender = mFort then
+            DoJob(jFort)
+          else if Sender = mAirBase then
+            DoJob(jBase)
+          else if Sender = mPollution then
+            DoJob(jPoll)
+          else if Sender = mPillage then
+            DoJob(jPillage)
+          else if Sender = mEnhance then
+            DoJob(-1)
+          else if Sender = mStay then
+          begin
+            DestinationMarkON := false;
+            PaintDestination;
+            Status := Status and ($FFFF - usRecover - usGoto - usEnhance)
+              or usStay;
+            if Job > jNone then
+              Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+            NextUnit(UnStartLoc, true)
+          end
+          else if Sender = mRecover then
+          begin
+            DestinationMarkON := false;
+            PaintDestination;
+            Status := Status and ($FFFF - usStay - usGoto - usEnhance) or
+              usRecover;
+            if Job > jNone then
+              Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+            NextUnit(UnStartLoc, true)
+          end
+          else if Sender = mNoOrders then
+          begin
+            Status := Status and not usWaiting;
+            NextUnit(UnStartLoc, true)
+          end
+          else if Sender = mCancel then
+          begin
+            DestinationMarkON := false;
+            PaintDestination;
+            Status := Status and ($FFFF - usRecover - usGoto - usEnhance);
+            if Job > jNone then
+              Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+          end
+          else if (Sender = mDisband) or (Sender = mUtilize) then
+          begin
+            if (Sender = mUtilize) and
+              not(Server(sRemoveUnit - sExecute, me, UnFocus, nil^) = eUtilized)
+            then
+            begin
+              SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE'));
+              // freight for colony ship is the only case in which the command is
+              // available to player though not valid
+              exit
+            end;
+            if (Sender = mUtilize) and (Health < 100) then
+              if SimpleQuery(mkYesNo, Phrases.Lookup('DAMAGED_UTILIZE'), '') <> mrOK
+              then
+                exit;
+            Loc0 := Loc;
+            CityOptimizer_BeforeRemoveUnit(UnFocus);
+            if Server(sRemoveUnit, me, UnFocus, nil^) = eUtilized then
+              Play('CITY_UTILIZE')
+            else
+              Play('DISBAND');
+            CityOptimizer_AfterRemoveUnit;
+            SetTroopLoc(Loc0);
+            UpdateViews(true);
+            DestinationMarkON := false;
+            PaintDestination;
+            UnFocus := -1;
+            PaintLoc(Loc0);
+            NextUnit(UnStartLoc, true);
+          end
+          else if Sender = mLoad then
+          begin
+            i := Server(sLoadUnit, me, UnFocus, nil^);
+            if i >= rExecuted then
+            begin
+              if MyModel[mix].Domain = dAir then
+                Play('MOVE_PLANELANDING')
+              else
+                Play('MOVE_LOAD');
+              DestinationMarkON := false;
+              PaintDestination;
+              Status := Status and
+                ($FFFF - usWaiting - usStay - usRecover - usGoto - usEnhance);
+              NextUnit(UnStartLoc, true);
+            end
+            else if i = eNoTime_Load then
+              if MyModel[mix].Domain = dAir then
+                SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+              else
+                SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+                  [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+          end
+          else if Sender = mUnload then
+            if Master >= 0 then
+            begin
+              OldMaster := Master;
+              i := Server(sUnloadUnit, me, UnFocus, nil^);
+              if i >= rExecuted then
+              begin
+                if MyModel[mix].Domain = dAir then
+                  Play('MOVE_PLANESTART')
+                else if (MyModel[MyUn[OldMaster].mix].Domain = dAir) and
+                  (MyMap[Loc] and fCity = 0) and
+                  (MyMap[Loc] and fTerImp <> tiBase) then
+                  Play('MOVE_PARACHUTE')
+                else
+                  Play('MOVE_UNLOAD');
+                Status := Status and not usWaiting;
+                if MyModel[mix].Domain <> dAir then
+                  NextUnit(Loc, true)
+                else
+                  PanelPaint
+              end
+              else if i = eNoTime_Load then
+                if MyModel[mix].Domain = dAir then
+                  SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+                else
+                  SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+                    [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+            end
+            else
+            begin
+              NewFocus := -1;
+              uix := UnFocus;
+              for i := 1 to MyRO.nUn - 1 do
+              begin
+                uix := (uix + MyRO.nUn - 1) mod MyRO.nUn;
+                if (MyUn[uix].Master = UnFocus) and
+                  (MyUn[uix].Movement = integer(MyModel[MyUn[uix].mix].speed))
+                then
+                begin
+                  MyUn[uix].Status := MyUn[uix].Status or usWaiting;
+                  NewFocus := uix
+                end;
+              end;
+              if NewFocus >= 0 then
+              begin
+                SetUnFocus(NewFocus);
+                SetTroopLoc(Loc);
+                PanelPaint
+              end
+            end
+          else if Sender = mSelectTransport then
+            Server(sSelectTransport, me, UnFocus, nil^)
+    end;
+
+    procedure TMainScreen.InitPopup(Popup: TPopupMenu);
+    var
+      i, p1, Tile, Test: integer;
+      NoSuper, extended, Multi, NeedSep, HaveCities: boolean;
+      LastSep, m: TMenuItem;
+      mox: ^TModel;
+    begin
+      NoSuper := not supervising and (1 shl me and MyRO.Alive <> 0);
+      HaveCities := false;
+      for i := 0 to MyRO.nCity - 1 do
+        if MyCity[i].Loc >= 0 then
+        begin
+          HaveCities := true;
+          Break
+        end;
+      if Popup = GamePopup then
+      begin
+        mTechTree.Visible := ClientMode <> cEditMap;
+        mResign.Enabled := supervising or (me = 0) and (ClientMode < scContact);
+        mRandomMap.Visible := (ClientMode = cEditMap) and
+          (Server(sMapGeneratorRequest, me, 0, nil^) = eOK);
+        mOptions.Visible := ClientMode <> cEditMap;
+        mManip.Visible := ClientMode <> cEditMap;
+        if ClientMode <> cEditMap then
+        begin
+          mWaitTurn.Visible := NoSuper;
+          mRep.Visible := NoSuper;
+          mRepList.Visible := NoSuper;
+          mRepScreens.Visible := NoSuper;
+          N10.Visible := NoSuper;
+          mOwnMovement.Visible := NoSuper;
+          mAllyMovement.Visible := NoSuper;
+          case SoundMode of
+            smOff:
+              mSoundOff.Checked := true;
+            smOn:
+              mSoundOn.Checked := true;
+            smOnAlt:
+              mSoundOnAlt.Checked := true;
+          end;
+
+          for i := 0 to nTestFlags - 1 do
+            mManip[i].Checked := MyRO.TestFlags and (1 shl i) <> 0;
+          mManip.Enabled := supervising or (me = 0);
+
+          Multi := false;
+          for p1 := 1 to nPl - 1 do
+            if G.RO[p1] <> nil then
+              Multi := true;
+          mEnemyMovement.Visible := not Multi;
+        end;
+        mMacro.Visible := NoSuper and (ClientMode < scContact);
+        if NoSuper and (ClientMode < scContact) then
+        begin
+          mCityTypes.Enabled := false;
+          // check if city types already usefull:
+          if MyRO.nCity > 0 then
+            for i := 28 to nImp - 1 do
+              if (i <> imTrGoods) and (Imp[i].Kind = ikCommon) and
+                (Imp[i].Preq <> preNA) and
+                ((Imp[i].Preq = preNone) or
+                (MyRO.Tech[Imp[i].Preq] >= tsApplicable)) then
+              begin
+                mCityTypes.Enabled := true;
+                Break
+              end;
+        end;
+        mViewpoint.Visible := (ClientMode <> cEditMap) and supervising;
+        mViewpoint.Enabled := G.RO[0].Turn > 0;
+        if supervising then
+        begin
+          EmptyMenu(mViewpoint);
+          for p1 := 0 to nPl - 1 do
+            if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
+            begin
+              m := TMenuItem.Create(mViewpoint);
+              if p1 = 0 then
+                m.Caption := Phrases.Lookup('SUPER')
+              else
+                m.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
+              m.Tag := p1;
+              m.OnClick := ViewpointClick;
+              if p1 < 10 then
+                m.ShortCut := ShortCut(48 + p1, [ssCtrl]);
+              m.RadioItem := true;
+              if p1 = me then
+                m.Checked := true;
+              mViewpoint.Add(m);
+            end
+        end;
+        mDebugMap.Visible := (ClientMode <> cEditMap) and supervising;
+        if supervising then
+        begin
+          EmptyMenu(mDebugMap);
+          for p1 := 0 to nPl - 1 do
+            if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
+            begin
+              m := TMenuItem.Create(mDebugMap);
+              if p1 = 0 then
+                m.Caption := Phrases2.Lookup('MENU_DEBUGMAPOFF')
+              else
+                m.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
+              if p1 = 0 then
+                m.Tag := -1
+              else
+                m.Tag := p1;
+              m.OnClick := DebugMapClick;
+              if p1 < 10 then
+                m.ShortCut := ShortCut(48 + p1, [ssAlt]);
+              m.RadioItem := true;
+              if m.Tag = IsoEngine.pDebugMap then
+                m.Checked := true;
+              mDebugMap.Add(m);
+            end
+        end;
+        mSmallTiles.Checked := xxt = 33;
+        mNormalTiles.Checked := xxt = 48;
+      end
+      else if Popup = StatPopup then
+      begin
+        mEmpire.Visible := NoSuper;
+        mEmpire.Enabled := MyRO.Government <> gAnarchy;
+        mRevolution.Visible := NoSuper;
+        mRevolution.Enabled := (MyRO.Government <> gAnarchy) and
+          (ClientMode < scContact);
+        mUnitStat.Enabled := NoSuper or (MyRO.Turn > 0);
+        mCityStat.Visible := 1 shl me and MyRO.Alive <> 0;
+        mCityStat.Enabled := HaveCities;
+        mScienceStat.Visible := true;
+        mScienceStat.Enabled := not NoSuper or (MyRO.ResearchTech >= 0) or
+          (MyRO.Happened and phTech <> 0) or (MyRO.Happened and phGameEnd <> 0)
+        // no researchtech in case just completed
+          or (MyRO.TestFlags and (tfAllTechs or tfUncover or
+          tfAllContact) <> 0);
+        mEUnitStat.Enabled := MyRO.nEnemyModel > 0;
+        { mWonders.Enabled:= false;
+          for i:=0 to 27 do if MyRO.Wonder[i].CityID<>-1 then
+          mWonders.Enabled:=true; }
+        mDiagram.Enabled := MyRO.Turn >= 2;
+        mShips.Enabled := false;
+        for p1 := 0 to nPl - 1 do
+          if MyRO.Ship[p1].Parts[spComp] + MyRO.Ship[p1].Parts[spPow] +
+            MyRO.Ship[p1].Parts[spHab] > 0 then
+            mShips.Enabled := true;
+      end
+      else if Popup = UnitPopup then
+      begin
+        mox := @MyModel[MyUn[UnFocus].mix];
+        Tile := MyMap[MyUn[UnFocus].Loc];
+        extended := Tile and fCity = 0;
+        if extended then
+        begin
+          mCity.Caption := Phrases.Lookup('BTN_FOUND');
+          mHome.Caption := Phrases.Lookup('BTN_MOVEHOME')
+        end
         else
+        begin
+          mCity.Caption := Phrases.Lookup('BTN_ADD');
+          mHome.Caption := Phrases.Lookup('BTN_SETHOME')
+        end;
+
+        extended := extended and
+          ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves) and
+          (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) and
+          (MyUn[UnFocus].Master < 0) and (Tile and fDeadLands = 0);
+        if (mox.Kind = mkFreight) and (Tile and fCity <> 0) and
+          not Phrases2FallenBackToEnglish or
+          (Server(sRemoveUnit - sExecute, me, UnFocus, nil^) = eUtilized) then
+        begin
+          mDisband.Visible := false;
+          mUtilize.Visible := true;
+          if mox.Kind = mkFreight then
+            mUtilize.Caption := Phrases.Lookup('UTILIZE')
+          else
+            mUtilize.Caption := Phrases.Lookup('INTEGRATE')
+        end
+        else
+        begin
+          mDisband.Visible := true;
+          mUtilize.Visible := false
+        end;
+        mGoOn.Visible := MyUn[UnFocus].Status and (usGoto or usWaiting)
+          = usGoto or usWaiting;
+        mHome.Visible := HaveCities;
+        mRecover.Visible := (MyUn[UnFocus].Health < 100) and
+          (Tile and fTerrain >= fGrass) and
+          ((MyRO.Wonder[woGardens].EffectiveOwner = me) or
+          (Tile and fTerrain <> fArctic) and (Tile and fTerrain <> fDesert)) and
+          not((mox.Domain = dAir) and (Tile and fCity = 0) and
+          (Tile and fTerImp <> tiBase));
+        mStay.Visible := not((mox.Domain = dAir) and (Tile and fCity = 0) and
+          (Tile and fTerImp <> tiBase));
+        mCity.Visible := extended and (mox.Kind = mkSettler) or
+          (Tile and fCity <> 0) and ((mox.Kind in [mkSettler, mkSlaves]) or
+          (MyUn[UnFocus].Flags and unConscripts <> 0));
+        mPillage.Visible := (Tile and (fRoad or fRR or fCanal or fTerImp) <> 0)
+          and (MyUn[UnFocus].Master < 0) and (mox.Domain = dGround);
+        mCancel.Visible := (MyUn[UnFocus].Job > jNone) or
+          (MyUn[UnFocus].Status and (usRecover or usGoto) <> 0);
+
+        Test := Server(sLoadUnit - sExecute, me, UnFocus, nil^);
+        mLoad.Visible := (Test >= rExecuted) or (Test = eNoTime_Load);
+        mUnload.Visible := (MyUn[UnFocus].Master >= 0) or
+          (MyUn[UnFocus].TroopLoad + MyUn[UnFocus].AirLoad > 0);
+        mSelectTransport.Visible := Server(sSelectTransport - sExecute, me,
+          UnFocus, nil^) >= rExecuted;
+      end
+      else { if Popup=TerrainPopup then }
+      begin
+        mox := @MyModel[MyUn[UnFocus].mix];
+        Tile := MyMap[MyUn[UnFocus].Loc];
+        extended := Tile and fCity = 0;
+
+        if (Tile and fRiver <> 0) and
+          (MyRO.Tech[adBridgeBuilding] >= tsApplicable) then
+        begin
+          mRoad.Caption := Phrases.Lookup('BTN_BUILDBRIDGE');
+          mRR.Caption := Phrases.Lookup('BTN_BUILDRRBRIDGE');
+        end
+        else
+        begin
+          mRoad.Caption := Phrases.Lookup('BTN_BUILDROAD');
+          mRR.Caption := Phrases.Lookup('BTN_BUILDRR');
+        end;
+        if Tile and fTerrain = fForest then
+          mClear.Caption := Phrases.Lookup('BTN_CLEAR')
+        else if Tile and fTerrain = fDesert then
+          mClear.Caption := Phrases.Lookup('BTN_UNDESERT')
+        else
+          mClear.Caption := Phrases.Lookup('BTN_DRAIN');
+
+        extended := extended and
+          ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves) and
+          (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) and
+          (MyUn[UnFocus].Master < 0);
+        if extended then
+        begin
+          mRoad.Visible := JobTest(UnFocus, jRoad,
+            [eNoBridgeBuilding, eTreaty]);
+          mRR.Visible := JobTest(UnFocus, jRR, [eNoBridgeBuilding, eTreaty]);
+          mClear.Visible := JobTest(UnFocus, jClear, [eTreaty]);
+          mIrrigation.Visible := JobTest(UnFocus, jIrr, [eTreaty]);
+          mFarm.Visible := JobTest(UnFocus, jFarm, [eTreaty]);
+          mAfforest.Visible := JobTest(UnFocus, jAfforest, [eTreaty]);
+          mMine.Visible := JobTest(UnFocus, jMine, [eTreaty]);
+          MTrans.Visible := JobTest(UnFocus, jTrans, [eTreaty]);
+          mCanal.Visible := JobTest(UnFocus, jCanal, [eTreaty]);
+          mFort.Visible := JobTest(UnFocus, jFort, [eTreaty]);
+          mAirBase.Visible := JobTest(UnFocus, jBase, [eTreaty]);
+          mPollution.Visible := JobTest(UnFocus, jPoll, [eTreaty]);
+          mEnhance.Visible := (Tile and fDeadLands = 0) and
+            (MyData.EnhancementJobs[MyMap[MyUn[UnFocus].Loc] and fTerrain, 0]
+            <> jNone);
+        end
+        else
+        begin
+          for i := 0 to Popup.Items.Count - 1 do
+            Popup.Items[i].Visible := false;
+        end;
+      end;
+
+      // set menu seperators
+      LastSep := nil;
+      NeedSep := false;
+      for i := 0 to Popup.Items.Count - 1 do
+        if Popup.Items[i].Caption = '-' then
+        begin
+          Popup.Items[i].Visible := NeedSep;
+          if NeedSep then
+            LastSep := Popup.Items[i];
+          NeedSep := false
+        end
+        else if Popup.Items[i].Visible then
+          NeedSep := true;
+      if (LastSep <> nil) and not NeedSep then
+        LastSep.Visible := false
+    end;
+
+    procedure TMainScreen.PanelBtnClick(Sender: TObject);
+    var
+      Popup: TPopupMenu;
+    begin
+      if Sender = UnitBtn then
+        Popup := UnitPopup
+      else { if Sender=TerrainBtn then }
+        Popup := TerrainPopup;
+      InitPopup(Popup);
+      if FullScreen then
+        Popup.Popup(Left + TControl(Sender).Left, Top + TControl(Sender).Top)
+      else
+        Popup.Popup(Left + TControl(Sender).Left + 4, Top + TControl(Sender).Top
+          + GetSystemMetrics(SM_CYCAPTION) + 4);
+    end;
+
+    procedure TMainScreen.CityClosed(Activateuix: integer; StepFocus: boolean;
+      SelectFocus: boolean);
+    begin
+      if supervising then
+      begin
+        SetTroopLoc(-1);
+        PanelPaint
+      end
+      else
+      begin
+        if Activateuix >= 0 then
+        begin
+          SetUnFocus(Activateuix);
+          SetTroopLoc(MyUn[Activateuix].Loc);
+          if SelectFocus then
+            FocusOnLoc(TroopLoc, flRepaintPanel)
+          else
+            PanelPaint
+        end
+        else if StepFocus then
+          NextUnit(TroopLoc, true)
+        else
+        begin
+          SetTroopLoc(-1);
+          PanelPaint
+        end
+      end
+    end;
+
+    procedure TMainScreen.Toggle(Sender: TObject);
+    begin
+      TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked
+    end;
+
+    procedure TMainScreen.PanelBoxMouseMove(Sender: TObject; Shift: TShiftState;
+      x, y: integer);
+    var
+      xCentre, yCentre: integer;
+    begin
+      if Tracking and (ssLeft in Shift) then
+      begin
+        if (x >= xMini + 2) and (y >= yMini + 2) and (x < xMini + 2 + 2 * G.lx)
+          and (y < yMini + 2 + G.ly) then
+        begin
+          xCentre := (xwMini + (x - xMini - 2) div 2 + G.lx div 2 +
+            MapWidth div (xxt * 4)) mod G.lx;
+          yCentre := (y - yMini - 2);
+          xw := (xCentre - MapWidth div (xxt * 4) + G.lx) mod G.lx;
+          if ywmax <= 0 then
+            yw := ywcenter
+          else
           begin
-          CurrentMoveInfo.IsAlly:= MyRO.Treaty[Owner]=trAlliance;
-          if GameMode=cMovie then
-            CurrentMoveInfo.DoShow:=true
-          else if CurrentMoveInfo.IsAlly then
-            CurrentMoveInfo.DoShow:=not mAlNoMoves.Checked
-              and not(mAlEffectiveMovesOnly.Checked and (Command<>cShowCapturing))
-          else CurrentMoveInfo.DoShow:=not mEnNoMoves.Checked
-            and not(mEnAttacks.Checked and (Command<>cShowCapturing));
-          if CurrentMoveInfo.DoShow then
-            begin
-            if Command=cShowCapturing then
-              begin // show capture message
-              if MyMap[ToLoc] and fOwned<>0 then
-                begin // own city, search
-                cix:=MyRO.nCity-1;
-                while (cix>=0) and (MyCity[cix].Loc<>ToLoc) do
-                  dec(cix);
-                s:=CityName(MyCity[cix].ID);
-                end
-              else
-                begin // foreign city, search
-                ecix:=MyRO.nEnemyCity-1;
-                while (ecix>=0) and (MyRO.EnemyCity[ecix].Loc<>ToLoc) do
-                  dec(ecix);
-                s:=CityName(MyRO.EnemyCity[ecix].ID);
-                end;
-              TribeMessage(Owner, Format(Tribe[Owner].TPhrase('CAPTURE'),[s]), '');
-              Update; // remove message box from screen
-              end;
-
-            if CurrentMoveInfo.IsAlly then
-              begin // allied unit -- make discovered land visible
-              if mAlFastMoves.Checked then AnimationSpeed:=8
-              else AnimationSpeed:=16;
-              with MyRO.EnemyModel[emix] do
-                if (Kind=mkDiplomat) or (Domain=dAir) or (ATrans_Fuel>0)
-                  or (Cap and (1 shl (mcRadar-mcFirstNonCap) or 1 shl (mcAcademy-mcFirstNonCap))<>0)
-                  or (MyMap[ToLoc] and fTerrain=fMountains)
-                  or (MyMap[ToLoc] and fTerImp=tiFort)
-                  or (MyMap[ToLoc] and fTerImp=tiBase) then
-                  CurrentMoveInfo.AfterMovePaintRadius:=2
-                else CurrentMoveInfo.AfterMovePaintRadius:=1
-              end
+            yw := (yCentre - MapHeight div (yyt * 2) + 1) and not 1;
+            if yw < 0 then
+              yw := 0
+            else if yw > ywmax then
+              yw := ywmax;
+          end;
+          BitBlt(Buffer.Canvas.Handle, 0, 0, G.lx * 2, G.ly, Mini.Canvas.Handle,
+            0, 0, SRCCOPY);
+          if ywmax <= 0 then
+            Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), 0,
+              x - xMini - 2 + MapWidth div (xxt * 2) - 1, G.ly - 1,
+              MainTexture.clMark, MainTexture.clMark)
+          else
+            Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), yw,
+              x - xMini - 2 + MapWidth div (xxt * 2) - 1,
+              yw + MapHeight div yyt - 2, MainTexture.clMark,
+              MainTexture.clMark);
+          BitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+            Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+          MainOffscreenPaint;
+          RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini +
+            2, xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini
+            + 2 + G.ly);
+          Update;
+        end
+      end
+      else
+        Tracking := false
+    end;
+
+    procedure TMainScreen.PanelBoxMouseUp(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    begin
+      if Tracking then
+      begin
+        Tracking := false;
+        xwMini := xw;
+        ywMini := yw;
+        MiniPaint;
+        PanelPaint;
+      end
+    end;
+
+    procedure TMainScreen.MapBoxMouseMove(Sender: TObject; Shift: TShiftState;
+      x, y: integer);
+    var
+      MouseLoc: integer;
+    begin
+      xMouse := x;
+      yMouse := y;
+      if (ClientMode = cEditMap) and (ssLeft in Shift) and not Tracking then
+      begin
+        MouseLoc := LocationOfScreenPixel(x, y);
+        if MouseLoc <> BrushLoc then
+          MapBoxMouseDown(nil, mbLeft, Shift, x, y);
+      end
+      (* else if idle and (UnFocus>=0) then
+        begin
+        qx:=(xMouse*32+yMouse*66+16*66) div(32*66)-1;
+        qy:=(yMouse*66-xMouse*32-16*66+2000*33*32) div(32*66)-999;
+        MouseLoc:=(xw+(qx-qy+2048) div 2-1024+G.lx) mod G.lx+G.lx*(yw+qx+qy);
+        ShowMoveHint(MouseLoc);
+        end *)
+    end;
+
+    procedure TMainScreen.mShowClick(Sender: TObject);
+    begin
+      TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked;
+      SetMapOptions;
+      MapValid := false;
+      PaintAllMaps;
+    end;
+
+    procedure TMainScreen.mNamesClick(Sender: TObject);
+    var
+      p1: integer;
+    begin
+      mNames.Checked := not mNames.Checked;
+      GenerateNames := mNames.Checked;
+      for p1 := 0 to nPl - 1 do
+        if Tribe[p1] <> nil then
+          if GenerateNames then
+            Tribe[p1].NumberName := -1
+          else
+            Tribe[p1].NumberName := p1;
+      MapValid := false;
+      PaintAll;
+    end;
+
+    function TMainScreen.IsPanelPixel(x, y: integer): boolean;
+    begin
+      result := (y >= TopBarHeight + MapHeight) or
+        (y >= ClientHeight - PanelHeight) and
+        ((x < xMidPanel) or (x >= xRightPanel))
+    end;
+
+    procedure TMainScreen.FormMouseDown(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    begin
+      if idle then
+        if (x < 40) and (y < 40) then
+        begin
+          if GameMode <> cMovie then
+          begin
+            InitPopup(GamePopup);
+            if FullScreen then
+              GamePopup.Popup(Left, Top + TopBarHeight - 1)
             else
-              begin
-              if mEnFastMoves.Checked then AnimationSpeed:=8
-              else AnimationSpeed:=16;
-              CurrentMoveInfo.AfterMovePaintRadius:=0; // enemy unit, nothing discovered
-              end;
-            if GameMode=cMovie then
-              begin
-              if MovieSpeed=3 then AnimationSpeed:=4
-              else if MovieSpeed=2 then AnimationSpeed:=8
-              else AnimationSpeed:=16;
-              end;
-            ShowMoveDomain:=MyRO.EnemyModel[emix].Domain;
-            IsAlpine:= MyRO.EnemyModel[emix].Cap and (1 shl (mcAlpine-mcFirstNonCap))<>0;
-            end
-          end;
-
-        if CurrentMoveInfo.DoShow then
-          begin
-          if Command=cShowCapturing then Play('MOVE_CAPTURE')
-          else if EndHealth<=0 then Play('MOVE_DIE')
-          else if Flags and umSpyMission<>0 then Play('MOVE_COVERT')
-          else if Flags and umShipLoading<>0 then
-            if ShowMoveDomain=dAir then Play('MOVE_PLANELANDING')
-            else Play('MOVE_LOAD')
-          else if Flags and umPlaneLoading<>0 then Play('MOVE_LOAD')
-          else if Flags and umShipUnloading<>0 then
-            if ShowMoveDomain=dAir then Play('MOVE_PLANESTART')
-            else Play('MOVE_UNLOAD')
-          else if Flags and umPlaneUnloading<>0 then
-            if (MyMap[FromLoc] and fCity=0)
-              and (MyMap[FromLoc] and fTerImp<>tiBase) then
-              Play('MOVE_PARACHUTE')
-            else Play('MOVE_UNLOAD')
-          else if (ShowMoveDomain=dGround) and not IsAlpine
-            and (MyMap[ToLoc] and fTerrain=fMountains)
-            and ((MyMap[FromLoc] and (fRoad or fRR or fCity)=0)
-              or (MyMap[ToLoc] and (fRoad or fRR or fCity)=0)) then
-            Play('MOVE_MOUNTAIN');
-
-          FocusOnLoc(FromLoc,flImmUpdate);
-          PaintLoc_BeforeMove(FromLoc);
-          if Command=cShowCapturing then
-            MoveOnScreen(TShowMove(Data),1,32,32)
-          else MoveOnScreen(TShowMove(Data),1,AnimationSpeed,AnimationSpeed)
-          end // if CurrentMoveInfo.DoShow
-        else MapValid:=false;
-        end
-      end;
-
-  cShowAttacking:
-    if (idle and (NewPlayer=me)
-      or not idle and not skipped and (TShowMove(Data).emix<>$FFFF))
-      and not ((GameMode=cMovie) and (MovieSpeed=4)) then
-      begin
-      assert(NewPlayer=me);
-      if not idle or (GameMode=cMovie) then
-        Application.ProcessMessages;
-      with TShowMove(Data) do
-        begin
-        CurrentMoveInfo.AfterAttackExpeller:=-1;
-        CurrentMoveInfo.DoShow:=false;
-        if idle then
-          CurrentMoveInfo.DoShow:=true // own unit -- always show attacks
-        else
-          begin
-          CurrentMoveInfo.IsAlly:= MyRO.Treaty[Owner]=trAlliance;
-          if CurrentMoveInfo.IsAlly then
-            CurrentMoveInfo.DoShow:=not mAlNoMoves.Checked
-          else CurrentMoveInfo.DoShow:=not mEnNoMoves.Checked;
-          end;
-        if CurrentMoveInfo.DoShow then
-          begin
-          ToLoc:=dLoc(FromLoc,dx,dy);
-          if Tribe[Owner].ModelPicture[mix].HGr=0 then
-            InitEnemyModel(emix);
-
-          if (MyMap[ToLoc] and (fCity or fUnit or fOwned) = fCity or fOwned) then
-            begin // tell about bombardment
-            cix:=MyRO.nCity-1;
-            while (cix>=0) and (MyCity[cix].Loc<>ToLoc) do
-              dec(cix);
-            if MyCity[cix].Status and csToldBombard=0 then
-              begin
-              if not supervising then
-                MyCity[cix].Status:=MyCity[cix].Status or csToldBombard;
-              s:=CityName(MyCity[cix].ID);
-              SoundMessageEx(Format(Tribe[Owner].TPhrase('BOMBARD'),[s]),'');
-              Update; // remove message box from screen
-              end;
-            end
-          else if Flags and umExpelling<>0 then
-            CurrentMoveInfo.AfterAttackExpeller:=Owner;
-
-          if Flags and umExpelling<>0 then Play('MOVE_EXPEL')
-          else if Owner=me then
-            begin
-            MakeModelInfo(me,mix,MyModel[mix],mi);
-            Play(AttackSound(ModelCode(mi)));
-            end
-          else Play(AttackSound(ModelCode(MyRO.EnemyModel[emix])));
-
-          FocusOnLoc(FromLoc,flImmUpdate);
-
-          // before combat
-          MainMap.AttackBegin(TShowMove(Data));
-          if MyMap[ToLoc] and fCity<>0 then PaintLoc(ToLoc);
-          PaintLoc(FromLoc);
-          MoveOnScreen(TShowMove(Data),1,9,16);
-          MoveOnScreen(TShowMove(Data),17,12,32);
-          MoveOnScreen(TShowMove(Data),7,11,16);
-
-          // after combat
-          MainMap.AttackEffect(TShowMove(Data));
-          PaintLoc(ToLoc);
-          if EndHealth>0 then
-            begin
-            Health:=EndHealth;
-            MoveOnScreen(TShowMove(Data),10,0,16);
-            end
-          else if not idle then
-            Sleep(MoveTime div 2);
-          MainMap.AttackEnd;
-          end // if CurrentMoveInfo.DoShow
-        else MapValid:=false;
-        end
-      end;
-
-  cShowMissionResult:
-    if Cardinal(Data)=0 then
-      SoundMessageEx(Phrases.Lookup('NOFOREIGNINFO'),'')
-    else
-      begin
-      s:=Phrases.Lookup('FOREIGNINFO');
-      for p1:=0 to nPl-1 do if 3 shl (p1*2) and Cardinal(Data)<>0 then
-        s:=s+'\'+Tribe[p1].TPhrase('SHORTNAME');
-      SoundMessageEx(s,'')
-      end;
-
-  cShowShipChange:
-    if not IsMultiPlayerGame and (Jump[0]=0) then
-      ShowEnemyShipChange(TShowShipChange(Data));
-
-  cShowGreatLibTech:
-    if not IsMultiPlayerGame and (Jump[0]=0) then with MessgExDlg do
-      begin
-      MessgText:=Format(Phrases.Lookup('GRLIB_GENERAL'),
-        [Phrases.Lookup('ADVANCES',integer(Data))]);
-      OpenSound:='NEWADVANCE_GRLIB';
-      Kind:=mkOK;
-      IconKind:=mikImp;
-      IconIndex:=woGrLibrary;
-      ShowModal;
-      end;
-
-  cRefreshDebugMap:
-    begin
-    if integer(data)=IsoEngine.pDebugMap then
-      begin
-      MapValid:=false;
-      MainOffscreenPaint;
-      Update;
-      end
-    end;
-
-  else if Command>=cClientEx then case Command and $FFF0 of
-
-    cSetTribe: with TTribeInfo(Data) do
-      begin
-      i:=UnusedTribeFiles.Count-1;
-      while (i>=0) and (AnsiCompareFileName(UnusedTribeFiles[i],FileName)<>0) do
-        dec(i);
-      if i>=0 then UnusedTribeFiles.Delete(i);
-      CreateTribe(trix,FileName,true);
-      end;
-
-    cSetNewModelPicture, cSetModelPicture:
-      if TribeOriginal[TModelPictureInfo(Data).trix] then
-        Tribe[TModelPictureInfo(Data).trix].SetModelPicture(
-          TModelPictureInfo(Data),Command and $FFF0=cSetNewModelPicture);
-
-    cSetSlaveIndex and $FFF0:
-      Tribe[integer(data) shr 16].mixSlaves:=integer(data) and $FFFF;
-
-    cSetCityName: with TCityNameInfo(Data) do
-      if TribeOriginal[ID shr 12] then
-        Tribe[ID shr 12].SetCityName(ID and $FFF,NewName);
-
-    cSetModelName: with TModelNameInfo(Data) do
-      if TribeOriginal[NewPlayer] then
-        Tribe[NewPlayer].ModelName[mix]:=NewName;
-    end
-  end
-end;{<<<client}
-
-{*** main part ***}
-
-procedure TMainScreen.CreateParams (var p: TCreateParams);
-var
-DefaultOptionChecked: integer;
-Reg: TRegistry;
-doinit: boolean;
-begin
-inherited;
-
-// define which menu settings to save
-SaveOption[0]:=mAlEffectiveMovesOnly.Tag;
-SaveOption[1]:=mEnMoves.Tag;
-SaveOption[2]:=mEnAttacks.Tag;
-SaveOption[3]:=mEnNoMoves.Tag;
-SaveOption[4]:=mWaitTurn.Tag;
-SaveOption[5]:=mEffectiveMovesOnly.Tag;
-SaveOption[6]:=mEnFastMoves.Tag;
-SaveOption[7]:=mSlowMoves.Tag;
-SaveOption[8]:=mFastMoves.Tag;
-SaveOption[9]:=mVeryFastMoves.Tag;
-SaveOption[10]:=mNames.Tag;
-SaveOption[11]:=mRepList.Tag;
-SaveOption[12]:=mRepScreens.Tag;
-SaveOption[13]:=mSoundOff.Tag;
-SaveOption[14]:=mSoundOn.Tag;
-SaveOption[15]:=mSoundOnAlt.Tag;
-SaveOption[16]:=mScrollSlow.Tag;
-SaveOption[17]:=mScrollFast.Tag;
-SaveOption[18]:=mScrollOff.Tag;
-SaveOption[19]:=mAlSlowMoves.Tag;
-SaveOption[20]:=mAlFastMoves.Tag;
-SaveOption[21]:=mAlNoMoves.Tag;
-DefaultOptionChecked:= 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 + 1 shl 18 + 1 shl 19;
-
-Reg:=TRegistry.Create;
-doinit:=true;
-if Reg.KeyExists('SOFTWARE\cevo\RegVer9') then
-  begin
-  doinit:=false;
-  Reg.OpenKey('SOFTWARE\cevo\RegVer9',false);
-  try
-    xxt:=Reg.ReadInteger('TileWidth') div 2;
-    yyt:=Reg.ReadInteger('TileHeight') div 2;
-    OptionChecked:=Reg.ReadInteger('OptionChecked');
-    MapOptionChecked:=Reg.ReadInteger('MapOptionChecked');
-    CityRepMask:=cardinal(Reg.ReadInteger('CityReport'));
-  except
-    doinit:=true;
-    end;
-  Reg.closekey;
-  if OptionChecked and (7 shl 16)=0 then
-    OptionChecked:=OptionChecked or (1 shl 16); // old regver with no scrolling
-  end;
-Reg.Free;
-if doinit then
-  begin
-  xxt:=48;
-  yyt:=24;
-  OptionChecked:=DefaultOptionChecked;
-  MapOptionChecked:=1 shl moCityNames;
-  CityRepMask:=cardinal(not chPopIncrease and not chNoGrowthWarning and not chCaptured);
-  end;
-
-if FullScreen then
-  begin
-  p.Style:=$87000000;
-  BorderStyle:=bsNone;
-  BorderIcons:=[];
-  end;
-
-if 1 shl 13 and OptionChecked<>0 then SoundMode:=smOff
-else if 1 shl 15 and OptionChecked<>0 then SoundMode:=smOnAlt
-else SoundMode:=smOn
-end;
-
-procedure TMainScreen.FormCreate(Sender:TObject);
-var
-i,j: integer;
-begin
-Screen.Cursors[crImpDrag]:=LoadCursor(HInstance,'DRAG');
-Screen.Cursors[crFlatHand]:=LoadCursor(HInstance,'FLATHAND');
-
-// tag-controlled language
-for i:=0 to ComponentCount-1 do
-  if Components[i].Tag and $FF<>0 then
-    if Components[i] is TMenuItem then
-      begin
-      TMenuItem(Components[i]).Caption:=
-        Phrases.Lookup('CONTROLS',-1+Components[i].Tag and $FF);
-      for j:=0 to nSaveOption-1 do
-        if Components[i].Tag and $FF=SaveOption[j] then
-          TMenuItem(Components[i]).Checked:= 1 shl j and OptionChecked<>0;
-      end
-    else if Components[i] is TButtonBase then
-      begin
-      TButtonBase(Components[i]).Hint:=
-        Phrases.Lookup('CONTROLS',-1+Components[i].Tag and $FF);
-      if (Components[i] is TButtonC) and (TButtonC(Components[i]).ButtonIndex<>1) then
-        TButtonC(Components[i]).ButtonIndex:=
-          MapOptionChecked shr (Components[i].Tag shr 8) and 1 +2
-      end;
-
-// non-tag-controlled language
-mTechTree.Caption:=Phrases2.Lookup('MENU_ADVTREE');
-mViewpoint.Caption:=Phrases2.Lookup('MENU_VIEWPOINT');
-if not Phrases2FallenBackToEnglish then
-  begin
-  MenuArea.Hint:=Phrases2.Lookup('BTN_MENU');
-  TreasuryArea.Hint:=Phrases2.Lookup('TIP_TREASURY');
-  ResearchArea.Hint:=Phrases.Lookup('SCIENCE');
-  ManagementArea.Hint:=Phrases2.Lookup('BTN_MANAGE');
-  end;
-for i:=0 to mRep.Count-1 do
-  begin
-  j:=mRep[i].Tag shr 8;
-  mRep[i].Caption:=CityEventName(j);
-  mRep[i].Checked:= CityRepMask and (1 shl j)<>0;
-  end;
-
-Mini:=TBitmap.Create;
-Mini.PixelFormat:=pf24bit;
-Panel:=TBitmap.Create;
-Panel.PixelFormat:=pf24bit;
-Panel.Canvas.Font.Assign(UniFont[ftSmall]);
-Panel.Canvas.Brush.Style:=bsClear;
-TopBar:=TBitmap.Create;
-TopBar.PixelFormat:=pf24bit;
-TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
-TopBar.Canvas.Brush.Style:=bsClear;
-Buffer:=TBitmap.Create;
-Buffer.PixelFormat:=pf24bit;
-if 2*lxmax>3*xSizeBig then
-  Buffer.Width:=2*lxmax
-else Buffer.Width:=3*xSizeBig;
-if lymax>3*ySizeBig then
-  Buffer.Height:=lymax
-else Buffer.Height:=3*ySizeBig;
-Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
-for i:=0 to nPl-1 do AILogo[i]:=nil;
-Canvas.Font.Assign(UniFont[ftSmall]);
-InitButtons();
-EOT.Template:=Templates;
-end;
-
-procedure TMainScreen.FormDestroy(Sender:TObject);
-var
-i: integer;
-begin
-Mini.Free;Buffer.Free;Panel.Free;
-for i:=0 to nPl-1 do if AILogo[i]<>nil then
-  AILogo[i].Free;
-end;
-
-procedure TMainScreen.FormResize(Sender:TObject);
-var
-MiniFrame,MaxMapWidth: integer;
-begin
-SmallScreen:= ClientWidth<1024;
-MaxMapWidth:=(G.lx*2-3)*xxt; // avoide the same tile being visible left and right
-if ClientWidth<=MaxMapWidth then
-  begin
-  MapWidth:=ClientWidth;
-  MapOffset:=0;
-  end
-else
-  begin
-  MapWidth:=MaxMapWidth;
-  MapOffset:=(ClientWidth-MapWidth) div 2;
-  end;
-MapHeight:=ClientHeight-TopBarHeight-PanelHeight+overlap;
-Panel.Width:=ClientWidth; Panel.Height:=PanelHeight;
-TopBar.Width:=ClientWidth; TopBar.Height:=TopBarHeight;
-MiniFrame:=(lxmax_xxx-G.ly) div 2;
-xMidPanel:=(G.lx+MiniFrame)*2+1;
-xRightPanel:=ClientWidth-LeftPanelWidth-10;
-if ClientMode=cEditMap then
-  TrPitch:=2*xxt
-else TrPitch:=66;
-xMini:=MiniFrame-5; yMini:=(PanelHeight-26-lxmax_xxx) div 2+MiniFrame;
-ywmax:=(G.ly-MapHeight div yyt+1) and not 1;
-ywcenter:=-((MapHeight-yyt*(G.ly-1)) div (4*yyt))*2; // only for ywmax<=0
-if ywmax<=0 then yw:=ywcenter
-else if yw<0 then yw:=0
-else if yw>ywmax then yw:=ywmax;
-UnitInfoBtn.Top:=ClientHeight-29;
-UnitInfoBtn.Left:=xMidPanel+7+99;
-UnitBtn.Top:=ClientHeight-29;
-UnitBtn.Left:=xMidPanel+7+99+31;
-TerrainBtn.Top:=ClientHeight-29;
-TerrainBtn.Left:=xMidPanel+7+99+62;
-MovieSpeed1Btn.Top:=ClientHeight-91;
-MovieSpeed1Btn.Left:=ClientWidth div 2-62;
-MovieSpeed2Btn.Top:=ClientHeight-91;
-MovieSpeed2Btn.Left:=ClientWidth div 2-62+29;
-MovieSpeed3Btn.Top:=ClientHeight-91;
-MovieSpeed3Btn.Left:=ClientWidth div 2-62+2*29;
-MovieSpeed4Btn.Top:=ClientHeight-91;
-MovieSpeed4Btn.Left:=ClientWidth div 2-62+3*29+12;
-EOT.Top:=ClientHeight-64;
-EOT.Left:=ClientWidth-62;
-SetWindowPos(sb.h,0,xRightPanel+10-14-GetSystemMetrics(SM_CXVSCROLL),
-  ClientHeight-MidPanelHeight+8,0,0,SWP_NOSIZE or SWP_NOZORDER);
-MapBtn0.Left:=xMini+G.lx-44;
-MapBtn0.Top:=ClientHeight-15;
-MapBtn1.Left:=xMini+G.lx-28;
-MapBtn1.Top:=ClientHeight-15;
-{MapBtn2.Left:=xMini+G.lx-20;
-MapBtn2.Top:=ClientHeight-15;
-MapBtn3.Left:=xMini+G.lx-4;
-MapBtn3.Top:=ClientHeight-15;}
-MapBtn5.Left:=xMini+G.lx-12;
-MapBtn5.Top:=ClientHeight-15;
-MapBtn4.Left:=xMini+G.lx+20;
-MapBtn4.Top:=ClientHeight-15;
-MapBtn6.Left:=xMini+G.lx+36;
-MapBtn6.Top:=ClientHeight-15;
-TreasuryArea.Left:=ClientWidth div 2-172;
-ResearchArea.Left:=ClientWidth div 2;
-ManagementArea.Left:=ClientWidth-xPalace;
-ManagementArea.Top:=TopBarHeight+MapHeight-overlap+yPalace;
-ArrangeMidPanel;
-if RepaintOnResize then
-  begin
-  RectInvalidate(0,TopBarHeight,ClientWidth,TopBarHeight+MapHeight);
-  MapValid:=false;
-  PaintAll
-  end
-end;
-
-procedure TMainScreen.FormCloseQuery(Sender: TObject; var CanClose: boolean);
-begin
-CanClose:=Closable;
-if not Closable and idle and (me=0) and (ClientMode<scContact) then
-  MenuClick(mResign)
-end;
-
-procedure TMainScreen.OnScroll(var m:TMessage);
-begin
-if ProcessPVSB(sb,m) then begin PanelPaint; Update end
-end;
-
-procedure TMainScreen.OnEOT(var Msg:TMessage);
-begin
-EndTurn
-end;
-
-procedure TMainScreen.EOTClick(Sender:TObject);
-begin
-if GameMode=cMovie then
-  begin
-  MessgExDlg.CancelMovie;
-  Server(sBreak,me,0,nil^)
-  end
-else if ClientMode<0 then
-  skipped:=true
-else if ClientMode>=scContact then
-  NegoDlg.ShowNewContent(wmPersistent)
-else if Jump[pTurn]>0 then
-  begin Jump[pTurn]:=0; StartRunning:=false end
-else EndTurn
-end;
-
-// set xTerrain, xTroop, and TrRow
-procedure TMainScreen.ArrangeMidPanel;
-begin
-if ClientMode=cEditMap then
-  xTroop:=xMidPanel+15
-else
-  begin
-  if supervising then
-    xTerrain:=xMidPanel+2*xxt+14
-  else if ClientWidth<1280 then
-    xTerrain:=ClientWidth div 2+(1280-ClientWidth) div 3
-  else xTerrain:=ClientWidth div 2;
-  xTroop:=xTerrain+2*xxt+12;
-  if SmallScreen and not supervising then
-    xTroop:=xRightPanel+10-3*66-GetSystemMetrics(SM_CXVSCROLL)-19-4;
-    // not perfect but we assume almost no one is still playing on a 800x600 screen 
-  end;
-TrRow:=(xRightPanel+10-xTroop-GetSystemMetrics(SM_CXVSCROLL)-19) div TrPitch;
-end;
-
-function TMainScreen.EndTurn(WasSkipped: boolean): boolean;
-
-  function IsResourceUnused(cix, NeedFood, NeedProd: integer): boolean;
-  var
-  dx,dy,fix: integer;
-  CityAreaInfo: TCityAreaInfo;
-  TileInfo: TTileInfo;
-  begin
-  Server(sGetCityAreaInfo,me,cix,CityAreaInfo);
-  for dy:=-3 to 3 do for dx:=-3 to 3 do
-    if ((dx+dy) and 1=0) and (dx*dx*dy*dy<81) then
-      begin
-      fix:=(dy+3) shl 2+(dx+3) shr 1;
-      if (MyCity[cix].Tiles and (1 shl fix)=0) // not used yet
-        and (CityAreaInfo.Available[fix]=faAvailable) then // usable
-        begin
-        TileInfo.ExplCity:=cix;
-        Server(sGetHypoCityTileInfo, me, dLoc(MyCity[cix].Loc,dx,dy), TileInfo);
-        if (TileInfo.Food>=NeedFood) and (TileInfo.Prod>=NeedProd) then
-          begin result:=true; exit end;
-        end
-      end;
-  result:=false;
-  end;
-
-var
-i,p1,uix,cix,CenterLoc: integer;
-MsgItem: string;
-CityReport: TCityReport;
-PlaneReturnData: TPlaneReturnData;
-Zoom: boolean;
-begin
-result:=false;
-if ClientMode>=scDipOffer then exit;
-
-if supervising and (me<>0) then
-  begin
-  for i:=0 to Screen.FormCount-1 do
-    if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-      Screen.Forms[i].Close; // close windows
-  ItsMeAgain(0);
-  end;
-
-CityOptimizer_EndOfTurn;
-
-if not WasSkipped then // check warnings
-  begin
-  // need to move planes home?
-  for uix:=0 to MyRO.nUn-1 do with MyUn[uix] do
-    if (Loc>=0) and (MyModel[mix].Domain=dAir)
-      and (Status and usToldNoReturn=0) and (Master<0)
-      and (MyMap[Loc] and fCity=0) and (MyMap[Loc] and fTerImp<>tiBase) then
-      begin
-      PlaneReturnData.Fuel:=Fuel;
-      PlaneReturnData.Loc:=Loc;
-      PlaneReturnData.Movement:=0; // end turn without further movement?
-      if Server(sGetPlaneReturn, me, uix, PlaneReturnData)=eNoWay then
-        begin
-        CenterLoc:=Loc+G.lx*6; // centering the unit itself would make it covered by the query dialog
-        while CenterLoc>=G.lx*G.ly do
-          dec(CenterLoc, G.lx*2);
-        Centre(CenterLoc);
-        SetTroopLoc(-1);
-        PaintAll;
-
-        if MyModel[mix].Kind=mkSpecial_Glider then
-          MsgItem:='LOWFUEL_GLIDER'
-        else MsgItem:='LOWFUEL';
-        if SimpleQuery(mkYesNo,Phrases.Lookup(MsgItem),'WARNING_LOWSUPPORT')<>mrOk then
-          begin
-          SetUnFocus(uix);
-          SetTroopLoc(Loc);
-          PanelPaint;
-          exit;
-          end;
-        MyUn[uix].Status:=MyUn[uix].Status or usToldNoReturn;
-        end
-      end;
-
-  if not supervising and (MyRO.TestFlags and tfImmImprove=0)
-    and (MyRO.Government<>gAnarchy)
-    and (MyRO.Money+TaxSum<0) and (MyRO.TaxRate<100) then // low funds!
-    with MessgExDlg do
-      begin
-      OpenSound:='WARNING_LOWFUNDS';
-      MessgText:=Phrases.Lookup('LOWFUNDS');
-      Kind:=mkYesNo;
-      IconKind:=mikImp;
-      IconIndex:=imTrGoods;
-      ShowModal;
-      if ModalResult<>mrOK then exit
-      end;
-
-  if MyRO.Government<>gAnarchy then
-    for cix:=0 to MyRO.nCity-1 do with MyCity[cix] do
-      if (Loc>=0) and (Flags and chCaptured=0) then
-        begin
-        Zoom:=false;
-        CityReport.HypoTiles:=-1;
-        CityReport.HypoTax:=-1;
-        CityReport.HypoLux:=-1;
-        Server(sGetCityReport,me,cix,CityReport);
-
-        if (CityReport.Working-CityReport.Happy>Size shr 1)
-          and (Flags and chCaptured<=$10000) then
-          with MessgExDlg do
-            begin
-            OpenSound:='WARNING_DISORDER';
-            if Status and csResourceWeightsMask=0 then
-              MsgItem:='DISORDER'
-            else MsgItem:='DISORDER_UNREST';
-            MessgText:=Format(Phrases.Lookup(MsgItem),[CityName(ID)]);
-            Kind:=mkYesNo;
-      //      BigIcon:=29;
-            ShowModal;
-            Zoom:= ModalResult<>mrOK;
-            end;
-        if not Zoom and (Food+CityReport.FoodRep-CityReport.Eaten<0) then
-          with MessgExDlg do
-            begin
-            OpenSound:='WARNING_FAMINE';
-            if Status and csResourceWeightsMask=0 then
-              MsgItem:='FAMINE'
-            else if (CityReport.Deployed<>0) and IsResourceUnused(cix,1,0) then
-              MsgItem:='FAMINE_UNREST'
-            else MsgItem:='FAMINE_TILES';
-            MessgText:=Format(Phrases.Lookup(MsgItem),[CityName(ID)]);
-            Kind:=mkYesNo;
-            IconKind:=mikImp;
-            IconIndex:=22;
-            ShowModal;
-            Zoom:= ModalResult<>mrOK;
-            end;
-        if not Zoom and (CityReport.ProdRep<CityReport.Support) then
-          with MessgExDlg do
-            begin
-            OpenSound:='WARNING_LOWSUPPORT';
-            if Status and csResourceWeightsMask=0 then
-              MsgItem:='LOWSUPPORT'
-            else if (CityReport.Deployed<>0) and IsResourceUnused(cix,0,1) then
-              MsgItem:='LOWSUPPORT_UNREST'
-            else MsgItem:='LOWSUPPORT_TILES';
-            MessgText:=Format(Phrases.Lookup(MsgItem),[CityName(ID)]);
-            Kind:=mkYesNo;
-            IconKind:=mikImp;
-            IconIndex:=29;
-            ShowModal;
-            Zoom:= ModalResult<>mrOK;
-            end;
-        if Zoom then
-          begin // zoom to city
-          ZoomToCity(Loc);
-          exit
-          end
-        end;
-
-  if (MyRO.Happened and phTech<>0) and (MyRO.ResearchTech<0)
-    and (MyData.FarTech<>adNexus) then
-    if not ChooseResearch then
-      exit;
-  end;
-
-RememberPeaceViolation;
-
-SetUnFocus(-1);
-for uix:=0 to MyRO.nUn-1 do
-  MyUn[uix].Status:=MyUn[uix].Status and usPersistent;
-
-CityDlg.CloseAction:=None;
-if IsMultiPlayerGame then
-  begin // close windows for next player
-  for i:=0 to Screen.FormCount-1 do
-    if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-      Screen.Forms[i].Close;
-  end
-else
-  begin
-  if CityDlg.Visible then CityDlg.Close;
-  if UnitStatDlg.Visible then UnitStatDlg.Close;
-  end;
-for i:=0 to Screen.FormCount-1 do
-  if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-    Screen.Forms[i].Enabled:=false;
-
-if Server(sTurn,pTurn,0,nil^)>=rExecuted then
-  begin
-  if Jump[pTurn]>0 then EOT.Hint:=Phrases.Lookup('BTN_STOP')
-  else EOT.Hint:=Phrases.Lookup('BTN_SKIP');
-  result:=true;
-  SetTroopLoc(-1);
-  pTurn:=-1;
-  pLogo:=-1;
-  UnitInfoBtn.Visible:=false;
-  UnitBtn.Visible:=false;
-  TerrainBtn.Visible:=false;
-  EOT.ButtonIndex:=eotCancel;
-  EOT.Visible:=true;
-  MapValid:=false;
-  PanelPaint;
-  Update;
-  ClientMode:=-1;
-  idle:=false;
-  skipped:=WasSkipped;
-  for p1:=1 to nPl-1 do
-    if G.RO[p1]<>nil then skipped:=true; // don't show enemy moves in hotseat mode
-  end
-else PanelPaint
-end; // EndTurn
-
-procedure TMainScreen.EndNego;
-begin
-if NegoDlg.Visible then NegoDlg.Close;
-HaveStrategyAdvice:=false;
-  // AdvisorDlg.HaveStrategyAdvice;
-  // negotiation might have changed advices
-EOT.ButtonIndex:=eotCancel;
-EOT.Visible:=true;
-PanelPaint;
-Update;
-ClientMode:=-1;
-idle:=false;
-end;
-
-procedure TMainScreen.ProcessRect(x0,y0,nx,ny,Options: integer);
-var
-xs,ys,xl,yl: integer;
-begin
-xl:=nx*xxt+xxt;
-yl:=ny*yyt+yyt*2;
-xs:=(x0-xw)*(xxt*2)+y0 and 1*xxt-G.lx*(xxt*2);
-// |xs+xl/2-MapWidth/2| -> min
-while abs(2*(xs+G.lx*(xxt*2))+xl-MapWidth)<abs(2*xs+xl-MapWidth) do
-  inc(xs,G.lx*(xxt*2));
-ys:=(y0-yw)*yyt-yyt;
-if xs+xl>MapWidth then xl:=MapWidth-xs;
-if ys+yl>MapHeight then yl:=MapHeight-ys;
-if (xl<=0) or (yl<=0) then exit;
-if Options and prPaint<>0 then
-  begin
-  if Options and prAutoBounds<>0 then
-    MainMap.SetPaintBounds(xs,ys,xs+xl,ys+yl);
-  MainMap.Paint(xs,ys,x0+G.lx*y0,nx,ny,-1,-1);
-  end;
-if Options and prInvalidate<>0 then
-  RectInvalidate(MapOffset+xs,TopBarHeight+ys,MapOffset+xs+xl,TopBarHeight+ys+yl)
-end;
-
-procedure TMainScreen.PaintLoc(Loc: integer; Radius: integer = 0);
-var
-yLoc,x0: integer;
-begin
-if MapValid then
-  begin
-  yLoc:=(Loc+G.lx*1024) div G.lx -1024;
-  x0:=(Loc+(yLoc and 1-2*Radius+G.lx*1024) div 2) mod G.lx;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-  ProcessRect(x0,yLoc-2*Radius,4*Radius+1,4*Radius+1,
-    prPaint or prAutoBounds or prInvalidate);
-  Update;
-  end
-end;
-
-procedure TMainScreen.PaintLocTemp(Loc, Style: integer);
-var
-y0,x0,xMap,yMap: integer;
-begin
-if not MapValid then exit;
-Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
-y0:=Loc div G.lx;
-x0:=Loc mod G.lx;
-xMap:=(x0-xw)*(xxt*2)+y0 and 1*xxt-G.lx*(xxt*2);
-// |xMap+xxt-MapWidth/2| -> min
-while abs(2*(xMap+G.lx*(xxt*2))+2*xxt-MapWidth)<abs(2*xMap+2*xxt-MapWidth) do
-  inc(xMap,G.lx*(xxt*2));
-yMap:=(y0-yw)*yyt-yyt;
-NoMap.SetOutput(Buffer);
-NoMap.SetPaintBounds(0,0,2*xxt,3*yyt);
-NoMap.Paint(0,0,Loc,1,1,-1,-1,Style=pltsBlink);
-PaintBufferToScreen(xMap,yMap,2*xxt,3*yyt);
-end;
-
-// paint content of buffer directly to screen instead of offscreen
-// panel protusions are added
-// NoMap must be set to buffer and bounds before
-procedure TMainScreen.PaintBufferToScreen(xMap,yMap,width,height: integer);
-begin
-if xMap+width>MapWidth then
-  width:=MapWidth-xMap;
-if yMap+height>MapHeight then
-  height:=MapHeight-yMap;
-if (width<=0) or (height<=0) or (width+xMap<=0) or (height+yMap<=0) then
-  exit;
-
-NoMap.BitBlt(Panel,-xMap-MapOffset,-yMap+MapHeight-overlap,xMidPanel,overlap,
-  0,0,SRCCOPY);
-NoMap.BitBlt(Panel,-xMap-MapOffset+xRightPanel,-yMap+MapHeight-overlap,
-  Panel.Width-xRightPanel,overlap,xRightPanel,0,SRCCOPY);
-if yMap<0 then
-  begin
-  if xMap<0 then
-    BitBlt(Canvas.Handle,MapOffset,TopBarHeight,width+xMap,height+yMap,
-      Buffer.Canvas.Handle,-xMap,-yMap,SRCCOPY)
-  else BitBlt(Canvas.Handle,xMap+MapOffset,TopBarHeight,width,height+yMap,
-    Buffer.Canvas.Handle,0,-yMap,SRCCOPY)
-  end
-else
-  begin
-  if xMap<0 then
-    BitBlt(Canvas.Handle,MapOffset,TopBarHeight+yMap,width+xMap,height,
-      Buffer.Canvas.Handle,-xMap,0,SRCCOPY)
-  else BitBlt(Canvas.Handle,xMap+MapOffset,TopBarHeight+yMap,width,height,
-    Buffer.Canvas.Handle,0,0,SRCCOPY);
-  end
-end;
-
-procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: integer);
-var
-yLoc,x0: integer;
-begin
-if MapValid then
-  begin
-  yLoc:=(FromLoc+G.lx*1024) div G.lx -1024;
-  x0:=(FromLoc+(yLoc and 1+G.lx*1024) div 2) mod G.lx;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-  ProcessRect(x0,yLoc,1,1,prPaint or prAutoBounds);
-  end
-end;
-
-procedure TMainScreen.PaintDestination;
-var
-Destination: integer;
-begin
-if (UnFocus>=0) and (MyUn[UnFocus].Status and usGoto<>0) then
-  begin
-  Destination:=MyUn[UnFocus].Status shr 16;
-  if (Destination<>$7FFF) and (Destination<>MyUn[UnFocus].Loc) then
-    PaintLocTemp(Destination,pltsBlink);
-  end;
-end;
-
-procedure TMainScreen.MiniPaint;
-type
-TLine=array[0..99999999,0..2] of Byte;
-var
-uix,cix,x,y,Loc,i,hw,xm,cm,cmPolOcean,cmPolNone:integer;
-PrevMiniLine,MiniLine:^TLine;
-begin
-cmPolOcean:=GrExt[HGrSystem].Data.Canvas.Pixels[101,67];
-cmPolNone:=GrExt[HGrSystem].Data.Canvas.Pixels[102,67];
-hw:=MapWidth div (xxt*2);
-with Mini.Canvas do
-  begin
-  Brush.Color:=$000000;
-  FillRect(Rect(0,0,Mini.Width,Mini.Height));
-  end;
-MiniLine:=nil;
-for y:=0 to G.ly-1 do
-  begin
-  PrevMiniLine:=MiniLine;
-  MiniLine:=Mini.ScanLine[y];
-  for x:=0 to G.lx-1 do if MyMap[x+G.lx*y] and fTerrain<>fUNKNOWN then
-    begin
-    Loc:=x+G.lx*y;
-    for i:=0 to 1 do
-      begin
-      xm:=((x-xwMini)*2+i+y and 1-hw+G.lx*5) mod (G.lx*2);
-      cm:=MiniColors[MyMap[Loc] and fTerrain,i];
-      if ClientMode=cEditMap then
-        begin
-        if MyMap[Loc] and (fPrefStartPos or fStartPos)<>0 then
-          cm:=$FFFFFF;
-        end
-      else if MyMap[Loc] and fCity<>0 then
-        begin
-        cix:=MyRO.nCity-1;
-        while (cix>=0) and (MyCity[cix].Loc<>Loc) do dec(cix);
-        if cix>=0 then cm:=Tribe[me].Color
-        else
-          begin
-          cix:=MyRO.nEnemyCity-1;
-          while (cix>=0) and (MyRO.EnemyCity[cix].Loc<>Loc) do dec(cix);
-          if cix>=0 then cm:=Tribe[MyRO.EnemyCity[cix].Owner].Color
-          end;
-        cm:=$808080 or cm shr 1; {increase brightness}
-        if PrevMiniLine<>nil then
-          begin // 2x2 city dot covers two scanlines
-          PrevMiniLine[xm,0]:=cm shr 16;
-          PrevMiniLine[xm,1]:=cm shr 8 and $FF;
-          PrevMiniLine[xm,2]:=cm and $FF;
+              GamePopup.Popup(Left + 4, Top + GetSystemMetrics(SM_CYCAPTION) + 4
+                + TopBarHeight - 1);
           end
         end
-      else if (i=0) and (MyMap[Loc] and fUnit<>0) then
-        begin
-        uix:=MyRO.nUn-1;
-        while (uix>=0) and (MyUn[uix].Loc<>Loc) do dec(uix);
-        if uix>=0 then cm:=Tribe[me].Color
+        else if IsPanelPixel(x, y) then
+          PanelBoxMouseDown(Sender, Button, Shift, x,
+            y - (ClientHeight - PanelHeight))
+        else if (y >= TopBarHeight) and (x >= MapOffset) and
+          (x < MapOffset + MapWidth) then
+          MapBoxMouseDown(Sender, Button, Shift, x - MapOffset,
+            y - TopBarHeight)
+    end;
+
+    procedure TMainScreen.FormMouseMove(Sender: TObject; Shift: TShiftState;
+      x, y: integer);
+    begin
+      if idle then
+        if IsPanelPixel(x, y) then
+          PanelBoxMouseMove(Sender, Shift, x, y - (ClientHeight - PanelHeight))
+        else if (y >= TopBarHeight) and (x >= MapOffset) and
+          (x < MapOffset + MapWidth) then
+          MapBoxMouseMove(Sender, Shift, x - MapOffset, y - TopBarHeight);
+    end;
+
+    procedure TMainScreen.FormMouseUp(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    begin
+      if idle then
+        PanelBoxMouseUp(Sender, Button, Shift, x,
+          y - (ClientHeight - PanelHeight));
+    end;
+
+    procedure TMainScreen.FormPaint(Sender: TObject);
+    begin
+      MainOffscreenPaint;
+      if (MapOffset > 0) or (MapOffset + MapWidth < ClientWidth) then
+        with Canvas do
+        begin // pillarbox, make left and right border black
+          if me < 0 then
+            Brush.Color := $000000
+          else
+            Brush.Color := EmptySpaceColor;
+          if xMidPanel > MapOffset then
+            FillRect(Rect(0, TopBarHeight, MapOffset, TopBarHeight + MapHeight
+              - overlap))
+          else
+          begin
+            FillRect(Rect(0, TopBarHeight, xMidPanel, TopBarHeight + MapHeight -
+              overlap));
+            FillRect(Rect(xMidPanel, TopBarHeight, MapOffset,
+              TopBarHeight + MapHeight));
+          end;
+          if xRightPanel < MapOffset + MapWidth then
+            FillRect(Rect(MapOffset + MapWidth, TopBarHeight, ClientWidth,
+              TopBarHeight + MapHeight - overlap))
+          else
+          begin
+            FillRect(Rect(MapOffset + MapWidth, TopBarHeight, xRightPanel,
+              TopBarHeight + MapHeight));
+            FillRect(Rect(xRightPanel, TopBarHeight, ClientWidth,
+              TopBarHeight + MapHeight - overlap));
+          end;
+          Brush.Style := bsClear;
+        end;
+      BitBlt(Canvas.Handle, MapOffset, TopBarHeight, MapWidth,
+        MapHeight - overlap, offscreen.Canvas.Handle, 0, 0, SRCCOPY);
+      BitBlt(Canvas.Handle, 0, 0, ClientWidth, TopBarHeight,
+        TopBar.Canvas.Handle, 0, 0, SRCCOPY);
+      if xMidPanel > MapOffset then
+        BitBlt(Canvas.Handle, xMidPanel, TopBarHeight + MapHeight - overlap,
+          ClientWidth div 2 - xMidPanel, overlap, offscreen.Canvas.Handle,
+          xMidPanel - MapOffset, MapHeight - overlap, SRCCOPY)
+      else
+        BitBlt(Canvas.Handle, MapOffset, TopBarHeight + MapHeight - overlap,
+          ClientWidth div 2 - MapOffset, overlap, offscreen.Canvas.Handle, 0,
+          MapHeight - overlap, SRCCOPY);
+      if xRightPanel < MapOffset + MapWidth then
+        BitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight -
+          overlap, xRightPanel - ClientWidth div 2, overlap,
+          offscreen.Canvas.Handle, ClientWidth div 2 - MapOffset,
+          MapHeight - overlap, SRCCOPY)
+      else
+        BitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight -
+          overlap, MapOffset + MapWidth - ClientWidth div 2, overlap,
+          offscreen.Canvas.Handle, ClientWidth div 2 - MapOffset,
+          MapHeight - overlap, SRCCOPY);
+      BitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
+        overlap, Panel.Canvas.Handle, 0, 0, SRCCOPY);
+      BitBlt(Canvas.Handle, xRightPanel, TopBarHeight + MapHeight - overlap,
+        Panel.width - xRightPanel, overlap, Panel.Canvas.Handle, xRightPanel,
+        0, SRCCOPY);
+      BitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight, Panel.width,
+        PanelHeight - overlap, Panel.Canvas.Handle, 0, overlap, SRCCOPY);
+      if (pLogo >= 0) and (G.RO[pLogo] = nil) and (AILogo[pLogo] <> nil) then
+        BitBlt(Canvas.Handle, xRightPanel + 10 - (16 + 64),
+          ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas.Handle, 0, 0,
+          SRCCOPY);
+    end;
+
+    procedure TMainScreen.RectInvalidate(Left, Top, Rigth, Bottom: integer);
+    var
+      r0: HRgn;
+    begin
+      r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
+      InvalidateRgn(Handle, r0, false);
+      DeleteObject(r0);
+    end;
+
+    procedure TMainScreen.SmartRectInvalidate(Left, Top, Rigth,
+      Bottom: integer);
+    var
+      i: integer;
+      r0, r1: HRgn;
+    begin
+      r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
+      for i := 0 to ControlCount - 1 do
+        if not(Controls[i] is TArea) and Controls[i].Visible then
+        begin
+          with Controls[i].BoundsRect do
+            r1 := CreateRectRgn(Left, Top, Right, Bottom);
+          CombineRgn(r0, r0, r1, RGN_DIFF);
+          DeleteObject(r1);
+        end;
+      InvalidateRgn(Handle, r0, false);
+      DeleteObject(r0);
+    end;
+
+    procedure TMainScreen.mRepClicked(Sender: TObject);
+    begin
+      with TMenuItem(Sender) do
+      begin
+        Checked := not Checked;
+        if Checked then
+          CityRepMask := CityRepMask or (1 shl (Tag shr 8))
         else
+          CityRepMask := CityRepMask and not(1 shl (Tag shr 8))
+      end
+    end;
+
+    procedure TMainScreen.mLogClick(Sender: TObject);
+    begin
+      LogDlg.Show
+    end;
+
+    procedure TMainScreen.FormShow(Sender: TObject);
+    begin
+      Timer1.Enabled := true
+    end;
+
+    procedure TMainScreen.FormClose(Sender: TObject; var Action: TCloseAction);
+    begin
+      Timer1.Enabled := false
+    end;
+
+    procedure TMainScreen.Radio(Sender: TObject);
+    begin
+      TMenuItem(Sender).Checked := true
+    end;
+
+    procedure TMainScreen.mManipClick(Sender: TObject);
+    var
+      Flag: integer;
+    begin
+      with TMenuItem(Sender) do
+      begin
+        Flag := 1 shl (Tag shr 8);
+        if Checked then
+          Server(sClearTestFlag, 0, Flag, nil^)
+        else
+        begin
+          Server(sSetTestFlag, 0, Flag, nil^);
+          Play('CHEAT');
+        end;
+        if not supervising then
+        begin
+          if Flag = tfUncover then
           begin
-          uix:=MyRO.nEnemyUn-1;
-          while (uix>=0) and (MyRO.EnemyUn[uix].Loc<>Loc) do dec(uix);
-          if uix>=0 then cm:=Tribe[MyRO.EnemyUn[uix].Owner].Color
-          end;
-        cm:=$808080 or cm shr 1; {increase brightness}
-        end
-      else if MapOptionChecked and (1 shl moPolitical)<>0 then
-        begin
-        if MyMap[Loc] and fTerrain<fGrass then cm:=cmPolOcean
-        else if MyRO.Territory[Loc]<0 then cm:=cmPolNone
-        else cm:=Tribe[MyRO.Territory[Loc]].Color;
-        end;
-      MiniLine[xm,0]:=cm shr 16;
-      MiniLine[xm,1]:=cm shr 8 and $FF;
-      MiniLine[xm,2]:=cm and $FF;
-      end;
-    end
-  end;
-end;
-
-procedure TMainScreen.MainOffscreenPaint;
-var
-ProcessOptions: integer;
-rec:TRect;
-DoInvalidate: boolean;
-begin
-if me<0 then
-  with offscreen.Canvas do
-    begin
-    Brush.Color:=$000000;
-    FillRect(Rect(0,0,MapWidth,MapHeight));
-    Brush.Style:=bsClear;
-    OffscreenUser:=self;
-    exit
-    end;
-
-MainMap.SetPaintBounds(0,0,MapWidth,MapHeight);
-if OffscreenUser<>self then
-  begin
-  if OffscreenUser<>nil then OffscreenUser.Update;
-    // complete working with old owner to prevent rebound
-  if MapValid and (xwd=xw) and (ywd=yw) then
-    MainMap.SetPaintBounds(0,0,UsedOffscreenWidth,UsedOffscreenHeight);
-  MapValid:=false;
-  OffscreenUser:=self;
-  end;
-
-if xw-xwd>G.lx div 2 then xwd:=xwd+G.lx
-else if xwd-xw>G.lx div 2 then xwd:=xwd-G.lx;
-if not MapValid or (xw-xwd>MapWidth div (xxt*2)) or (xwd-xw>MapWidth div (xxt*2))
-  or (yw-ywd>MapHeight div yyt) or (ywd-yw>MapHeight div yyt) then
-  begin
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-  ProcessRect(xw,yw,MapWidth div xxt,MapHeight div yyt,prPaint or prInvalidate)
-  end
-else
-  begin
-  if (xwd=xw) and (ywd=yw) then exit; {map window not moved}
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-  rec:=Rect(0,0,MapWidth,MapHeight);
-  ScrollDC(offscreen.Canvas.Handle,(xwd-xw)*(xxt*2),(ywd-yw)*yyt,rec,rec,0,nil);
-  for DoInvalidate:=false to FastScrolling do
-    begin
-    if DoInvalidate then
-      begin
-      rec.bottom:=MapHeight-overlap;
-      ScrollDC(Canvas.Handle,(xwd-xw)*(xxt*2),(ywd-yw)*yyt,rec,rec,0,nil);
-      ProcessOptions:=prInvalidate;
-      end
-    else ProcessOptions:=prPaint or prAutoBounds;
-    if yw<ywd then
-      begin
-      ProcessRect(xw,yw,MapWidth div xxt,ywd-yw-1,ProcessOptions);
-      if xw<xwd then
-        ProcessRect(xw,ywd,(xwd-xw)*2-1,MapHeight div yyt-ywd+yw,ProcessOptions)
-      else if xw>xwd then
-        ProcessRect((xwd+MapWidth div (xxt*2)) mod G.lx,ywd,(xw-xwd)*2+1,
-          MapHeight div yyt-ywd+yw,ProcessOptions)
-      end
-    else if yw>ywd then
-      begin
-      if DoInvalidate then
-        RectInvalidate(MapOffset,TopBarHeight+MapHeight-overlap-(yw-ywd)*yyt,MapOffset+MapWidth,
-          TopBarHeight+MapHeight-overlap)
-      else ProcessRect(xw,(ywd+MapHeight div (yyt*2) *2),MapWidth div xxt,
-        yw-ywd+1,ProcessOptions);
-      if xw<xwd then
-        ProcessRect(xw,yw,(xwd-xw)*2-1,MapHeight div yyt-yw+ywd-2,
-          ProcessOptions)
-      else if xw>xwd then
-        ProcessRect((xwd+MapWidth div (xxt*2)) mod G.lx,yw,(xw-xwd)*2+1,
-          MapHeight div yyt-yw+ywd-2,ProcessOptions)
-      end
-    else
-      if xw<xwd then
-        ProcessRect(xw,yw,(xwd-xw)*2-1,MapHeight div yyt,ProcessOptions)
-      else if xw>xwd then
-        ProcessRect((xwd+MapWidth div (xxt*2)) mod G.lx,yw,(xw-xwd)*2+1,
-          MapHeight div yyt,ProcessOptions);
-    end;
-  if not FastScrolling then
-    RectInvalidate(MapOffset,TopBarHeight,MapOffset+MapWidth,TopBarHeight+MapHeight-overlap);
-  RectInvalidate(xMidPanel,TopBarHeight+MapHeight-overlap,xRightPanel,TopBarHeight+MapHeight)
-  end;
-//if (xwd<>xw) or (ywd<>yw) then
-//  Server(sChangeSuperView,me,yw*G.lx+xw,nil^); // for synchronizing client side viewer, not used currently
-xwd:=xw;ywd:=yw;
-MapValid:=true;
-end;
-
-procedure TMainScreen.PaintAll;
-begin
-MainOffscreenPaint;
-xwMini:=xw; ywMini:=yw;
-MiniPaint;
-PanelPaint;
-end;
-
-procedure TMainScreen.PaintAllMaps;
-begin
-MainOffscreenPaint;
-xwMini:=xw; ywMini:=yw;
-MiniPaint;
-CopyMiniToPanel;
-RectInvalidate(xMini+2,TopBarHeight+MapHeight-overlap+yMini+2,xMini+2+G.lx*2,
-  TopBarHeight+MapHeight-overlap+yMini+2+G.ly);
-end;
-
-procedure TMainScreen.CopyMiniToPanel;
-begin
-BitBlt(Panel.Canvas.Handle,xMini+2,yMini+2,G.lx*2,G.ly,Mini.Canvas.Handle,0,0,SRCCOPY);
-if MarkCityLoc>=0 then
-  Sprite(Panel, HGrSystem, xMini-2+(4*G.lx+2*(MarkCityLoc mod G.lx)
-    +(G.lx-MapWidth div (xxt*2))-2*xwd) mod (2*G.lx) +MarkCityLoc div G.lx and 1,
-    yMini-3+MarkCityLoc div G.lx,10,10,77,47)
-else if ywmax<=0 then
-  Frame(Panel.Canvas,xMini+2+G.lx-MapWidth div (xxt*2),yMini+2,
-    xMini+1+G.lx+MapWidth div (xxt*2),
-    yMini+2+G.ly-1,MainTexture.clMark,MainTexture.clMark)
-else Frame(Panel.Canvas,xMini+2+G.lx-MapWidth div (xxt*2),yMini+2+yw,
-  xMini+1+G.lx+MapWidth div (xxt*2),
-  yMini+yw+MapHeight div yyt,MainTexture.clMark,MainTexture.clMark);
-end;
-
-procedure TMainScreen.PanelPaint;
-
-  function MovementToString(var Un: TUn): string;
-  begin
-  result:=ScreenTools.MovementToString(Un.Movement);
-  if Un.Master>=0 then
-    result:='('+result+')'
-  else if (MyModel[Un.mix].Domain=dAir)
-    and (MyModel[Un.mix].Kind<>mkSpecial_Glider) then
-    result:=Format('%s(%d)',[result,Un.Fuel]);
-  end;
-
-var
-i,uix,uixDefender,x,xSrc,ySrc,xSrcBase,ySrcBase,CostFactor,Count,mixShow,
-  xTreasurySection,xResearchSection,JobFocus,TrueMoney,
-  TrueResearch: integer;
-Tile: cardinal;
-s: string;
-unx:TUn;
-UnitInfo: TUnitInfo;
-JobProgressData: TJobProgressData;
-Prio: boolean;
-begin
-with Panel.Canvas do
-  begin
-  Fill(Panel.Canvas,0,3,xMidPanel+7-10,PanelHeight-3,
-    wMainTexture-(xMidPanel+7-10),hMainTexture-PanelHeight);
-  Fill(Panel.Canvas,xRightPanel+10-7,3,Panel.Width-xRightPanel-10+7,PanelHeight-3,
-    -(xRightPanel+10-7),hMainTexture-PanelHeight);
-  FillLarge(Panel.Canvas,xMidPanel-2,PanelHeight-MidPanelHeight,xRightPanel+2,PanelHeight,
-    ClientWidth div 2);
-
-  Brush.Style:=bsClear;
-  Pen.Color:=$000000;
-  MoveTo(0,0);LineTo(xMidPanel+7-8,0); LineTo(xMidPanel+7-8,PanelHeight-MidPanelHeight);
-  LineTo(xRightPanel,PanelHeight-MidPanelHeight); LineTo(xRightPanel,0);
-  LineTo(ClientWidth,0);
-  Pen.Color:=MainTexture.clBevelLight;
-  MoveTo(xMidPanel+7-9,PanelHeight-MidPanelHeight+2);
-  LineTo(xRightPanel+10-8,PanelHeight-MidPanelHeight+2);
-  Pen.Color:=MainTexture.clBevelLight;
-  MoveTo(0,1);LineTo(xMidPanel+7-9,1); Pen.Color:=MainTexture.clBevelShade;
-  LineTo(xMidPanel+7-9,PanelHeight-MidPanelHeight+1); Pen.Color:=MainTexture.clBevelLight;
-  LineTo(xRightPanel+10-9,PanelHeight-MidPanelHeight+1); Pen.Color:=MainTexture.clBevelLight;
-  LineTo(xRightPanel+10-9,1); LineTo(ClientWidth,1);
-  MoveTo(ClientWidth,2); LineTo(xRightPanel+10-8,2); LineTo(xRightPanel+10-8,PanelHeight);
-  MoveTo(0,2);LineTo(xMidPanel+7-10,2); Pen.Color:=MainTexture.clBevelShade;
-  LineTo(xMidPanel+7-10,PanelHeight);
-  Corner(Panel.Canvas,xMidPanel+7-16,1,1,MainTexture);
-  Corner(Panel.Canvas,xRightPanel+10-9,1,0,MainTexture);
-  if ClientMode<>cEditMap then
-    begin
-    if supervising then
-      begin
-      Frame(Panel.Canvas, ClientWidth-xPalace-1, yPalace-1,
-        ClientWidth-xPalace+xSizeBig, yPalace+ySizeBig, $B0B0B0, $FFFFFF);
-      RFrame(Panel.Canvas, ClientWidth-xPalace-2, yPalace-2,
-        ClientWidth-xPalace+xSizeBig+1, yPalace+ySizeBig+1, $FFFFFF, $B0B0B0);
-      BitBlt(Panel.Canvas.Handle, ClientWidth-xPalace, yPalace, xSizeBig,
-        ySizeBig, GrExt[HGrSystem2].Data.Canvas.Handle, 70, 123, SRCCOPY);
-      end
-    else if MyRO.NatBuilt[imPalace]>0 then
-      ImpImage(Panel.Canvas, ClientWidth-xPalace, yPalace, imPalace, -1, GameMode<>cMovie
-       {(GameMode<>cMovie) and (MyRO.Government<>gAnarchy)})
-    else ImpImage(Panel.Canvas, ClientWidth-xPalace, yPalace, 21, -1, GameMode<>cMovie
-      {(GameMode<>cMovie) and (MyRO.Government<>gAnarchy)});
-    end;
-
-  if GameMode=cMovie then
-    Frame(Panel.Canvas,xMini+1,yMini+1,xMini+2+G.lx*2,yMini+2+G.ly,$000000,$000000)
-  else
-    begin
-    Frame(Panel.Canvas,xMini+1,yMini+1,xMini+2+G.lx*2,yMini+2+G.ly,$B0B0B0,$FFFFFF);
-    RFrame(Panel.Canvas,xMini,yMini,xMini+3+G.lx*2,yMini+3+G.ly,$FFFFFF,$B0B0B0);
-    end;
-  CopyMiniToPanel;
-  if ClientMode<>cEditMap then // MapBtn icons
-    for i:=0 to 5 do if i<>3 then
-      Dump(Panel,HGrSystem,xMini+G.lx-42+16*i,PanelHeight-26,8,8,121+i*9,61);
-
-  if ClientMode=cEditMap then
-    begin
-    for i:=0 to TrRow-1 do trix[i]:=-1;
-    Count:=0;
-    for i:=0 to nBrushTypes-1 do
-      begin // display terrain types
-      if (Count>=TrRow*sb.si.npos) and (Count<TrRow*(sb.si.npos+1)) then
-        begin
-        trix[Count-TrRow*sb.si.npos]:=BrushTypes[i];
-        x:=(Count-TrRow*sb.si.npos)*TrPitch;
-        xSrcBase:=-1;
-        case BrushTypes[i] of
-          0..8: begin xSrc:=BrushTypes[i]; ySrc:=0 end;
-          9..30:
-            begin
-            xSrcBase:=2; ySrcBase:=2;
-            xSrc:=0; ySrc:=2*integer(BrushTypes[i])-15
-            end;
-          fRiver: begin xSrc:=7; ySrc:=14 end;
-          fRoad: begin xSrc:=0; ySrc:=9 end;
-          fRR: begin xSrc:=0; ySrc:=10 end;
-          fCanal: begin xSrc:=0; ySrc:=11 end;
-          fPoll: begin xSrc:=6; ySrc:=12 end;
-          fDeadLands,fDeadLands or fCobalt,fDeadLands or fUranium,
-            fDeadLands or fMercury:
-            begin
-            xSrcBase:=6; ySrcBase:=2;
-            xSrc:=8; ySrc:=12+BrushTypes[i] shr 25;
-            end;
-          tiIrrigation, tiFarm, tiMine, tiBase:
-            begin xSrc:=BrushTypes[i] shr 12-1; ySrc:=12 end;
-          tiFort:
-            begin xSrc:=3; ySrc:=12; xSrcBase:=7; ySrcBase:=12 end;
-          fPrefStartPos: begin xSrc:=0; ySrc:=1 end;
-          fStartPos: begin xSrc:=0; ySrc:=2 end;
-          end;
-        if xSrcBase>=0 then
-          Sprite(Panel,HGrTerrain,xTroop+2+x,yTroop+9-yyt,xxt*2,yyt*3,
-            1+xSrcBase*(xxt*2+1),1+ySrcBase*(yyt*3+1));
-        Sprite(Panel,HGrTerrain,xTroop+2+x,yTroop+9-yyt,xxt*2,yyt*3,
-          1+xSrc*(xxt*2+1),1+ySrc*(yyt*3+1));
-        if BrushTypes[i]=BrushType then
-          begin
-          Frame(Panel.Canvas,xTroop+2+x,yTroop+7-yyt div 2,xTroop+2*xxt+x,
-            yTroop+2*yyt+11,$000000,$000000);
-          Frame(Panel.Canvas,xTroop+1+x,yTroop+6-yyt div 2,xTroop+2*xxt-1+x,
-            yTroop+2*yyt+10,MainTexture.clMark,MainTexture.clMark);
+            MapValid := false;
+            PaintAllMaps;
           end
-        end;
-      inc(Count)
-      end;
-    case BrushType of
-      fDesert, fPrairie, fTundra, fArctic, fSwamp, fHills, fMountains:
-        s:=Phrases.Lookup('TERRAIN',BrushType);
-      fShore: s:=Format(Phrases.Lookup('TWOTERRAINS'),
-        [Phrases.Lookup('TERRAIN',fOcean),Phrases.Lookup('TERRAIN',fShore)]);
-      fGrass: s:=Format(Phrases.Lookup('TWOTERRAINS'),
-        [Phrases.Lookup('TERRAIN',fGrass),Phrases.Lookup('TERRAIN',fGrass+12)]);
-      fForest: s:=Format(Phrases.Lookup('TWOTERRAINS'),
-        [Phrases.Lookup('TERRAIN',fForest),Phrases.Lookup('TERRAIN',fJungle)]);
-      fRiver: s:=Phrases.Lookup('RIVER');
-      fDeadLands,fDeadLands or fCobalt,fDeadLands or fUranium,
-        fDeadLands or fMercury:
-        s:=Phrases.Lookup('TERRAIN',3*12+BrushType shr 25);
-      fPrefStartPos: s:=Phrases.Lookup('MAP_PREFSTART');
-      fStartPos: s:=Phrases.Lookup('MAP_START');
-      fPoll: s:=Phrases.Lookup('POLL');
-      else // terrain improvements
-        begin
-        case BrushType of
-          fRoad: i:=1;
-          fRR: i:=2;
-          tiIrrigation: i:=4;
-          tiFarm: i:=5;
-          tiMine: i:=7;
-          fCanal: i:=8;
-          tiFort: i:=10;
-          tiBase: i:=12;
-          end;
-        s:=Phrases.Lookup('JOBRESULT',i);
-        end
-      end;
-    LoweredTextOut(Panel.Canvas,-1,MainTexture,xTroop+1,PanelHeight-19,s);
-    end
-  else if TroopLoc>=0 then
-    begin
-    Brush.Style:=bsClear;
-    if UnFocus>=0 then with MyUn[UnFocus],MyModel[mix] do
-      begin {display info about selected unit}
-      if Job=jCity then
-        mixShow:=-1 // building site
-      else mixShow:=mix;
-      with Tribe[me].ModelPicture[mixShow] do
-        begin
-        Sprite(Panel,HGr,xMidPanel+7+12,yTroop+1,64,48,
-          pix mod 10 *65+1,pix div 10 *49+1);
-        if MyUn[UnFocus].Flags and unFortified<>0 then
-          Sprite(Panel,HGrStdUnits,xMidPanel+7+12,yTroop+1,xxu*2,yyu*2,1+6*(xxu*2+1),1);
-        end;
-
-      MakeBlue(Panel,xMidPanel+7+12+10,yTroop-13,44,12);
-      s:=MovementToString(MyUn[UnFocus]);
-      RisedTextOut(Panel.Canvas,xMidPanel+7+12+32-BiColorTextWidth(Panel.Canvas,s) div 2,
-        yTroop-16,s);
-
-      s:=IntToStr(Health)+'%';
-      LightGradient(Panel.Canvas,xMidPanel+7+12+7,PanelHeight-22,(Health+1) div 2,
-        (ColorOfHealth(Health) and $FEFEFE shr 2)*3);
-      if Health<100 then
-        LightGradient(Panel.Canvas,xMidPanel+7+12+7+(Health+1) div 2,
-          PanelHeight-22,50-(Health+1) div 2,$000000);
-      RisedTextOut(Panel.Canvas,xMidPanel+7+12+32-BiColorTextWidth(Panel.Canvas,s) div 2,
-        PanelHeight-23,s);
-
-      FrameImage(Panel.Canvas,GrExt[HGrSystem].Data,xMidPanel+7+xUnitText,yTroop+15,12,14,
-        121+Exp div ExpCost *13,28);
-      if Job=jCity then s:=Tribe[me].ModelName[-1]
-      else s:=Tribe[me].ModelName[mix];
-      if Home>=0 then
-        begin
-        LoweredTextOut(Panel.Canvas,-1,MainTexture,xMidPanel+7+xUnitText+18,yTroop+5,s);
-        LoweredTextOut(Panel.Canvas,-1,MainTexture,xMidPanel+7+xUnitText+18,yTroop+21,
-          '('+CityName(MyCity[Home].ID)+')');
-        end
-      else LoweredTextOut(Panel.Canvas,-1,MainTexture,xMidPanel+7+xUnitText+18,yTroop+13,s);
-      end;
-
-    if (UnFocus>=0) and (MyUn[UnFocus].Loc<>TroopLoc) then
-      begin // divide panel
-      if SmallScreen and not supervising then
-        x:=xTroop-8
-      else x:=xTroop-152;
-      Pen.Color:=MainTexture.clBevelShade;
-      MoveTo(x-1,PanelHeight-MidPanelHeight+2);
-      LineTo(x-1,PanelHeight);
-      Pen.Color:=MainTexture.clBevelLight;
-      MoveTo(x,PanelHeight-MidPanelHeight+2);
-      LineTo(x,PanelHeight);
-      end;
-
-    for i:=0 to 23 do trix[i]:=-1;
-    if MyMap[TroopLoc] and fUnit<>0 then
-      begin
-      if MyMap[TroopLoc] and fOwned<>0 then
-        begin
-        if (TrCnt>1) or (UnFocus<0) or (MyUn[UnFocus].Loc<>TroopLoc) then
-          begin
-          LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop+10, PanelHeight-24,
-            Phrases.Lookup('PRESENT'));
-          Server(sGetDefender,me,TroopLoc,uixDefender);
-          Count:=0;
-          for Prio:=true downto false do
-            for uix:=0 to MyRO.nUn-1 do if (uix=uixDefender)=Prio then
-              begin // display own units
-              unx:=MyUn[uix];
-              if unx.Loc=TroopLoc then
-                begin
-                if (Count>=TrRow*sb.si.npos) and (Count<TrRow*(sb.si.npos+1)) then
-                  begin
-                  trix[Count-TrRow*sb.si.npos]:=uix;
-                  MakeUnitInfo(me,unx,UnitInfo);
-                  x:=(Count-TrRow*sb.si.npos)*TrPitch;
-                  if uix=UnFocus then
-                    begin
-                    Frame(Panel.Canvas,xTroop+4+x,yTroop+3,xTroop+64+x,
-                      yTroop+47,$000000,$000000);
-                    Frame(Panel.Canvas,xTroop+3+x,yTroop+2,xTroop+63+x,
-                      yTroop+46,MainTexture.clMark,MainTexture.clMark);
-                    end
-                  else if (unx.Master>=0) and (unx.Master=UnFocus) then
-                    begin
-                    CFrame(Panel.Canvas,xTroop+4+x,yTroop+3,xTroop+64+x,
-                      yTroop+47,8,$000000);
-                    CFrame(Panel.Canvas,xTroop+3+x,yTroop+2,xTroop+63+x,
-                      yTroop+46,8,MainTexture.clMark);
-                    end;
-                  NoMap.SetOutput(Panel);
-                  NoMap.PaintUnit(xTroop+2+x,yTroop+1,UnitInfo,unx.Status);
-                  if (ClientMode<scContact)
-                    and ((unx.Job>jNone)
-                      or (unx.Status and (usStay or usRecover or usGoto)<>0)) then
-                    Sprite(Panel, HGrSystem, xTroop+2+60-20+x, yTroop+35,
-                      20, 20, 81, 25);
-
-                  if not supervising then
-                    begin
-                    MakeBlue(Panel,xTroop+2+10+x,yTroop-13,44,12);
-                    s:=MovementToString(unx);
-                    RisedTextOut(Panel.Canvas,xTroop+x+34-BiColorTextWidth(Panel.Canvas,s) div 2,
-                      yTroop-16,s);
-                    end
-                  end;
-                inc(Count)
-                end;
-              end; // for uix:=0 to MyRO.nUn-1
-          assert(Count=TrCnt);
-          end
-        end
-      else
-        begin
-        LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop+8, PanelHeight-24,
-          Phrases.Lookup('PRESENT'));
-        Server(sGetUnits,me,TroopLoc,Count);
-        for i:=0 to Count-1 do
-          if (i>=TrRow*sb.si.npos) and (i<TrRow*(sb.si.npos+1)) then
-            begin // display enemy units
-            trix[i-TrRow*sb.si.npos]:=i;
-            x:=(i-TrRow*sb.si.npos)*TrPitch;
-            NoMap.SetOutput(Panel);
-            NoMap.PaintUnit(xTroop+2+x,yTroop+1,MyRO.EnemyUn[MyRO.nEnemyUn+i],0);
-            end;
-        end;
-      end;
-    if not SmallScreen or supervising then
-      begin // show terrain and improvements
-      PaintZoomedTile(Panel, xTerrain-xxt*2, 110-yyt*3, TroopLoc);
-      if (UnFocus>=0) and (MyUn[UnFocus].Job<>jNone) then
-        begin
-        JobFocus:=MyUn[UnFocus].Job;
-        Server(sGetJobProgress, me, MyUn[UnFocus].Loc, JobProgressData);
-        MakeBlue(Panel,xTerrain-72,148-17,144,31);
-        PaintRelativeProgressBar(Panel.Canvas,3,xTerrain-68,148+3,63,
-          JobProgressData[JobFocus].Done,
-          JobProgressData[JobFocus].NextTurnPlus,
-          JobProgressData[JobFocus].Required,true,MainTexture);
-        s:=Format('%s/%s',[ScreenTools.MovementToString(JobProgressData[JobFocus].Done),
-          ScreenTools.MovementToString(JobProgressData[JobFocus].Required)]);
-        RisedTextOut(Panel.Canvas,xTerrain+6,148-3,s);
-        Tile:=MyMap[MyUn[UnFocus].Loc];
-        if (JobFocus=jRoad) and (Tile and fRiver<>0) then
-          JobFocus:=nJob+0
-        else if (JobFocus=jRR) and (Tile and fRiver<>0) then
-          JobFocus:=nJob+1
-        else if JobFocus=jClear then
-          begin
-          if Tile and fTerrain=fForest then
-            JobFocus:=nJob+2
-          else if Tile and fTerrain=fDesert then
-            JobFocus:=nJob+3
-          else JobFocus:=nJob+4
-          end;
-        s:=Phrases.Lookup('JOBRESULT', JobFocus);
-        RisedTextOut(Panel.Canvas,xTerrain-BiColorTextWidth(Panel.Canvas,s) div 2,
-          148-19,s);
-        end;
-      if MyMap[TroopLoc] and (fTerrain or fSpecial)=fGrass or fSpecial1 then
-        s:=Phrases.Lookup('TERRAIN',fGrass+12)
-      else if MyMap[TroopLoc] and fDeadlands<>0 then
-        s:=Phrases.Lookup('TERRAIN',3*12)
-      else if (MyMap[TroopLoc] and fTerrain=fForest)
-        and IsJungle(TroopLoc div G.lx) then
-        s:=Phrases.Lookup('TERRAIN',fJungle)
-      else s:=Phrases.Lookup('TERRAIN',MyMap[TroopLoc] and fTerrain);
-      RisedTextOut(Panel.Canvas,xTerrain-BiColorTextWidth(Panel.Canvas,s) div 2,
-        99,s);
-      end;
-
-    if TerrainBtn.Visible then with TerrainBtn do
-      RFrame(Panel.Canvas,Left-1,Top-self.ClientHeight+(PanelHeight-1),
-        Left+Width,Top+Height-self.ClientHeight+PanelHeight,
-        MainTexture.clBevelShade,MainTexture.clBevelLight)
-    end {if TroopLoc>=0}
-  end;
-
-for i:=0 to ControlCount-1 do
-  if Controls[i] is TButtonB then with TButtonB(Controls[i]) do
-    begin
-    if Visible then
-      begin
-      Dump(Panel,HGrSystem,Left,Top-self.ClientHeight+PanelHeight,25,25,169,243);
-      Sprite(Panel,HGrSystem,Left,Top-self.ClientHeight+PanelHeight,25,25,
-        1+26*ButtonIndex,337);
-      RFrame(Panel.Canvas,Left-1,Top-self.ClientHeight+(PanelHeight-1),
-        Left+Width,Top+Height-self.ClientHeight+PanelHeight,
-        MainTexture.clBevelShade,MainTexture.clBevelLight);
-      end;
-    end;
-
-if ClientMode<>cEditMap then
-  begin
-  for i:=0 to ControlCount-1 do
-    if Controls[i] is TButtonC then with TButtonC(Controls[i]) do
-      begin
-      Dump(Panel,HGrSystem,Left,Top-self.ClientHeight+PanelHeight,12,12,
-        169,178+13*ButtonIndex);
-      RFrame(Panel.Canvas,Left-1,Top-self.ClientHeight+(PanelHeight-1),
-        Left+Width,Top+Height-self.ClientHeight+PanelHeight,
-        MainTexture.clBevelShade,MainTexture.clBevelLight);
-      end
-  end;
-EOT.SetBack(Panel.Canvas,EOT.Left,EOT.Top-(ClientHeight-PanelHeight));
-SmartRectInvalidate(0,ClientHeight-PanelHeight,ClientWidth,ClientHeight);
-
-// topbar
-xTreasurySection:=ClientWidth div 2-172;
-xResearchSection:=ClientWidth div 2; //ClientWidth div 2+68 = maximum to right
-FillLarge(TopBar.Canvas,0,0,ClientWidth,TopBarHeight-3,ClientWidth div 2);
-with TopBar.Canvas do
-  begin
-  Pen.Color:=$000000;
-  MoveTo(0,TopBarHeight-1); LineTo(ClientWidth, TopBarHeight-1);
-  Pen.Color:=MainTexture.clBevelShade;
-  MoveTo(0,TopBarHeight-2); LineTo(ClientWidth, TopBarHeight-2);
-  MoveTo(0,TopBarHeight-3); LineTo(ClientWidth, TopBarHeight-3);
-  Pen.Color:=MainTexture.clBevelLight;
-  frame(TopBar.Canvas,40,-1,xTreasurySection-1,TopBarHeight-7,
-    MainTexture.clBevelShade,MainTexture.clBevelLight);
-  frame(TopBar.Canvas,xResearchSection+332,-1,ClientWidth,TopBarHeight-7,
-    MainTexture.clBevelShade,MainTexture.clBevelLight);
-  end;
-if GameMode<>cMovie then
-  ImageOp_BCC(TopBar,Templates,2,1,145,38,36,36,$BFBF20,$4040DF);
-if MyRO.nCity>0 then
-  begin
-  TrueMoney:=MyRO.Money;
-  TrueResearch:=MyRO.Research;
-  if supervising then
-    begin // normalize values from after-turn state
-    dec(TrueMoney,TaxSum);
-    if TrueMoney<0 then
-      TrueMoney:=0; // shouldn't happen
-    dec(TrueResearch,ScienceSum);
-    if TrueResearch<0 then
-      TrueResearch:=0; // shouldn't happen
-    end;
-
-  // treasury section
-  ImageOp_BCC(TopBar,Templates,xTreasurySection+8,1,145,1,36,36,$40A040,$4030C0);
-  s:=IntToStr(TrueMoney);
-  LoweredTextOut(TopBar.Canvas,-1,MainTexture,xTreasurySection+48,0,s+'%c');
-  if MyRO.Government<>gAnarchy then
-    begin
-    ImageOp_BCC(TopBar,Templates,xTreasurySection+48,22,124,1,14,14,$0000C0, $0080C0);
-    if TaxSum>=0 then
-      s:=Format(Phrases.Lookup('MONEYGAINPOS'),[TaxSum])
-    else s:=Format(Phrases.Lookup('MONEYGAINNEG'),[TaxSum]);
-    LoweredTextOut(TopBar.Canvas,-1,MainTexture,xTreasurySection+48+15,18,s);
-    end;
-
-  // research section
-  ImageOp_BCC(TopBar,Templates,xResearchSection+8,1,145,75,36,36,$FF0000,$00FFE0);
-  if MyData.FarTech<>adNexus then
-    begin
-    if MyRO.ResearchTech<0 then
-      CostFactor:=2
-    else if (MyRO.ResearchTech=adMilitary) or (MyRO.Tech[MyRO.ResearchTech]=tsSeen) then
-      CostFactor:=1
-    else if MyRO.ResearchTech in FutureTech then
-      if MyRO.Government=gFuture then
-        CostFactor:=4
-      else CostFactor:=8
-    else CostFactor:=2;
-    Server(sGetTechCost,me,0,i);
-    CostFactor:=CostFactor*22; // length of progress bar
-    PaintRelativeProgressBar(TopBar.Canvas,2,xResearchSection+48+1,26,
-      CostFactor,TrueResearch,ScienceSum,i,true,MainTexture);
-
-    if MyRO.ResearchTech<0 then
-      s:=Phrases.Lookup('SCIENCE')
-    else if MyRO.ResearchTech=adMilitary then
-      s:=Phrases.Lookup('INITUNIT')
-    else
-      begin
-      s:=Phrases.Lookup('ADVANCES', MyRO.ResearchTech);
-      if MyRO.ResearchTech in FutureTech then
-        if MyRO.Tech[MyRO.ResearchTech]>=1 then
-          s:=s+' '+IntToStr(MyRO.Tech[MyRO.ResearchTech]+1)
-        else s:=s+' 1';
-      end;
-    if ScienceSum>0 then
-      begin
-{      j:=(i-MyRO.Research-1) div ScienceSum +1;
-      if j<1 then j:=1;
-      if j>1 then
-        s:=Format(Phrases.Lookup('TECHWAIT'),[s,j]);}
-      LoweredTextOut(TopBar.Canvas,-1,MainTexture,xResearchSection+48,0,s);
-      end
-    else LoweredTextOut(TopBar.Canvas,-1,MainTexture,xResearchSection+48,0,s);
-    end
-  else CostFactor:=0;
-  if (MyData.FarTech<>adNexus) and (ScienceSum>0) then
-    begin
-    ImageOp_BCC(TopBar,Templates,xResearchSection+48+CostFactor+11,22,124,1,14,14,$0000C0, $0080C0);
-    s:=Format(Phrases.Lookup('TECHGAIN'),[ScienceSum]);
-    LoweredTextOut(TopBar.Canvas,-1,MainTexture,xResearchSection+48+CostFactor+26,18,s);
-    end
-  end;
-if ClientMode<>cEditMap then
-  begin
-  TopBar.Canvas.Font.Assign(UniFont[ftCaption]);
-  s:=TurnToString(MyRO.Turn);
-  RisedTextOut(TopBar.Canvas,40+(xTreasurySection-40-BiColorTextWidth(TopBar.Canvas,s)) div 2,6,s);
-  TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
-  end;
-RectInvalidate(0,0,ClientWidth,TopBarHeight);
-end;{PanelPaint}
-
-procedure TMainScreen.FocusOnLoc(Loc:integer; Options: integer = 0);
-var
-dx: integer;
-Outside, Changed: boolean;
-begin
-dx:=G.lx+1-(xw-Loc+G.lx*1024+1) mod G.lx;
-Outside:=(dx>=(MapWidth+1) div (xxt*2)-2)
-  or (ywmax>0) and ((yw>0) and (Loc div G.lx<=yw+1)
-    or (yw<ywmax) and (Loc div G.lx>=yw+(MapHeight-1) div yyt-2));
-Changed:=true;
-if Outside then
-  begin Centre(Loc); PaintAllMaps end
-else if not MapValid then
-  PaintAllMaps
-else Changed:=false;
-if Options and flRepaintPanel<>0 then
-  PanelPaint;
-if Changed and (Options and flImmUpdate<>0) then Update;
-end;
-
-procedure TMainScreen.NextUnit(NearLoc:integer;AutoTurn:boolean);
-var
-Dist,TestDist:single;
-i,uix,NewFocus:integer;
-GotoOnly: boolean;
-begin
-if ClientMode>=scContact then exit;
-DestinationMarkON:=false;
-PaintDestination;
-for GotoOnly:=GoOnPhase downto false do
-  begin
-  NewFocus:=-1;
-  for i:=1 to MyRO.nUn do
-    begin
-    uix:=(UnFocus+i) mod MyRO.nUn;
-    if (MyUn[uix].Loc>=0) and (MyUn[uix].Job=jNone)
-      and (MyUn[uix].Status and (usStay or usRecover or usWaiting)=usWaiting)
-      and (not GotoOnly or (MyUn[uix].Status and usGoto<>0)) then
-      if NearLoc<0 then begin NewFocus:=uix; Break end
-      else
-        begin
-        TestDist:=Distance(NearLoc,MyUn[uix].Loc);
-        if (NewFocus<0) or (TestDist<Dist) then
-          begin NewFocus:=uix; Dist:=TestDist end
-        end
-    end;
-  if GotoOnly then
-    if NewFocus<0 then GoOnPhase:=false
-    else break;
-  end;
-if NewFocus>=0 then
-  begin
-  SetUnFocus(NewFocus);
-  SetTroopLoc(MyUn[NewFocus].Loc);
-  FocusOnLoc(TroopLoc,flRepaintPanel)
-  end
-else if AutoTurn and not mWaitTurn.Checked then
-  begin
-  TurnComplete:=true;
-  SetUnFocus(-1);
-  SetTroopLoc(-1);
-  PostMessage(Handle,WM_EOT,0,0)
-  end
-else
-  begin
-  if {(UnFocus>=0) and} not TurnComplete and EOT.Visible then Play('TURNEND');
-  TurnComplete:=true;
-  SetUnFocus(-1);
-  SetTroopLoc(-1);
-  PanelPaint;
-  end;
-end;{NextUnit}
-
-procedure TMainScreen.Scroll(dx,dy: integer);
-begin
-xw:=(xw+G.lx+dx) mod G.lx;
-if ywmax>0 then
-  begin
-  yw:=yw+2*dy;
-  if yw<0 then yw:=0
-  else if yw>ywmax then yw:=ywmax;
-  end;
-MainOffscreenPaint;
-xwMini:=xw; ywMini:=yw;
-MiniPaint;
-CopyMiniToPanel;
-RectInvalidate(xMini+2,TopBarHeight+MapHeight-overlap+yMini+2,xMini+2+G.lx*2,
-  TopBarHeight+MapHeight-overlap+yMini+2+G.ly);
-Update;
-end;
-
-procedure TMainScreen.Timer1Timer(Sender:TObject);
-var
-dx, dy, speed: integer;
-begin
-if idle and (me>=0) and (GameMode<>cMovie) then
-  if (fsModal in Screen.ActiveForm.FormState)
-    or (Screen.ActiveForm is TBufferedDrawDlg)
-    and (TBufferedDrawDlg(Screen.ActiveForm).WindowMode<>wmPersistent) then
-    begin
-    BlinkTime:=BlinkOnTime+BlinkOffTime-1;
-    if not BlinkON then
-      begin
-      BlinkON:=true;
-      if UnFocus>=0 then
-        PaintLocTemp(MyUn[UnFocus].Loc)
-      else if TurnComplete and not supervising then
-        EOT.SetButtonIndexFast(eotBlinkOn)
-      end
-    end
-  else
-    begin
-    if Application.Active and not mScrollOff.Checked then
-      begin
-      if mScrollFast.Checked then Speed:=2
-      else Speed:=1;
-      dx:=0;
-      dy:=0;
-      if Mouse.CursorPos.y<Screen.Height-PanelHeight then
-        if Mouse.CursorPos.x=0 then dx:=-Speed // scroll left
-        else if Mouse.CursorPos.x=Screen.Width-1 then dx:=Speed; // scroll right
-      if Mouse.CursorPos.y=0 then dy:=-Speed // scroll up
-      else if (Mouse.CursorPos.y=Screen.Height-1)
-        and (Mouse.CursorPos.x>=TerrainBtn.Left+TerrainBtn.Width)
-        and (Mouse.CursorPos.x<xRightPanel+10-8) then dy:=Speed; // scroll down
-      if (dx<>0) or (dy<>0) then
-        begin
-        if (Screen.ActiveForm<>MainScreen)
-          and (@Screen.ActiveForm.OnDeactivate<>nil) then
-          Screen.ActiveForm.OnDeactivate(nil);
-        Scroll(dx,dy);
-        end
-      end;
-
-    BlinkTime:=(BlinkTime+1) mod (BlinkOnTime+BlinkOffTime);
-    BlinkON:= BlinkTime>=BlinkOffTime;
-    DestinationMarkON:=true;
-    if UnFocus>=0 then
-      begin
-      if (BlinkTime=0) or (BlinkTime=BlinkOffTime) then
-        begin
-        PaintLocTemp(MyUn[UnFocus].Loc,pltsBlink);
-        PaintDestination;
-  //      if MoveHintToLoc>=0 then
-  //        ShowMoveHint(MoveHintToLoc, true);
+          else if Flag = tfAllTechs then
+            TellNewModels
         end
       end
-    else if TurnComplete and not supervising then
-      begin
-      if BlinkTime=0 then EOT.SetButtonIndexFast(eotBlinkOff)
-      else if BlinkTime=BlinkOffTime then EOT.SetButtonIndexFast(eotBlinkOn)
+    end;
+
+    procedure TMainScreen.MapBtnClick(Sender: TObject);
+    begin
+      with TButtonC(Sender) do
+      begin
+        MapOptionChecked := MapOptionChecked xor (1 shl (Tag shr 8));
+        SetMapOptions;
+        ButtonIndex := MapOptionChecked shr (Tag shr 8) and 1 + 2
+      end;
+      if Sender = MapBtn0 then
+      begin
+        MiniPaint;
+        PanelPaint
+      end // update mini map only
+      else
+      begin
+        MapValid := false;
+        PaintAllMaps;
+      end; // update main map
+    end;
+
+    procedure TMainScreen.GrWallBtnDownChanged(Sender: TObject);
+    begin
+      if TButtonBase(Sender).Down then
+      begin
+        MapOptionChecked := MapOptionChecked or (1 shl moGreatWall);
+        TButtonBase(Sender).Hint := '';
       end
-    end
-end;
-
-procedure TMainScreen.Centre(Loc:integer);
-begin
-if FastScrolling and MapValid then update;
-  // necessary because ScrollDC for form canvas is called after
-xw:=(Loc mod G.lx-(MapWidth-xxt*2*((Loc div G.lx) and 1)) div (xxt*4)+G.lx) mod G.lx;
-if ywmax<=0 then yw:=ywcenter
-else
-  begin
-  yw:=(Loc div G.lx-MapHeight div (yyt*2)+1) and not 1;
-  if yw<0 then yw:=0
-  else if yw>ywmax then yw:=ywmax;
-  end
-end;
-
-function TMainScreen.ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
-  ShowEvent: integer = 0): boolean;
-begin
-result:= MyMap[Loc] and (fOwned or fSpiedOut)<>0;
-if result then with CityDlg do
-  begin
-  if ClientMode>=scContact then
-    begin
-    CloseAction:=None;
-    RestoreUnFocus:=-1;
-    end
-  else if NextUnitOnClose then
-    begin
-    CloseAction:=StepFocus;
-    RestoreUnFocus:=-1;
-    end
-  else if not Visible then
-    begin
-    CloseAction:=RestoreFocus;
-    RestoreUnFocus:=UnFocus;
-    end;
-  SetUnFocus(-1);
-  SetTroopLoc(Loc);
-  MarkCityLoc:=Loc;
-  PanelPaint;
-  ShowNewContent(wmPersistent, Loc, ShowEvent);
-  end
-end;
-
-function TMainScreen.LocationOfScreenPixel(x,y: integer): integer;
-var
-qx,qy: integer;
-begin
-qx:=(x*(yyt*2)+y*(xxt*2)+xxt*yyt*2) div (xxt*yyt*4)-1;
-qy:=(y*(xxt*2)-x*(yyt*2)-xxt*yyt*2+4000*xxt*yyt) div (xxt*yyt*4)-999;
-result:=(xw+(qx-qy+2048) div 2-1024+G.lx) mod G.lx+G.lx*(yw+qx+qy);
-end;
-
-procedure TMainScreen.MapBoxMouseDown(Sender:TObject;
-  Button:TMouseButton;Shift:TShiftState;x,y:integer);
-var
-i,uix,emix,p1,dx,dy,MouseLoc:integer;
-EditTileData: TEditTileData;
-m,m2: TMenuItem;
-MoveAdviceData: TMoveAdviceData;
-DoCenter: boolean;
-begin
-if GameMode=cMovie then
-  exit;
-
-if CityDlg.Visible then CityDlg.Close;
-if UnitStatDlg.Visible then UnitStatDlg.Close;
-MouseLoc:=LocationOfScreenPixel(x,y);
-if (MouseLoc<0) or (MouseLoc>=G.lx*G.ly) then exit;
-if (Button=mbLeft) and not(ssShift in Shift) then
-  begin
-  DoCenter:=true;
-  if ClientMode=cEditMap then
-    begin
-    DoCenter:=false;
-    EditTileData.Loc:=MouseLoc;
-    if ssCtrl in Shift then // toggle special resource
-      case MyMap[MouseLoc] and fTerrain of
-        fOcean: EditTileData.NewTile:=MyMap[MouseLoc];
-        fGrass, fArctic: EditTileData.NewTile:=MyMap[MouseLoc] and not fSpecial
-          or ((MyMap[MouseLoc] shr 5 and 3+1) mod 2 shl 5);
-        else EditTileData.NewTile:=MyMap[MouseLoc] and not fSpecial
-          or ((MyMap[MouseLoc] shr 5 and 3+1) mod 3 shl 5)
-        end
-    else if BrushType<=fTerrain then
-      EditTileData.NewTile:=MyMap[MouseLoc] and not fTerrain or fSpecial or BrushType
-    else if BrushType and fDeadLands<>0 then
-      if MyMap[MouseLoc] and (fDeadLands or fModern)
-        =BrushType and (fDeadLands or fModern) then
-        EditTileData.NewTile:=MyMap[MouseLoc] and not (fDeadLands or fModern)
-      else EditTileData.NewTile:=MyMap[MouseLoc] and not (fDeadLands or fModern)
-        or BrushType
-    else if BrushType and fTerImp<>0 then
-      if MyMap[MouseLoc] and fTerImp=BrushType then
-        EditTileData.NewTile:=MyMap[MouseLoc] and not fTerImp
-      else EditTileData.NewTile:=MyMap[MouseLoc] and not fTerImp or BrushType
-    else if BrushType and (fPrefStartPos or fStartPos)<>0 then
-      if MyMap[MouseLoc] and (fPrefStartPos or fStartPos)
-        =BrushType and (fPrefStartPos or fStartPos) then
-        EditTileData.NewTile:=MyMap[MouseLoc] and not (fPrefStartPos or fStartPos)
-      else EditTileData.NewTile:=MyMap[MouseLoc]
-        and not (fPrefStartPos or fStartPos) or BrushType
-    else EditTileData.NewTile:=MyMap[MouseLoc] xor BrushType;
-    Server(sEditTile,me,0,EditTileData);
-    Edited:=true;
-    BrushLoc:=MouseLoc;
-    PaintLoc(MouseLoc,2);
-    MiniPaint;
-    BitBlt(Panel.Canvas.Handle,xMini+2,yMini+2,G.lx*2,G.ly,Mini.Canvas.Handle,
-      0,0,SRCCOPY);
-    if ywmax<=0 then
-      Frame(Panel.Canvas,xMini+2+G.lx-MapWidth div (2*xxt),yMini+2,
-        xMini+1+G.lx+MapWidth div (2*xxt),
-        yMini+2+G.ly-1,MainTexture.clMark,MainTexture.clMark)
-    else Frame(Panel.Canvas,xMini+2+G.lx-MapWidth div (2*xxt),yMini+2+yw,
-      xMini+2+G.lx+MapWidth div (2*xxt)-1,
-      yMini+2+yw+MapHeight div yyt-2,MainTexture.clMark,MainTexture.clMark);
-    RectInvalidate(xMini+2,TopBarHeight+MapHeight-overlap+yMini+2,xMini+2+G.lx*2,
-      TopBarHeight+MapHeight-overlap+yMini+2+G.ly)
-    end
-  else if MyMap[MouseLoc] and fCity<>0 then {city clicked}
-    begin
-    if MyMap[MouseLoc] and (fOwned or fSpiedOut)<>0 then
-      begin
-      ZoomToCity(MouseLoc);
-      DoCenter:=false;
+      else
+      begin
+        MapOptionChecked := MapOptionChecked and not(1 shl moGreatWall);
+        TButtonBase(Sender).Hint := Phrases.Lookup('CONTROLS',
+          -1 + TButtonBase(Sender).Tag and $FF);
+      end;
+      SetMapOptions;
+      MapValid := false;
+      PaintAllMaps;
+    end;
+
+    procedure TMainScreen.BareBtnDownChanged(Sender: TObject);
+    begin
+      if TButtonBase(Sender).Down then
+      begin
+        MapOptionChecked := MapOptionChecked or (1 shl moBareTerrain);
+        TButtonBase(Sender).Hint := '';
       end
-    else
-      begin
-      UnitStatDlg.ShowNewContent_EnemyCity(wmPersistent, MouseLoc);
-      DoCenter:=false;
-      end
-    end
-  else if MyMap[MouseLoc] and fUnit<>0 then {unit clicked}
-    if MyMap[MouseLoc] and fOwned<>0 then
-      begin
-      DoCenter:=false;
-      if not supervising and (ClientMode<scContact) then
-        begin // not in negotiation mode
-        if (UnFocus>=0) and (MyUn[UnFocus].Loc=MouseLoc) then
-          begin // rotate
-          uix:=(UnFocus+1) mod MyRO.nUn;
-          i:=MyRO.nUn-1;
-          while i>0 do
-            begin
-            if (MyUn[uix].Loc=MouseLoc) and (MyUn[uix].Job=jNone)
-              and (MyUn[uix].Status and (usStay or usRecover or usEnhance or usWaiting)=usWaiting) then
-              break;
-            dec(i);
-            uix:=(uix+1) mod MyRO.nUn;
-            end;
-          if i=0 then uix:=UnFocus
-          end
-        else Server(sGetDefender,me,MouseLoc,uix);
-        if uix<>UnFocus then
-          SetUnFocus(uix);
-        TurnComplete:=false;
-        EOT.ButtonIndex:=eotGray;
-        end;
-      SetTroopLoc(MouseLoc);
-      PanelPaint;
-      end // own unit
-    else if (MyMap[MouseLoc] and fSpiedOut<>0) and not(ssCtrl in Shift) then
-      begin
-      DoCenter:=false;
-      SetTroopLoc(MouseLoc);
-      PanelPaint;
-      end
-    else
-      begin
-      DoCenter:=false;
-      UnitStatDlg.ShowNewContent_EnemyLoc(wmPersistent, MouseLoc);
+      else
+      begin
+        MapOptionChecked := MapOptionChecked and not(1 shl moBareTerrain);
+        TButtonBase(Sender).Hint := Phrases.Lookup('CONTROLS',
+          -1 + TButtonBase(Sender).Tag and $FF);
       end;
-  if DoCenter then begin Centre(MouseLoc); PaintAllMaps end
-  end
-else if (ClientMode<>cEditMap) and (Button=mbRight) and not(ssShift in Shift) then
-  begin
-  if supervising then
-    begin
-    EditLoc:=MouseLoc;
-    Server(sGetModels,me,0,nil^);
-    EmptyMenu(mCreateUnit);
-    for p1:=0 to nPl-1 do if 1 shl p1 and MyRO.Alive<>0 then
-      begin
-      m:=TMenuItem.Create(mCreateUnit);
-      m.Caption:=Tribe[p1].TPhrase('SHORTNAME');
-      for emix:=MyRO.nEnemyModel-1 downto 0 do
-        if (MyRO.EnemyModel[emix].Owner=p1) and
-          (Server(sCreateUnit-sExecute+p1 shl 4,me,MyRO.EnemyModel[emix].mix,MouseLoc)>=rExecuted) then
-          begin
-          if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr=0 then
-            InitEnemyModel(emix);
-          m2:=TMenuItem.Create(m);
-          m2.Caption:=Tribe[p1].ModelName[MyRO.EnemyModel[emix].mix];
-          m2.Tag:=p1 shl 16 + MyRO.EnemyModel[emix].mix;
-          m2.OnClick:=CreateUnitClick;
-          m.Add(m2);
-          end;
-      m.Visible:= m.Count>0;
-      mCreateUnit.Add(m);
-      end;
-    if FullScreen then EditPopup.Popup(Left+x, Top+y)
-    else EditPopup.Popup(Left+x+4, Top+y+GetSystemMetrics(SM_CYCAPTION)+4);
-    end
-  else if (UnFocus>=0) and (MyUn[UnFocus].Loc<>MouseLoc) then with MyUn[UnFocus] do
-    begin
-    dx:=((MouseLoc mod G.lx *2 +MouseLoc div G.lx and 1)
-      -(Loc mod G.lx *2 +Loc div G.lx and 1)+3*G.lx) mod (2*G.lx) -G.lx;
-    dy:=MouseLoc div G.lx-Loc div G.lx;
-    if abs(dx)+abs(dy)<3 then
+      SetMapOptions;
+      MapValid := false;
+      PaintAllMaps;
+    end;
+
+    procedure TMainScreen.FormKeyUp(Sender: TObject; var Key: word;
+      Shift: TShiftState);
+    begin
+      if idle and (Key = VK_APPS) then
+      begin
+        InitPopup(GamePopup);
+        if FullScreen then
+          GamePopup.Popup(Left, Top + TopBarHeight - 1)
+        else
+          GamePopup.Popup(Left + 4, Top + GetSystemMetrics(SM_CYCAPTION) + 4 +
+            TopBarHeight - 1);
+        exit
+      end // windows menu button calls game menu
+    end;
+
+    procedure TMainScreen.CreateUnitClick(Sender: TObject);
+    var
+      p1, mix: integer;
+    begin
+      p1 := TComponent(Sender).Tag shr 16;
+      mix := TComponent(Sender).Tag and $FFFF;
+      if Server(sCreateUnit + p1 shl 4, me, mix, EditLoc) >= rExecuted then
+        PaintLoc(EditLoc);
+    end;
+
+    procedure TMainScreen.mSoundOffClick(Sender: TObject);
+    begin
+      SoundMode := smOff;
+    end;
+
+    procedure TMainScreen.mSoundOnClick(Sender: TObject);
+    begin
+      SoundMode := smOn;
+    end;
+
+    procedure TMainScreen.mSoundOnAltClick(Sender: TObject);
+    begin
+      SoundMode := smOnAlt;
+    end;
+
+    { procedure TMainScreen.AdviceBtnClick;
+      var
+      OldAdviceLoc: integer;
       begin
       DestinationMarkON:=false;
       PaintDestination;
-      Status:=Status and ($FFFF-usStay-usRecover-usGoto-usEnhance) or usWaiting;
-      MoveUnit(dx,dy,muAutoNext) {simple move}
-      end
-    else if GetMoveAdvice(UnFocus,MouseLoc,MoveAdviceData)>=rExecuted then
-      begin
-      if MyMap[MouseLoc] and (fUnit or fOwned)=fUnit then
-        begin // check for suicide mission before movement
-        with MyUn[UnFocus],BattleDlg.Forecast do
-          begin
-          pAtt:=me;
-          mixAtt:=mix;
-          HealthAtt:=Health;
-          ExpAtt:=Exp;
-          FlagsAtt:=Flags;
-          end;
-        BattleDlg.Forecast.Movement:=MyUn[UnFocus].Movement;
-        if (Server(sGetBattleForecastEx,me,MouseLoc,BattleDlg.Forecast)>=rExecuted)
-          and (BattleDlg.Forecast.EndHealthAtt<=0) then
-          begin
-          BattleDlg.uix:=UnFocus;
-          BattleDlg.ToLoc:=MouseLoc;
-          BattleDlg.IsSuicideQuery:=true;
-          BattleDlg.ShowModal;
-          if BattleDlg.ModalResult<>mrOK then
-            exit;
-          end
-        end;
-      DestinationMarkON:=false;
-      PaintDestination;
-      Status:=Status and not (usStay or usRecover or usEnhance) or usWaiting;
-      MoveToLoc(MouseLoc,false); {goto}
-      end
-    end
-  end
-else if (Button=mbMiddle) and (UnFocus>=0)
-  and (MyModel[MyUn[UnFocus].mix].Kind in [mkSettler,mkSlaves]) then
-  begin
-  DestinationMarkON:=false;
-  PaintDestination;
-  MyUn[UnFocus].Status:=MyUn[UnFocus].Status and ($FFFF-usStay-usRecover-usGoto) or usEnhance;
-  uix:=UnFocus;
-  if MouseLoc<>MyUn[uix].Loc then MoveToLoc(MouseLoc,true); {goto}
-  if (UnFocus=uix) and (MyUn[uix].Loc=MouseLoc) then MenuClick(mEnhance)
-  end
-else if (Button=mbLeft) and (ssShift in Shift)
-  and (MyMap[MouseLoc] and fTerrain<>fUNKNOWN) then
-  HelpOnTerrain(MouseLoc, wmPersistent)
-else if (ClientMode<=cContinue) and (Button=mbRight) and (ssShift in Shift)
-  and (UnFocus>=0) and (MyMap[MouseLoc] and (fUnit or fOwned)=fUnit) then
-  begin // battle forecast
-  with MyUn[UnFocus],BattleDlg.Forecast do
-    begin
-    pAtt:=me;
-    mixAtt:=mix;
-    HealthAtt:=Health;
-    ExpAtt:=Exp;
-    FlagsAtt:=Flags;
-    end;
-  BattleDlg.Forecast.Movement:=MyUn[UnFocus].Movement;
-  if Server(sGetBattleForecastEx,me,MouseLoc,BattleDlg.Forecast)>=rExecuted then
-    begin
-    BattleDlg.uix:=UnFocus;
-    BattleDlg.ToLoc:=MouseLoc;
-    BattleDlg.Left:=x-BattleDlg.Width div 2;
-    if BattleDlg.Left<0 then
-      BattleDlg.Left:=0
-    else if BattleDlg.Left+BattleDlg.Width>Screen.Width then
-      BattleDlg.Left:=Screen.Width-BattleDlg.Width;
-    BattleDlg.Top:=y-BattleDlg.Height div 2;
-    if BattleDlg.Top<0 then
-      BattleDlg.Top:=0
-    else if BattleDlg.Top+BattleDlg.Height>Screen.Height then
-      BattleDlg.Top:=Screen.Height-BattleDlg.Height;
-    BattleDlg.IsSuicideQuery:=false;
-    BattleDlg.Show;
-    end
-  end
-end;
-
-function TMainScreen.MoveUnit(dx,dy:integer; Options: integer): integer;
-// move focused unit to adjacent tile
-var
-i,cix,uix,euix,FromLoc,ToLoc,DirCode,UnFocus0,Defender,Mission,p1,
-  NewTiles,cixChanged: integer;
-OldToTile: cardinal;
-CityCaptured, IsAttack, OldUnrest, NewUnrest, NeedEcoUpdate, NeedRepaintPanel,
-  ToTransport, ToShip: boolean;
-PlaneReturnData: TPlaneReturnData;
-QueryItem: string;
-begin
-result:=eInvalid;
-UnFocus0:=UnFocus;
-FromLoc:=MyUn[UnFocus].Loc;
-ToLoc:=dLoc(FromLoc,dx,dy);
-if (ToLoc<0) or (ToLoc>=G.lx*G.ly) then begin result:=eInvalid; exit; end;
-if MyMap[ToLoc] and fStealthUnit<>0 then
-  begin
-  SoundMessage(Phrases.LookUp('ATTACKSTEALTH'),'');
-  exit;
-  end;
-if MyMap[ToLoc] and fHiddenUnit<>0 then
-  begin
-  SoundMessage(Phrases.LookUp('ATTACKSUB'),'');
-  exit;
-  end;
-
-if MyMap[ToLoc] and (fUnit or fOwned)=fUnit then
-  begin // attack -- search enemy unit
-  if (MyModel[MyUn[UnFocus].mix].Attack=0)
-    and not ((MyModel[MyUn[UnFocus].mix].Cap[mcBombs]>0)
-      and (MyUn[UnFocus].Flags and unBombsLoaded<>0)) then
-    begin
-    SoundMessage(Phrases.LookUp('NOATTACKER'),'');
-    exit;
-    end;
-  euix:=MyRO.nEnemyUn-1;
-  while (euix>=0) and (MyRO.EnemyUn[euix].Loc<>ToLoc) do dec(euix);
-  end;
-
-DirCode:=dx and 7 shl 4+dy and 7 shl 7;
-result:=Server(sMoveUnit-sExecute+DirCode,me,UnFocus,nil^);
-if (result<rExecuted) and (MyUn[UnFocus].Job>jNone) then
-  Server(sStartJob+jNone shl 4,me,UnFocus,nil^);
-if (result<rExecuted) and (result<>eNoTime_Move) then
-  begin
-  case result of
-    eNoTime_Load:
-      if MyModel[MyUn[UnFocus].mix].Domain=dAir then
-        SoundMessage(Phrases.Lookup('NOTIMELOADAIR'),'NOMOVE_TIME')
-      else
-        SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
-          [MovementToString(MyModel[MyUn[UnFocus].mix].Speed)]),'NOMOVE_TIME');
-    eNoTime_Bombard: SoundMessage(Phrases.Lookup('NOTIMEBOMBARD'),'NOMOVE_TIME');
-    eNoTime_Expel: SoundMessage(Phrases.Lookup('NOTIMEEXPEL'),'NOMOVE_TIME');
-    eNoRoad: SoundMessage(Phrases.Lookup('NOROAD'),'NOMOVE_DEFAULT');
-    eNoNav: SoundMessage(Phrases.Lookup('NONAV'),'NOMOVE_DEFAULT');
-    eNoCapturer: SoundMessage(Phrases.Lookup('NOCAPTURER'),'NOMOVE_DEFAULT');
-    eNoBombarder: SoundMessage(Phrases.Lookup('NOBOMBARDER'),'NOMOVE_DEFAULT');
-    eZOC: ContextMessage(Phrases.Lookup('ZOC'), 'NOMOVE_ZOC', hkText, HelpDlg.TextIndex('MOVEMENT'));
-    eTreaty:
-      if MyMap[ToLoc] and (fUnit or fOwned)<>fUnit then {no enemy unit -- move}
-        SoundMessage(Tribe[MyRO.Territory[ToLoc]].TPhrase('PEACE_NOMOVE'),
-          'NOMOVE_TREATY')
-      else SoundMessage(Tribe[MyRO.EnemyUn[euix].Owner].TPhrase
-        ('PEACE_NOATTACK'),'NOMOVE_TREATY');
-    eDomainMismatch:
-      begin
-      if (MyModel[MyUn[UnFocus].mix].Domain<dSea)
-        and (MyMap[ToLoc] and (fUnit or fOwned)=fUnit or fOwned) then
-        begin // false load attempt
-        ToShip:=false;
-        ToTransport:=false;
-        for uix:=0 to MyRo.nUn-1 do
-          if (MyUn[uix].Loc=ToLoc) and (MyModel[MyUn[uix].mix].Domain=dSea) then
-            begin
-            ToShip:=true;
-            if MyModel[MyUn[uix].mix].Cap[mcSeaTrans]>0 then
-              ToTransport:=true;
-            end;
-        if ToTransport then
-          SoundMessage(Phrases.Lookup('FULLTRANSPORT'),'NOMOVE_DEFAULT')
-        else if ToShip then
-          SoundMessage(Phrases.Lookup('NOTRANSPORT'),'NOMOVE_DEFAULT')
-        else Play('NOMOVE_DOMAIN');
-        end
-      else Play('NOMOVE_DOMAIN');
-      end
-    else Play('NOMOVE_DEFAULT');
-    end;
-  exit;
-  end;
-
-if ((result=eWon) or (result=eLost) or (result=eBloody))
-  and (MyUn[UnFocus].Movement<100)
-  and (MyModel[MyUn[UnFocus].mix].Cap[mcWill]=0) then
-  begin
-  if SimpleQuery(mkYesNo,Format(Phrases.Lookup('FASTATTACK'),
-    [MyUn[UnFocus].Movement]),'NOMOVE_TIME')<>mrOk then
-    begin result:=eInvalid; exit; end;
-  Update; // remove message box from screen
-  end;
-
-OldUnrest:=false;
-NewUnrest:=false;
-if (result>=rExecuted) and (result and rUnitRemoved=0)
-  and (MyMap[ToLoc] and (fUnit or fOwned)<>fUnit) then
-  begin
-  OldUnrest:=UnrestAtLoc(UnFocus,FromLoc);
-  NewUnrest:=UnrestAtLoc(UnFocus,ToLoc);
-  if NewUnrest>OldUnrest then
-    begin
-    if MyRO.Government=gDemocracy then
-      begin
-      QueryItem:='UNREST_NOTOWN';
-      p1:=me;
-      end
-    else
-      begin
-      QueryItem:='UNREST_FOREIGN';
-      p1:=MyRO.Territory[ToLoc];
+      AdvisorDlg.GiveStrategyAdvice;
+      OldAdviceLoc:=MainMap.AdviceLoc;
+      MainMap.AdviceLoc:=-1;
+      PaintLoc(OldAdviceLoc);
+      end; }
+
+    { procedure TMainScreen.SetAdviceLoc(Loc: integer; AvoidRect: TRect);
+      var
+      OldAdviceLoc,x,y: integer;
+      begin
+      if Loc<>MainMap.AdviceLoc then
+      begin
+      if Loc>=0 then
+      begin // center
+      y:=Loc div G.lx;
+      x:=(Loc+G.lx - AvoidRect.Right div (2*66)) mod G.lx;
+      Centre(y*G.lx+x);
+      PaintAllMaps;
       end;
-    with MessgExDlg do
-      begin
-      MessgText:=Format(Tribe[p1].TPhrase(QueryItem),[Phrases.Lookup('GOVERNMENT',MyRO.Government)]);
-      Kind:=mkYesNo;
-      IconKind:=mikImp;
-      IconIndex:=imPalace;
-      ShowModal;
-      if ModalResult<>mrOk then
-        begin result:=eInvalid; exit; end;
+      OldAdviceLoc:=MainMap.AdviceLoc;
+      MainMap.AdviceLoc:=Loc;
+      PaintLoc(OldAdviceLoc);
+      PaintLoc(MainMap.AdviceLoc);
       end;
-    Update; // remove message box from screen
-    end
-  end;
-
-if (result>=rExecuted)
-  and (MyModel[MyUn[UnFocus].mix].Domain=dAir)
-  and (MyUn[UnFocus].Status and usToldNoReturn=0) then
-  begin // can plane return?
-  PlaneReturnData.Fuel:=MyUn[UnFocus].Fuel;
-  if (MyMap[ToLoc] and (fUnit or fOwned)=fUnit)
-    or (MyMap[ToLoc] and (fCity or fOwned)=fCity) then
-    begin // attack/expel/bombard -> 100MP
-    PlaneReturnData.Loc:=FromLoc;
-    PlaneReturnData.Movement:=MyUn[UnFocus].Movement-100;
-    if PlaneReturnData.Movement<0 then PlaneReturnData.Movement:=0;
-    end
-  else // move
-    begin
-    PlaneReturnData.Loc:=ToLoc;
-    if dx and 1<>0 then PlaneReturnData.Movement:=MyUn[UnFocus].Movement-100
-    else PlaneReturnData.Movement:=MyUn[UnFocus].Movement-150;
-    end;
-  if Server(sGetPlaneReturn, me, UnFocus, PlaneReturnData)=eNoWay then
-    begin
-    if MyModel[MyUn[UnFocus].mix].Kind=mkSpecial_Glider then
-      QueryItem:='LOWFUEL_GLIDER'
-    else QueryItem:='LOWFUEL';
-    if SimpleQuery(mkYesNo,Phrases.Lookup(QueryItem),'WARNING_LOWSUPPORT')<>mrOk then
-      begin result:=eInvalid; exit; end;
-    Update; // remove message box from screen
-    MyUn[UnFocus].Status:=MyUn[UnFocus].Status or usToldNoReturn;
-    end
-  end;
-
-if result=eMissionDone then
-  begin
-  ModalSelectDlg.ShowNewContent(wmModal,kMission);
-  Update; // dialog still on screen
-  Mission:=ModalSelectDlg.result;
-  if Mission<0 then exit;
-  Server(sSetSpyMission+Mission shl 4, me, 0, nil^);
-  end;
-
-CityCaptured:=false;
-if result=eNoTime_Move then Play('NOMOVE_TIME')
-else
-  begin
-  NeedEcoUpdate:=false;
-  DestinationMarkON:=false;
-  PaintDestination;
-  if result and rUnitRemoved<>0 then
-    CityOptimizer_BeforeRemoveUnit(UnFocus);
-  IsAttack:= (result=eBombarded)
-    or (result<>eMissionDone) and (MyMap[ToLoc] and (fUnit or fOwned)=fUnit);
-  if not IsAttack then
-    begin // move
-    cix:=MyRO.nCity-1; {look for own city at dest location}
-    while (cix>=0) and (MyCity[cix].Loc<>ToLoc) do dec(cix);
-    if (result<>eMissionDone) and (MyMap[ToLoc] and fCity<>0) and (cix<0) then
-      CityCaptured:=true;
-    result:=Server(sMoveUnit+DirCode,me,UnFocus,nil^);
-    case result of
-      eHiddenUnit:
-        begin Play('NOMOVE_SUBMARINE'); PaintLoc(ToLoc) end;
-      eStealthUnit:
-        begin Play('NOMOVE_STEALTH'); PaintLoc(ToLoc) end;
-      eZOC_EnemySpotted:
-        begin Play('NOMOVE_ZOC'); PaintLoc(ToLoc,1) end;
-      rExecuted..maxint:
-        begin
-        if result and rUnitRemoved<>0 then UnFocus:=-1 // unit died
-        else
-          begin
-          assert(UnFocus>=0);
-          MyUn[UnFocus].Status:=MyUn[UnFocus].Status and not (usStay or usRecover);
-          for uix:=0 to MyRO.nUn-1 do if MyUn[uix].Master=UnFocus then
-            MyUn[uix].Status:=MyUn[uix].Status and not usWaiting;
-          if CityCaptured
-            and (MyRO.Government in [gRepublic,gDemocracy,gFuture]) then
-            begin // borders have moved, unrest might have changed in any city
-            CityOptimizer_BeginOfTurn;
-            NeedEcoUpdate:=true;
-            end
-          else
-            begin
-            if OldUnrest<>NewUnrest then
-              begin
-              CityOptimizer_CityChange(MyUn[UnFocus].Home);
-              for uix:=0 to MyRO.nUn-1 do if MyUn[uix].Master=UnFocus then
-                CityOptimizer_CityChange(MyUn[uix].Home);
-              NeedEcoUpdate:=true;
-              end;
-            if (MyRO.Government=gDespotism)
-              and (MyModel[MyUn[UnFocus].mix].Kind=mkSpecial_TownGuard) then
-              begin
-              if MyMap[FromLoc] and fCity<>0 then
-                begin // town guard moved out of city in despotism -- reoptimize!
-                cixChanged:=MyRO.nCity-1;
-                while (cixChanged>=0) and (MyCity[cixChanged].Loc<>FromLoc) do
-                  dec(cixChanged);
-                assert(cixChanged>=0);
-                if cixChanged>=0 then
-                  begin
-                  CityOptimizer_CityChange(cixChanged);
-                  NeedEcoUpdate:=true;
-                  end;
-                end;
-              if (MyMap[ToLoc] and fCity<>0) and not CityCaptured then
-                begin // town guard moved into city in despotism -- reoptimize!
-                cixChanged:=MyRO.nCity-1;
-                while (cixChanged>=0) and (MyCity[cixChanged].Loc<>ToLoc) do
-                  dec(cixChanged);
-                assert(cixChanged>=0);
-                if cixChanged>=0 then
-                  begin
-                  CityOptimizer_CityChange(cixChanged);
-                  NeedEcoUpdate:=true;
-                  end
-                end
-              end
-            end  
-          end;
-        end;
-      else
-        assert(false);
-      end;
-    SetTroopLoc(ToLoc);
-    end
-  else
-    begin {enemy unit -- attack}
-    if result=eBombarded then Defender:=MyRO.Territory[ToLoc]
-    else Defender:=MyRO.EnemyUn[euix].Owner;
-    {if MyRO.Treaty[Defender]=trCeaseFire then
-      if SimpleQuery(mkYesNo,Phrases.Lookup('FRCANCELQUERY_CEASEFIRE'),
-        'MSG_DEFAULT')<>mrOK then
-        exit;}
-    if (Options and muNoSuicideCheck=0)
-      and (result and rUnitRemoved<>0) and (result<>eMissionDone) then
-      begin // suicide query
-      with MyUn[UnFocus],BattleDlg.Forecast do
-        begin
-        pAtt:=me;
-        mixAtt:=mix;
-        HealthAtt:=Health;
-        ExpAtt:=Exp;
-        FlagsAtt:=Flags;
-        end;
-      BattleDlg.Forecast.Movement:=MyUn[UnFocus].Movement;
-      Server(sGetBattleForecastEx,me,ToLoc,BattleDlg.Forecast);
-      BattleDlg.uix:=UnFocus;
-      BattleDlg.ToLoc:=ToLoc;
-      BattleDlg.IsSuicideQuery:=true;
-      BattleDlg.ShowModal;
-      if BattleDlg.ModalResult<>mrOK then
-        exit;
-      end;
-
-    cixChanged:=-1;
-    if (result and rUnitRemoved<>0) and (MyRO.Government=gDespotism)
-      and (MyModel[MyUn[UnFocus].mix].Kind=mkSpecial_TownGuard)
-      and (MyMap[FromLoc] and fCity<>0) then
-      begin // town guard died in city in despotism -- reoptimize!
-      cixChanged:=MyRO.nCity-1;
-      while (cixChanged>=0) and (MyCity[cixChanged].Loc<>FromLoc) do
-        dec(cixChanged);
-      assert(cixChanged>=0);
-      end;
-
-    for i:=0 to MyRO.nEnemyModel-1 do
-      LostArmy[i]:=MyRO.EnemyModel[i].Lost;
-    OldToTile:=MyMap[ToLoc];
-    result:=Server(sMoveUnit+DirCode,me,UnFocus,nil^);
-    nLostArmy:=0;
-    for i:=0 to MyRO.nEnemyModel-1 do
-      begin
-      LostArmy[i]:=MyRO.EnemyModel[i].Lost-LostArmy[i];
-      inc(nLostArmy,LostArmy[i])
-      end;
-    if result and rUnitRemoved<>0 then
-      begin
-      UnFocus:=-1;
-      SetTroopLoc(FromLoc);
-      end;
-    if (OldToTile and not MyMap[ToLoc] and fCity<>0)
-      and (MyRO.Government in [gRepublic,gDemocracy,gFuture]) then
-      begin // city was destroyed, borders have moved, unrest might have changed in any city
-      CityOptimizer_BeginOfTurn;
-      NeedEcoUpdate:=true;
-      end
-    else
-      begin
-      if cixChanged>=0 then
-        begin
-        CityOptimizer_CityChange(cixChanged);
-        NeedEcoUpdate:=true;
-        end;
-      if (result=eWon) or (result=eBloody) or (result=eExpelled) then
-        begin
-        CityOptimizer_TileBecomesAvailable(ToLoc);
-        NeedEcoUpdate:=true;
-        end;
-      end;
-    if nLostArmy>1 then
-      begin
-      with MessgExDlg do
-        begin
-        Kind:=mkOk;
-        IconKind:=mikEnemyArmy;
-        MessgText:=Tribe[Defender].TString(Phrases.Lookup('ARMYLOST',
-          MyRO.EnemyModel[MyRO.EnemyUn[euix].emix].Domain));
-        ShowModal;
-        end
-      end
-    end;
-  if result and rUnitRemoved<>0 then
-    begin
-    CityOptimizer_AfterRemoveUnit;
-    ListDlg.RemoveUnit;
-    NeedEcoUpdate:=true;
-    end;
-  if NeedEcoUpdate then
-    begin
-    UpdateViews(true);
-    Update
-    end
-  end;
-
-if result=eMissionDone then
-  begin
-  p1:=MyRO.Territory[ToLoc];
-  case Mission of
-    smStealMap:
-      begin MapValid:=false; PaintAllMaps end;
-    smStealCivilReport:
-      TribeMessage(p1,Tribe[p1].TPhrase('DOSSIER_PREPARED'),'');
-    smStealMilReport:
-      ListDlg.ShowNewContent_MilReport(wmPersistent,p1);
-    end;
-  end;
-
-if UnFocus>=0 then
-  CheckToldNoReturn(UnFocus);
-
-NeedRepaintPanel:=false;
-if result>=rExecuted then
-  begin
-  if CityCaptured and (MyMap[ToLoc] and fCity=0) then
-    begin // city destroyed
-    for i:=0 to 27 do {tell about destroyed wonders}
-      if (MyRO.Wonder[i].CityID=-2) and (MyData.ToldWonders[i].CityID<>-2) then
-        with MessgExDlg do
-          begin
-          if WondersDlg.Visible then
-            WondersDlg.SmartUpdateContent(false);
-          OpenSound:='WONDER_DESTROYED';
-          MessgText:=Format(Phrases.Lookup('WONDERDEST'),
-            [Phrases.Lookup('IMPROVEMENTS',i)]);
-          Kind:=mkOkHelp;
-          HelpKind:=hkImp;
-          HelpNo:=i;
-          IconKind:=mikImp;
-          IconIndex:=i;
-          ShowModal;
-          MyData.ToldWonders[i]:=MyRO.Wonder[i];
-          end
-    end;
-  if CityCaptured and (MyMap[ToLoc] and fCity<>0) then
-    begin // city captured
-    ListDlg.AddCity;
-    for i:=0 to 27 do {tell about capture of wonders}
-      if MyRO.City[MyRO.nCity-1].Built[i]>0 then with MessgExDlg do
-        begin
-        if WondersDlg.Visible then
-          WondersDlg.SmartUpdateContent(false);
-        OpenSound:='WONDER_CAPTURED';
-        MessgText:=Format(Tribe[me].TPhrase('WONDERCAPTOWN'),
-          [Phrases.Lookup('IMPROVEMENTS',i)]);
-        Kind:=mkOkHelp;
-        HelpKind:=hkImp;
-        HelpNo:=i;
-        IconKind:=mikImp;
-        IconIndex:=i;
-        ShowModal;
-        MyData.ToldWonders[i]:=MyRO.Wonder[i];
-        end;
-
-    if MyRO.Happened and phStealTech<>0 then
-      begin {Temple of Zeus -- choose advance to steal}
-      ModalSelectDlg.ShowNewContent(wmModal,kStealTech);
-      Server(sStealTech,me,ModalSelectDlg.result,nil^);
-      end;
-    TellNewModels;
-
-    cix:=MyRO.nCity-1;
-    while (cix>=0) and (MyCity[cix].Loc<>ToLoc) do
-      dec(cix);
-    assert(cix>=0);
-    MyCity[cix].Status:=MyCity[cix].Status
-      and not csResourceWeightsMask or (3 shl 4); // captured city, set to maximum growth
-    NewTiles:=1 shl 13; {exploit central tile only}
-    Server(sSetCityTiles,me,cix,NewTiles);
-    end
-  else NeedRepaintPanel:=true;
-  end;
-TellNewContacts;
-
-if (UnFocus>=0) and (MyUn[UnFocus].Master>=0) then
-  with MyUn[MyUn[UnFocus].Master] do
-    if Status and usStay<>0 then
-      begin
-      Status:=Status and not usStay;
-      if (Movement>=100) and (Status and (usRecover or usGoto)=0) then
-        Status:=Status or usWaiting;
-      end;
-if Options and (muAutoNoWait or muAutoNext)<>0 then
-  begin
-  if (UnFocus>=0) and ((result=eNoTime_Move) or UnitExhausted(UnFocus)
-    or (MyUn[UnFocus].Master>=0)
-    or (MyModel[MyUn[UnFocus].mix].Domain=dAir)
-      and ((MyMap[MyUn[UnFocus].Loc] and fCity<>0) {aircrafts stop in cities}
-        or (MyMap[MyUn[UnFocus].Loc] and fTerImp=tiBase))) then
-    begin
-    MyUn[UnFocus].Status:=MyUn[UnFocus].Status and not usWaiting;
-    if Options and muAutoNext<>0 then
-      if CityCaptured and (MyMap[ToLoc] and fCity<>0) then
-        begin
-        UnFocus:=-1;
-        PaintLoc(ToLoc); // don't show unit in city if not selected
-        end
-      else NextUnit(UnStartLoc,true)
-    end
-  else if (UnFocus<0) and (Options and muAutoNext<>0) then
-    NextUnit(UnStartLoc,result<>eMissionDone);
-  end;
-
-if NeedRepaintPanel and (UnFocus=UnFocus0) then
-  if IsAttack then PanelPaint
-  else
-    begin
-    assert(result<>eMissionDone);
-    CheckTerrainBtnVisible;
-    FocusOnLoc(ToLoc,flRepaintPanel or flImmUpdate)
-    end;
-
-if (result>=rExecuted) and CityCaptured and (MyMap[ToLoc] and fCity<>0) then
-  ZoomToCity(ToLoc,UnFocus<0,chCaptured); // show captured city
-end; // moveunit
-
-procedure TMainScreen.MoveOnScreen(ShowMove: TShowMove; Step0,Step1,nStep: integer;
-  Restore: boolean = true);
-var
-ToLoc,xFromLoc,yFromLoc,xToLoc,yToLoc,xFrom,yFrom,xTo,yTo,xMin,yMin,xRange,yRange,
-  xw1,Step,xMoving,yMoving,yl,SliceCount:integer;
-UnitInfo: TUnitInfo;
-Ticks0,Ticks: int64;
-begin
-Timer1.Enabled:=false;
-QueryPerformanceCounter(Ticks0);
-with ShowMove do
-  begin
-  UnitInfo.Owner:=Owner;
-  UnitInfo.mix:=mix;
-  UnitInfo.Health:=Health;
-  UnitInfo.Job:=jNone;
-  UnitInfo.Flags:=Flags;
-  if Owner<>me then
-    UnitInfo.emix:=emix;
-
-  ToLoc:=dLoc(FromLoc,dx,dy);
-  xToLoc:=ToLoc mod G.lx; yToLoc:=ToLoc div G.lx;
-  xFromLoc:=FromLoc mod G.lx; yFromLoc:=FromLoc div G.lx;
-  if xToLoc>xFromLoc+2 then xToLoc:=xToLoc-G.lx
-  else if xToLoc<xFromLoc-2 then xToLoc:=xToLoc+G.lx;
-
-  xw1:=xw+G.lx;
-  // ((xFromLoc-xw1)*2+yFromLoc and 1+1)*xxt+dx*xxt/2-MapWidth/2 -> min
-  while abs(((xFromLoc-xw1+G.lx)*2+yFromLoc and 1+1)*xxt*2+dx*xxt-MapWidth)
-    <abs(((xFromLoc-xw1)*2+yFromLoc and 1+1)*xxt*2+dx*xxt-MapWidth) do
-    dec(xw1,G.lx);
-
-  xTo:=(xToLoc-xw1)*(xxt*2) + yToLoc and 1 *xxt +(xxt-xxu);
-  yTo:=(yToLoc-yw)*yyt +(yyt-yyu_anchor);
-  xFrom:=(xFromLoc-xw1)*(xxt*2) + yFromLoc and 1 *xxt +(xxt-xxu);
-  yFrom:=(yFromLoc-yw)*yyt +(yyt-yyu_anchor);
-  if xFrom<xTo then begin xMin:=xFrom;xRange:=xTo-xFrom end
-  else begin xMin:=xTo;xRange:=xFrom-xTo end;
-  if yFrom<yTo then begin yMin:=yFrom;yRange:=yTo-yFrom end
-  else begin yMin:=yTo;yRange:=yFrom-yTo end;
-  inc(xRange,xxt*2);
-  inc(yRange,yyt*3);
-
-  MainOffscreenPaint;
-  NoMap.SetOutput(Buffer);
-  NoMap.SetPaintBounds(0,0,xRange,yRange);
-  for Step:=0 to abs(Step1-Step0) do
-    begin
-    BitBlt(Buffer.Canvas.Handle,0,0,xRange,yRange,
-      offscreen.Canvas.Handle,xMin,yMin,SRCCOPY);
-    if Step1<>Step0 then
-      begin
-      xMoving:=xFrom+Round((Step0+Step*(Step1-Step0) div abs(Step1-Step0))
-        *(xTo-xFrom)/nStep);
-      yMoving:=yFrom+Round((Step0+Step*(Step1-Step0) div abs(Step1-Step0))
-        *(yTo-yFrom)/nStep);
-      end
-    else begin xMoving:=xFrom; yMoving:=yFrom; end;
-    NoMap.PaintUnit(xMoving-xMin,yMoving-yMin,UnitInfo,0);
-    PaintBufferToScreen(xMin,yMin,xRange,yRange);
-
-    SliceCount:=0;
-    Ticks:=Ticks0;
-    repeat
-      if (SliceCount=0) or ((Ticks-Ticks0)*12000 *(SliceCount+1)
-        div SliceCount<MoveTime*PerfFreq)  then
-        begin
-        if not idle or (GameMode=cMovie) then
-          Application.ProcessMessages;
-        Sleep(1);
-        inc(SliceCount)
-        end;
-      QueryPerformanceCounter(Ticks);
-    until (Ticks-Ticks0)*12000>=MoveTime*PerfFreq;
-    Ticks0:=Ticks
-    end;
-  end;
-if Restore then
-  begin
-  BitBlt(Buffer.Canvas.Handle,0,0,xRange,yRange,offscreen.Canvas.Handle,xMin,
-    yMin,SRCCOPY);
-  PaintBufferToScreen(xMin,yMin,xRange,yRange);
-  end;
-BlinkTime:=-1;
-Timer1.Enabled:=true;
-end;
-
-procedure TMainScreen.MoveToLoc(Loc: integer; CheckSuicide: boolean);
-// path finder: move focused unit to loc, start multi-turn goto if too far
-var
-uix,i,MoveOptions,NextLoc,MoveResult: integer;
-MoveAdviceData: TMoveAdviceData;
-StopReason: (None, Arrived, Dead, NoTime, EnemySpotted, MoveError);
-begin
-if MyUn[UnFocus].Job>jNone then
-  Server(sStartJob+jNone shl 4,me,UnFocus,nil^);
-if GetMoveAdvice(UnFocus,Loc,MoveAdviceData)>=rExecuted then
-  begin
-  uix:=UnFocus;
-  StopReason:=None;
-  repeat
-    for i:=0 to MoveAdviceData.nStep-1 do
-      begin
-      if i=MoveAdviceData.nStep-1 then MoveOptions:=muAutoNext
-      else MoveOptions:=0;
-      NextLoc:=dLoc(MyUn[uix].Loc,MoveAdviceData.dx[i],MoveAdviceData.dy[i]);
-      if (NextLoc=Loc)
-        or (Loc=maNextCity) and (MyMap[NextLoc] and fCity<>0) then
-        StopReason:=Arrived;
-      if not CheckSuicide and (NextLoc=Loc) then
-        MoveOptions:=MoveOptions or muNoSuicideCheck;
-      MoveResult:=MoveUnit(MoveAdviceData.dx[i],MoveAdviceData.dy[i],MoveOptions);
-      if MoveResult<rExecuted then StopReason:=MoveError
-      else if MoveResult and rUnitRemoved<>0 then StopReason:=Dead
-      else if (StopReason=None) and (MoveResult and rEnemySpotted<>0) then
-        StopReason:=EnemySpotted;
-      if StopReason<>None then break;
-      end;
-    if (StopReason=None) and ((MoveAdviceData.nStep<25)
-      or (MyRO.Wonder[woShinkansen].EffectiveOwner<>me)) then
-      StopReason:=NoTime;
-    if StopReason<>None then break;
-    if GetMoveAdvice(UnFocus,Loc,MoveAdviceData)<rExecuted then
-      begin assert(false); break end
-  until false;
-
-  case StopReason of
-    None: assert(false);
-    Arrived: MyUn[uix].Status:=MyUn[uix].Status and ($FFFF-usGoto);
-    Dead: if UnFocus<0 then NextUnit(UnStartLoc,false);
-    else
-      begin // multi-turn goto
-      if Loc=maNextCity then
-        MyUn[uix].Status:=MyUn[uix].Status and ($FFFF-usStay-usRecover) or usGoto +$7FFF shl 16
-      else MyUn[uix].Status:=MyUn[uix].Status and ($FFFF-usStay-usRecover) or usGoto +Loc shl 16;
-      PaintLoc(MyUn[uix].Loc);
-      if (StopReason=NoTime) and (UnFocus=uix) then
-        begin
-        MyUn[uix].Status:=MyUn[uix].Status and not usWaiting;
-        NextUnit(UnStartLoc,true)
-        end;
-      end
-    end
-  end
-end;
-
-procedure TMainScreen.PanelBoxMouseDown(Sender:TObject;
-  Button:TMouseButton;Shift:TShiftState;x,y:integer);
-var
-i,xMouse,MouseLoc,p1: integer;
-begin
-if GameMode=cMovie then
-  exit;
-
-if Button=mbLeft then
-  begin
-  if (x>=xMini+2) and (y>=yMini+2) and (x<xMini+2+2*G.lx) and (y<yMini+2+G.ly) then
-    if ssShift in Shift then
-      begin
-      xMouse:=(xwMini+(x-(xMini+2)+MapWidth div (xxt*2)+G.lx) div 2) mod G.lx;
-      MouseLoc:=xMouse+G.lx*(y-(yMini+2));
-      if MyMap[MouseLoc] and fTerrain<>fUNKNOWN then
-        begin
-        p1:=MyRO.Territory[MouseLoc];
-        if (p1=me) or (p1>=0) and (MyRO.Treaty[p1]>=trNone) then
-        NatStatDlg.ShowNewContent(wmPersistent, p1);
-        end
-      end
-    else
-      begin
-      if CityDlg.Visible then CityDlg.Close;
-      if UnitStatDlg.Visible then UnitStatDlg.Close;
-      Tracking:=true;
-      PanelBoxMouseMove(Sender,Shift+[ssLeft],x,y);
-      end
-  else if (ClientMode<>cEditMap) and (x>=ClientWidth-xPalace) and (y>=yPalace)
-    and (x<ClientWidth-xPalace+xSizeBig) and (y<yPalace+ySizeBig) then
-    begin
-    InitPopup(StatPopup);        
-    if FullScreen then
-      StatPopup.Popup(Left+ClientWidth-xPalace+xSizeBig+2,
-        Top+ClientHeight-PanelHeight+yPalace-1)
-    else StatPopup.Popup(Left+ClientWidth-xPalace+6,
-      Top+ClientHeight-PanelHeight+yPalace+ySizeBig+GetSystemMetrics(SM_CYCAPTION)+3)
-    end
-(*  else if (x>=xAdvisor-3) and (y>=yAdvisor-3)
-    and (x<xAdvisor+16+3) and (y<yAdvisor+16+3) and HaveStrategyAdvice then
-    AdviceBtnClick*)
-  else if (x>=xTroop+1) and (y>=yTroop+1)
-    and (x<xTroop+TrRow*TrPitch) and (y<=yTroop+55) then
-    begin
-    i:=(x-xTroop-1) div TrPitch;
-    if trix[i]>=0 then
-      if ClientMode=cEditMap then begin BrushType:=trix[i]; PanelPaint end
-      else if (TroopLoc>=0) then
-        if MyMap[TroopLoc] and fOwned<>0 then
-          begin
-          if ssShift in Shift then
-            UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, MyUn[trix[i]].mix)
-          else if not supervising and (ClientMode<scContact)
-            and (x-xTroop-1-i*TrPitch>=60-20) and (y>=yTroop+35)
-            and ((MyUn[trix[i]].Job>jNone)
-              or (MyUn[trix[i]].Status and (usStay or usRecover or usGoto)<>0)) then
-            begin // wake up
-            MyUn[trix[i]].Status:=MyUn[trix[i]].Status
-              and ($FFFF-usStay-usRecover-usGoto-usEnhance) or usWaiting;
-            if MyUn[trix[i]].Job>jNone then
-              Server(sStartJob+jNone shl 4,me,trix[i],nil^);
-            if (UnFocus<0) and not CityDlg.Visible then
-              begin
-              SetUnFocus(trix[i]);
-              SetTroopLoc(MyUn[trix[i]].Loc);
-              FocusOnLoc(TroopLoc,flRepaintPanel)
-              end
-            else
-              begin
-              if CityDlg.Visible and (CityDlg.RestoreUnFocus<0) then
-                CityDlg.RestoreUnFocus:=trix[i];
-              PanelPaint;
-              end
-            end
-          else if (ClientMode<scContact) then
-            begin
-            if supervising then
-              UnitStatDlg.ShowNewContent_OwnUnit(wmPersistent, trix[i])
-            else if CityDlg.Visible then
-              begin
-              CityDlg.CloseAction:=None;
-              CityDlg.Close;
-              SumCities(TaxSum,ScienceSum);
-              SetUnFocus(trix[i]);
-              end
-            else
-              begin
-              DestinationMarkON:=false;
-              PaintDestination;
-              UnFocus:=trix[i];
-              UnStartLoc:=TroopLoc;
-              BlinkTime:=0;
-              BlinkOn:=false;
-              PaintLoc(TroopLoc);
-              end;
-            if UnFocus>=0 then
-              begin
-              UnitInfoBtn.Visible:=true;
-              UnitBtn.Visible:=true;
-              TurnComplete:=false;
-              EOT.ButtonIndex:=eotGray;
-              end;
-            CheckTerrainBtnVisible;
-            PanelPaint;
-            end
-          end
-        else if Server(sGetUnits,me,TroopLoc,TrCnt)>=rExecuted then
-          if ssShift in Shift then
-            UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
-              MyRO.EnemyUn[MyRO.nEnemyUn+trix[i]].emix) // model info
-          else UnitStatDlg.ShowNewContent_EnemyUnit(wmPersistent,
-            MyRO.nEnemyUn+trix[i]); // unit info
-    end
-  end
-end;
-
-procedure TMainScreen.SetTroopLoc(Loc:integer);
-var
-trixFocus,uix,uixDefender: integer;
-Prio: boolean;
-begin
-TroopLoc:=Loc;
-TrRow:=(xRightPanel+10-xTroop-GetSystemMetrics(SM_CXVSCROLL)-19) div TrPitch;
-TrCnt:=0;
-trixFocus:=-1;
-if ClientMode=cEditMap then TrCnt:=nBrushTypes
-else if (Loc>=0) and (MyMap[Loc] and fUnit<>0) then
-  if MyMap[Loc] and fOwned<>0 then
-    begin // count own units here
-    Server(sGetDefender,me,TroopLoc,uixDefender);
-    for Prio:=true downto false do
-      for uix:=0 to MyRO.nUn-1 do
-        if ((uix=uixDefender)=Prio) and (MyUn[uix].Loc=Loc) then
-          begin
-          if uix=UnFocus then trixFocus:=TrCnt;
-          inc(TrCnt);
-          end
-    end
-  else // count enemy units here
-    Server(sGetUnits,me,Loc,TrCnt);
-if TrCnt=0 then InitPVSB(sb,0,1)
-else
-  begin
-  InitPVSB(sb,(TrCnt+TrRow-1) div TrRow-1,1);
-  with sb.si do if (nMax>=integer(nPage)) and (trixFocus>=0) then
-    begin
-    sb.si.npos:=trixFocus div TrRow;
-    sb.si.FMask:=SIF_POS;
-    SetScrollInfo(sb.h,SB_CTL,sb.si,true);
-    end
-  end
-end;
-
-(*procedure TMainScreen.ShowMoveHint(ToLoc: integer; Force: boolean = false);
-var
-Step,Loc,x0,y0,xs,ys: integer;
-Info: string;
-InfoSize: TSize;
-MoveAdvice: TMoveAdviceData;
-begin
-if (ToLoc<0) or (ToLoc>=G.lx*G.ly)
-  or (UnFocus<0) or (MyUn[UnFocus].Loc=ToLoc) then
-  ToLoc:=-1
-else
-  begin
-  MoveAdvice.ToLoc:=ToLoc;
-  MoveAdvice.MoreTurns:=0;
-  MoveAdvice.MaxHostile_MovementLeft:=MyUn[UnFocus].Health-50;
-  if Server(sGetMoveAdvice,me,UnFocus,MoveAdvice)<rExecuted then
-    ToLoc:=-1
-  end;
-if (ToLoc=MoveHintToLoc) and not Force then exit;
-if (ToLoc<>MoveHintToLoc) and (MoveHintToLoc>=0) then
-  begin invalidate; update end; // clear old hint from screen
-MoveHintToLoc:=ToLoc;
-if ToLoc<0 then exit;
-
-with canvas do
-  begin
-  Pen.Color:=$80C0FF;
-  Pen.Width:=3;
-  Loc:=MyUn[UnFocus].Loc;
-  for Step:=0 to MoveAdvice.nStep do
-    begin
-    y0:=(Loc+G.lx*1024) div G.lx -1024;
-    x0:=(Loc+(y0 and 1+G.lx*1024) div 2) mod G.lx;
-    xs:=(x0-xw)*66+y0 and 1*33-G.lx*66;
-    while abs(2*(xs+G.lx*66)-MapWidth)<abs(2*xs-MapWidth) do
-      inc(xs,G.lx*66);
-    ys:=(y0-yw)*16;
-    if Step=0 then moveto(xs+33,ys+16)
-    else lineto(xs+33,ys+16);
-    if Step<MoveAdvice.nStep then
-      Loc:=dLoc(Loc,MoveAdvice.dx[Step],MoveAdvice.dy[Step]);
-    end;
-  Brush.Color:=$80C0FF;
-  Info:=' '+inttostr(88)+' ';
-  InfoSize:=TextExtent(Info);
-  TextOut(xs+33-InfoSize.cx div 2, ys+16-InfoSize.cy div 2, Info);
-  Brush.Style:=bsClear;
-  end
-end;*)
-
-procedure TMainScreen.SetDebugMap(p: integer);
-begin
-IsoEngine.pDebugMap:=p;
-IsoEngine.Options:=IsoEngine.Options and not (1 shl moLocCodes);
-mLocCodes.Checked:=false;
-MapValid:=false;
-MainOffscreenPaint;
-end;
-
-procedure TMainScreen.SetViewpoint(p: integer);
-var
-i: integer;
-begin
-if supervising and (G.RO[0].Turn>0)
-  and ((p=0) or (1 shl p and G.RO[0].Alive<>0)) then
-  begin
-  for i:=0 to Screen.FormCount-1 do
-    if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-      Screen.Forms[i].Close; // close windows
-  ItsMeAgain(p);
-  SumCities(TaxSum,ScienceSum);
-  for i:=0 to MyRO.nModel-1 do
-    if Tribe[me].ModelPicture[i].HGr=0 then
-      InitMyModel(i,true);
-
-  SetTroopLoc(-1);
-  PanelPaint;
-  MapValid:=false;
-  PaintAllMaps;
-  end
-end;
-
-procedure TMainScreen.FormKeyDown(Sender:TObject;var Key:word;
-  Shift:TShiftState);
-
-  procedure MenuClick_Check(Popup: TPopupMenu; Item: TMenuItem);
-  begin
-  InitPopup(Popup);
-  if Item.Visible and Item.Enabled then MenuClick(Item);
-  end;
-
-var
-dx,dy: integer;
-time0,time1: int64;
-begin
-if GameMode=cMovie then
-  begin
-  case Key of
-    VK_F4: MenuClick_Check(StatPopup,mScienceStat);
-    VK_F6: MenuClick_Check(StatPopup,mDiagram);
-    VK_F7: MenuClick_Check(StatPopup,mWonders);
-    VK_F8: MenuClick_Check(StatPopup,mShips);
-    end;
-  exit;
-  end;
-
-if not idle then exit;
-
-if ClientMode=cEditMap then
-  begin
-  if Shift=[ssCtrl] then
-    case char(Key) of
-(*      'A':
-        begin // auto symmetry
-        Server($7F0,me,0,nil^);
-        MapValid:=false;
-        PaintAll;
-        end;
-      'B':
-        begin // land mass
-        dy:=0;
-        for dx:=G.lx to G.lx*(G.ly-1)-1 do
-          if MyMap[dx] and fTerrain>=fGrass then inc(dy);
-        dy:=dy
-        end;*)
-      'Q':MenuClick(mResign);
-      'R':MenuClick(mRandomMap);
-      end
-  else if Shift=[] then
-    case char(Key) of
-      char(VK_F1): MenuClick(mHelp);
-      end;
-  exit;
-  end;
-
-if Shift=[ssAlt] then
-  case char(Key) of
-    '0': SetDebugMap(-1);
-    '1'..'9': SetDebugMap(ord(Key)-48);
-    end
-else if Shift=[ssCtrl] then
-  case char(Key) of
-    'J':MenuClick(mJump);
-    'K':mShowClick(mDebugMap);
-    'L':mShowClick(mLocCodes);
-    'M':if LogDlg.Visible then LogDlg.Close else LogDlg.Show;
-    'N':mNamesClick(mNames);
-    'Q':MenuClick_Check(GamePopup,mResign);
-    'R':MenuClick(mRun);
-    '0'..'9':
-       begin
-       if ord(Key)-48=me then
-         SetViewpoint(0)
-       else SetViewpoint(ord(Key)-48);
-       end;
-    ' ':
-      begin // test map repaint time
-      QueryPerformanceCounter(time0);
-      MapValid:=false;
-      MainOffscreenPaint;
-      QueryPerformanceCounter(time1);
-      SimpleMessage(Format('Map repaint time: %.3f ms',[{$IFDEF VER100}(time1.LowPart-time0.LowPart)
-        {$ELSE}(time1-time0){$ENDIF}*1000.0/PerfFreq]));
-      end
-    end
-else if Shift=[] then
-  case char(Key) of
-    char(VK_F1): MenuClick(mHelp);
-    char(VK_F2):MenuClick_Check(StatPopup,mUnitStat);
-    char(VK_F3):MenuClick_Check(StatPopup,mCityStat);
-    char(VK_F4):MenuClick_Check(StatPopup,mScienceStat);
-    char(VK_F5):MenuClick_Check(StatPopup,mEUnitStat);
-    char(VK_F6):MenuClick_Check(StatPopup,mDiagram);
-    char(VK_F7):MenuClick_Check(StatPopup,mWonders);
-    char(VK_F8):MenuClick_Check(StatPopup,mShips);
-    char(VK_F9):MenuClick_Check(StatPopup,mNations);
-    char(VK_F10):MenuClick_Check(StatPopup,mEmpire);
-    char(VK_ADD): EndTurn;
-    '1':MapBtnClick(MapBtn0);
-    '2':MapBtnClick(MapBtn1);
-    '3':MapBtnClick(MapBtn4);
-    '4':MapBtnClick(MapBtn5);
-    '5':MapBtnClick(MapBtn6);
-    'T':MenuClick(mTechTree);
-    'W':MenuClick(mWait);
-    end;
-
-if UnFocus>=0 then
-  if Shift=[ssCtrl] then
-    case char(Key) of
-      'C':MenuClick_Check(UnitPopup,mCancel);
-      'D':MenuClick(mDisband);
-      'P':MenuClick_Check(UnitPopup,mPillage);
-      'T':MenuClick_Check(UnitPopup,mSelectTransport);
-      end
-  else if Shift=[] then
-    case char(Key) of
-      ' ':MenuClick(mNoOrders);
-      'A':MenuClick_Check(TerrainPopup,mAirBase);
-      'B':MenuClick_Check(UnitPopup,mCity);
-      'C':MenuClick(mCentre);
-      'E':
-        begin
-        InitPopup(TerrainPopup);
-        if mEnhance.Visible and mEnhance.Enabled then MenuClick(mEnhance)
-        else MenuClick(mEnhanceDef)
-        end;
-      'F':MenuClick_Check(TerrainPopup,mFort);
-      'G':MenuClick_Check(UnitPopup,mGoOn);
-      'H':MenuClick_Check(UnitPopup,mHome);
-      'I':
-        if JobTest(UnFocus,jFarm,[eTreaty]) then MenuClick(mFarm)
-        else if JobTest(UnFocus,jClear,[eTreaty]) then MenuClick(mClear)
-        else MenuClick_Check(TerrainPopup,mIrrigation);
-      'L':MenuClick_Check(UnitPopup,mLoad);
-      'M':
-        if JobTest(UnFocus,jAfforest,[eTreaty]) then MenuClick(mAfforest)
-        else MenuClick_Check(TerrainPopup,mMine);
-      'N':MenuClick_Check(TerrainPopup,mCanal);
-      'O':MenuClick_Check(TerrainPopup,mTrans);
-      'P':MenuClick_Check(TerrainPopup,mPollution);
-      'R':
-        if JobTest(UnFocus,jRR,[eTreaty]) then MenuClick(mRR)
-        else MenuClick_Check(TerrainPopup,mRoad);
-      'S':MenuClick(mStay);
-      'U':MenuClick_Check(UnitPopup,mUnload);
-      'V':MenuClick_Check(UnitPopup,mRecover);
-      'Z':MenuClick_Check(UnitPopup,mUtilize);
-      #33..#40,#97..#100,#102..#105:
-        begin {arrow keys}
-        DestinationMarkON:=false;
-        PaintDestination;
-        MyUn[UnFocus].Status:=MyUn[UnFocus].Status
-          and ($FFFF-usStay-usRecover-usGoto-usEnhance) or usWaiting;
-        case Key of
-          VK_NUMPAD1,VK_END: begin dx:=-1; dy:=1 end;
-          VK_NUMPAD2,VK_DOWN: begin dx:=0; dy:=2 end;
-          VK_NUMPAD3,VK_NEXT: begin dx:=1; dy:=1 end;
-          VK_NUMPAD4,VK_LEFT: begin dx:=-2; dy:=0 end;
-          VK_NUMPAD6,VK_RIGHT: begin dx:=2; dy:=0 end;
-          VK_NUMPAD7,VK_HOME: begin dx:=-1; dy:=-1 end;
-          VK_NUMPAD8,VK_UP: begin dx:=0; dy:=-2 end;
-          VK_NUMPAD9,VK_PRIOR: begin dx:=1; dy:=-1 end;
-          end;
-        MoveUnit(dx,dy,muAutoNext)
-        end;
-      end
-end;
-
-procedure TMainScreen.MenuClick(Sender:TObject);
-
-  function DoJob(j0:integer): integer;
-  var
-  Loc0, Movement0: integer;
-  begin
-  with MyUn[UnFocus] do
-    begin
-    DestinationMarkON:=false;
-    PaintDestination;
-    Loc0:=Loc;
-    Movement0:=Movement;
-    if j0<0 then result:=ProcessEnhancement(UnFocus,MyData.EnhancementJobs) // terrain enhancement
-    else result:=Server(sStartJob+j0 shl 4,me,UnFocus,nil^);
-    if result>=rExecuted then
-      begin
-      if result=eDied then UnFocus:=-1;
-      PaintLoc(Loc0);
-      if UnFocus>=0 then
-        begin
-        if (j0<0) and (result<>eJobDone) then // multi-turn terrain enhancement
-          Status:=Status and ($FFFF-usStay-usRecover-usGoto) or usEnhance
-        else Status:=Status and ($FFFF-usStay-usRecover-usGoto-usEnhance);
-        if (Job<>jNone) or (Movement0<100) then
-          begin
-          Status:=Status and not usWaiting;
-          NextUnit(UnStartLoc,true);
-          end
-        else PanelPaint
-        end
-      else NextUnit(UnStartLoc,true);
-      end
-    end;
-  case result of
-    eNoBridgeBuilding: SoundMessage(Phrases.Lookup('NOBB'),'INVALID');
-    eNoCityTerrain: SoundMessage(Phrases.Lookup('NOCITY'),'INVALID');
-    eTreaty: SoundMessage(Tribe[MyRO.Territory[Loc0]].TPhrase('PEACE_NOWORK'),'NOMOVE_TREATY');
-    else if result<rExecuted then Play('INVALID')
-    end
-  end;
-
-var
-i,uix,NewFocus,Loc0,OldMaster,Destination,cix,cixOldHome,ServerResult: integer;
-AltGovs,changed: boolean;
-QueryText: string;
-
-begin
-if Sender=mResign then
-  if ClientMode=cEditMap then
-    begin
-    if Edited then
-      begin
-      QueryText:=Phrases.Lookup('MAP_CLOSE');
-      case SimpleQuery(mkYesNoCancel,QueryText,'') of
-        mrIgnore:
-          Server(sAbandonMap,me,0,nil^);
-        mrOK:
-          Server(sSaveMap,me,0,nil^);
-        end
-      end
-    else Server(sAbandonMap,me,0,nil^)
-    end
-  else
-    begin
-    if Server(sGetGameChanged,0,0,nil^)=eOK then
-      begin
-      QueryText:=Phrases.Lookup('RESIGN');
-      case SimpleQuery(mkYesNoCancel,QueryText,'') of
-        mrIgnore:
-          Server(sResign,0,0,nil^);
-        mrOK:
-          Server(sBreak,0,0,nil^)
-        end
-      end
-    else Server(sResign,0,0,nil^)
-    end
-else if Sender=mEmpire then
-  RatesDlg.ShowNewContent(wmPersistent)
-else if Sender=mRevolution then
-  begin
-  AltGovs:=false;
-  for i:=2 to nGov-1 do
-    if (GovPreq[i]<>preNA) and ((GovPreq[i]=preNone)
-      or (MyRO.Tech[GovPreq[i]]>=tsApplicable)) then
-      AltGovs:=true;
-
-  if not AltGovs then
-    SoundMessage(Phrases.Lookup('NOALTGOVS'),'MSG_DEFAULT')
-  else
-    begin
-    changed:=false;
-    if MyRO.Happened and phChangeGov<>0 then
-      begin
-      ModalSelectDlg.ShowNewContent(wmModal,kGov);
-      if ModalSelectDlg.result>=0 then
-        begin
-        Play('NEWGOV');
-        Server(sSetGovernment,me,ModalSelectDlg.result,nil^);
-        CityOptimizer_BeginOfTurn;
-        changed:=true;
-        end
-      end
-    else with MessgExDlg do
-      begin // revolution!
-      MessgText:=Tribe[me].TPhrase('REVOLUTION');
-      Kind:=mkYesNo;
-      IconKind:=mikPureIcon;
-      IconIndex:=72; // anarchy palace
-      ShowModal;
-      if ModalResult=mrOK then
-        begin
-        Play('REVOLUTION');
-        Server(sRevolution,me,0,nil^);
-        changed:=true;
-        if NatStatDlg.Visible then NatStatDlg.Close;
-        if CityDlg.Visible then CityDlg.Close;
-        end
-      end;
-    if changed then
-      UpdateViews(true);
-    end
-  end
-else if Sender=mWebsite then
-  ShellExecute(Handle,'open','http://c-evo.org','','',SW_SHOWNORMAL)
-else if Sender=mRandomMap then
-  begin
-  if not Edited or (SimpleQuery(mkYesNo,Phrases.Lookup('MAP_RANDOM'),'')=mrOK) then
-    begin
-    Server(sRandomMap,me,0,nil^);
-    Edited:=true;
-    MapValid:=false;
-    PaintAllMaps;
-    end
-  end
-else if Sender=mJump then
-  begin
-  if supervising then
-    Jump[0]:=20
-  else Jump[me]:=20;
-  EndTurn(true);
-  end
-else if Sender=mRun then
-  begin
-  if supervising then
-    Jump[0]:=999999
-  else Jump[me]:=999999;
-  EndTurn(true);
-  end
-else if Sender=mEnhanceDef then
-  begin
-  if UnFocus>=0 then
-    EnhanceDlg.ShowNewContent(wmPersistent, MyMap[MyUn[UnFocus].Loc] and fTerrain)
-  else EnhanceDlg.ShowNewContent(wmPersistent)
-  end
-else if Sender=mCityTypes then
-  CityTypeDlg.ShowNewContent(wmModal) // must be modal because types are not saved before closing
-else if Sender=mUnitStat then
-  begin
-  if G.Difficulty[me]>0 then
-    ListDlg.ShowNewContent_MilReport(wmPersistent,me)
-  else
-    begin
-    i:=1;
-    while (i<nPl) and (1 shl i and MyRO.Alive=0) do inc(i);
-    if i<nPl then
-      ListDlg.ShowNewContent_MilReport(wmPersistent,i);
-    end;
-  end
-else if Sender=mEUnitStat then
-  begin
-  if MyRO.nEnemyModel>0 then
-    ListDlg.ShowNewContent(wmPersistent,kAllEModels);
-  end
-else if Sender=mCityStat then
-  ListDlg.ShowNewContent(wmPersistent,kCities)
-else if Sender=mScienceStat then
-  ListDlg.ShowNewContent(wmPersistent,kScience)
-else if Sender=mNations then
-  NatStatDlg.ShowNewContent(wmPersistent)
-else if Sender=mHelp then
-  if ClientMode=cEditMap then
-    HelpDlg.ShowNewContent(wmPersistent, hkText, HelpDlg.TextIndex('MAPEDIT'))
-  else HelpDlg.ShowNewContent(wmPersistent, hkMisc, miscMain)
-else if Sender=mTechTree then
-  TechTreeDlg.ShowModal
-else if Sender=mWonders then
-  WondersDlg.ShowNewContent(wmPersistent)
-else if Sender=mDiagram then
-  DiaDlg.ShowNewContent_Charts(wmPersistent)
-else if Sender=mShips then
-  DiaDlg.ShowNewContent_Ship(wmPersistent)
-else if Sender=mWait then
-  begin
-  if UnFocus>=0 then
-    begin
-    DestinationMarkON:=false;
-    PaintDestination;
-    MyUn[UnFocus].Status:=MyUn[UnFocus].Status and ($FFFF-usStay-usRecover-usGoto-usEnhance) or usWaiting;
-    end;
-  NextUnit(-1,false);
-  end
-else if UnFocus>=0 then with MyUn[UnFocus] do
-  if Sender=mGoOn then
-    begin
-    if Status shr 16=$7FFF then Destination:=maNextCity
-    else Destination:=Status shr 16;
-    Status:=Status and not (usStay or usRecover) or usWaiting;
-    MoveToLoc(Destination,true);
-    end
-  else if Sender=mHome then
-    if MyMap[Loc] and fCity<>0 then
-      begin
-      cixOldHome:=Home;
-      if Server(sSetUnitHome,me,UnFocus,nil^)>=rExecuted then
-        begin
-        CityOptimizer_CityChange(cixOldHome);
-        CityOptimizer_CityChange(Home);
-        UpdateViews(true);
-        end
-      else Play('INVALID');
-      end
-    else
-      begin
-      Status:=Status and not (usStay or usRecover or usEnhance);
-      MoveToLoc(maNextCity,true)
-      end
-  else if Sender=mCentre then begin Centre(Loc); PaintAllMaps end
-  else if Sender=mCity then
-    begin
-    Loc0:=Loc;
-    if MyMap[Loc] and fCity=0 then
-      begin // build city
-      if DoJob(jCity)=eCity then
-        begin
-        MapValid:=false;
-        PaintAll;
-        ZoomToCity(Loc0,true,chFounded);
-        end
-      end
-    else
-      begin
-      CityOptimizer_BeforeRemoveUnit(UnFocus);
-      ServerResult:=Server(sAddToCity,me,UnFocus,nil^);
-      if ServerResult>=rExecuted then
-        begin
-        cix:=MyRO.nCity-1;
-        while (cix>=0) and (MyCity[cix].Loc<>Loc0) do
-          dec(cix);
-        assert(cix>=0);
-        CityOptimizer_CityChange(cix);
-        CityOptimizer_AfterRemoveUnit; // does nothing here
-        SetTroopLoc(Loc0);
-        UpdateViews(true);
-        DestinationMarkON:=false;
-        PaintDestination;
-        UnFocus:=-1;
-        PaintLoc(Loc0);
-        NextUnit(UnStartLoc,true);
-        end
-      else if ServerResult=eMaxSize then
-        SimpleMessage(Phrases.Lookup('ADDTOMAXSIZE'));
-      end
-    end
-  else if Sender=mRoad then DoJob(jRoad)
-  else if Sender=mRR then DoJob(jRR)
-  else if Sender=mClear then DoJob(jClear)
-  else if Sender=mIrrigation then DoJob(jIrr)
-  else if Sender=mFarm then DoJob(jFarm)
-  else if Sender=mAfforest then DoJob(jAfforest)
-  else if Sender=mMine then DoJob(jMine)
-  else if Sender=mCanal then DoJob(jCanal)
-  else if Sender=MTrans then DoJob(jTrans)
-  else if Sender=mFort then DoJob(jFort)
-  else if Sender=mAirBase then DoJob(jBase)
-  else if Sender=mPollution then DoJob(jPoll)
-  else if Sender=mPillage then DoJob(jPillage)
-  else if Sender=mEnhance then DoJob(-1)
-  else if Sender=mStay then
-    begin
-    DestinationMarkON:=false;
-    PaintDestination;
-    Status:=Status and ($FFFF-usRecover-usGoto-usEnhance) or usStay;
-    if Job>jNone then
-      Server(sStartJob+jNone shl 4,me,UnFocus,nil^);
-    NextUnit(UnStartLoc,true)
-    end
-  else if Sender=mRecover then
-    begin
-    DestinationMarkON:=false;
-    PaintDestination;
-    Status:=Status and ($FFFF-usStay-usGoto-usEnhance) or usRecover;
-    if Job>jNone then
-      Server(sStartJob+jNone shl 4,me,UnFocus,nil^);
-    NextUnit(UnStartLoc,true)
-    end
-  else if Sender=mNoOrders then
-    begin
-    Status:=Status and not usWaiting;
-    NextUnit(UnStartLoc,true)
-    end
-  else if Sender=mCancel then
-    begin
-    DestinationMarkON:=false;
-    PaintDestination;
-    Status:=Status and ($FFFF-usRecover-usGoto-usEnhance);
-    if Job>jNone then
-      Server(sStartJob+jNone shl 4,me,UnFocus,nil^);
-    end
-  else if (Sender=mDisband) or (Sender=mUtilize) then
-    begin
-    if (Sender=mUtilize)
-      and not (Server(sRemoveUnit-sExecute,me,UnFocus,nil^)=eUtilized) then
-      begin
-      SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE'));
-        // freight for colony ship is the only case in which the command is
-        // available to player though not valid
-      exit
-      end;
-    if (Sender=mUtilize) and (Health<100) then
-      if SimpleQuery(mkYesNo,Phrases.Lookup('DAMAGED_UTILIZE'),'')<>mrOK then
-        exit;
-    Loc0:=Loc;
-    CityOptimizer_BeforeRemoveUnit(UnFocus);
-    if Server(sRemoveUnit,me,UnFocus,nil^)=eUtilized then Play('CITY_UTILIZE')
-    else Play('DISBAND');
-    CityOptimizer_AfterRemoveUnit;
-    SetTroopLoc(Loc0);
-    UpdateViews(true);
-    DestinationMarkON:=false;
-    PaintDestination;
-    UnFocus:=-1;
-    PaintLoc(Loc0);
-    NextUnit(UnStartLoc,true);
-    end
-  else if Sender=mLoad then
-    begin
-    i:=Server(sLoadUnit,me,UnFocus,nil^);
-    if i>=rExecuted then
-      begin
-      if MyModel[mix].Domain=dAir then Play('MOVE_PLANELANDING')
-      else Play('MOVE_LOAD');
-      DestinationMarkON:=false;
-      PaintDestination;
-      Status:=Status and ($FFFF-usWaiting-usStay-usRecover-usGoto-usEnhance);
-      NextUnit(UnStartLoc,true);
-      end
-    else if i=eNoTime_Load then
-      if MyModel[mix].Domain=dAir then
-        SoundMessage(Phrases.Lookup('NOTIMELOADAIR'),'NOMOVE_TIME')
-      else
-        SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
-          [MovementToString(MyModel[mix].Speed)]),'NOMOVE_TIME');
-    end
-  else if Sender=mUnload then
-    if Master>=0 then
-      begin
-      OldMaster:=Master;
-      i:=Server(sUnloadUnit,me,UnFocus,nil^);
-      if i>=rExecuted then
-        begin
-        if MyModel[mix].Domain=dAir then Play('MOVE_PLANESTART')
-        else if (MyModel[MyUn[OldMaster].mix].Domain=dAir)
-          and (MyMap[Loc] and fCity=0) and (MyMap[Loc] and fTerImp<>tiBase) then
-          Play('MOVE_PARACHUTE')
-        else Play('MOVE_UNLOAD');
-        Status:=Status and not usWaiting;
-        if MyModel[mix].Domain<>dAir then NextUnit(Loc,true)
-        else PanelPaint
-        end
-      else if i=eNoTime_Load then
-        if MyModel[mix].Domain=dAir then
-          SoundMessage(Phrases.Lookup('NOTIMELOADAIR'),'NOMOVE_TIME')
-        else
-          SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
-            [MovementToString(MyModel[mix].Speed)]),'NOMOVE_TIME');
-      end
-    else
-      begin
-      NewFocus:=-1;
-      uix:=UnFocus;
-      for i:=1 to MyRo.nUn-1 do
-        begin
-        uix:=(uix+MyRO.nUn-1) mod MyRO.nUn;
-        if (MyUn[uix].Master=UnFocus)
-          and (MyUn[uix].Movement=integer(MyModel[MyUn[uix].mix].Speed)) then
-          begin
-          MyUn[uix].Status:=MyUn[uix].Status or usWaiting;
-          NewFocus:=uix
-          end;
-        end;
-      if NewFocus>=0 then
-        begin
-        SetUnFocus(NewFocus);
-        SetTroopLoc(Loc);
-        PanelPaint
-        end
-      end
-  else if Sender=mSelectTransport then
-    Server(sSelectTransport,me,UnFocus,nil^)
-end;
-
-procedure TMainScreen.InitPopup(Popup: TPopupMenu);
-var
-i,p1,Tile,Test: integer;
-NoSuper,extended,Multi,NeedSep,HaveCities: boolean;
-LastSep,m: TMenuItem;
-mox: ^TModel;
-begin
-NoSuper:=not supervising and (1 shl me and MyRO.Alive<>0);
-HaveCities:=false;
-for i:=0 to MyRO.nCity-1 do if MyCity[i].Loc>=0 then
-  begin HaveCities:=true; Break end;
-if Popup=GamePopup then
-  begin
-  mTechTree.Visible:= ClientMode<>cEditMap;
-  mResign.Enabled:= supervising or (me=0) and (ClientMode<scContact);
-  mRandomMap.Visible:= (ClientMode=cEditMap)
-    and (Server(sMapGeneratorRequest,me,0,nil^)=eOk);
-  mOptions.Visible:= ClientMode<>cEditMap;
-  mManip.Visible:= ClientMode<>cEditMap;
-  if ClientMode<>cEditMap then
-    begin
-    mWaitTurn.Visible:= NoSuper;
-    mRep.Visible:= NoSuper;
-    mRepList.Visible:= NoSuper;
-    mRepScreens.Visible:= NoSuper;
-    N10.Visible:= NoSuper;
-    mOwnMovement.Visible:= NoSuper;
-    mAllyMovement.Visible:= NoSuper;
-    case SoundMode of
-      smOff: mSoundOff.Checked:=true;
-      smOn: mSoundOn.Checked:=true;
-      smOnAlt: mSoundOnAlt.Checked:=true;
-      end;
-
-    for i:=0 to nTestFlags-1 do
-      mManip[i].Checked:= MyRO.TestFlags and (1 shl i)<>0;
-    mManip.Enabled:= supervising or (me=0);
-
-    Multi:=false;
-    for p1:=1 to nPl-1 do
-      if G.RO[p1]<>nil then Multi:=true;
-    mEnemyMovement.Visible:=not Multi;
-    end;
-  mMacro.Visible:= NoSuper and (ClientMode<scContact);
-  if NoSuper and (ClientMode<scContact) then
-    begin
-    mCityTypes.Enabled:=false;
-    // check if city types already usefull:
-    if MyRO.nCity>0 then
-      for i:=28 to nImp-1 do
-        if (i<>imTrGoods) and (Imp[i].Kind=ikCommon) and (Imp[i].Preq<>preNA)
-          and ((Imp[i].Preq=preNone) or (MyRO.Tech[Imp[i].Preq]>=tsApplicable)) then
-          begin mCityTypes.Enabled:=true; Break end;
-    end;
-  mViewpoint.visible:=(ClientMode<>cEditMap) and supervising;
-  mViewpoint.enabled:= G.RO[0].Turn>0;
-  if supervising then
-    begin
-    EmptyMenu(mViewpoint);
-    for p1:=0 to nPl-1 do
-      if (p1=0) or (1 shl p1 and G.RO[0].Alive<>0) then
-        begin
-        m:=TMenuItem.Create(mViewpoint);
-        if p1=0 then
-          m.Caption:=Phrases.Lookup('SUPER')
-        else m.Caption:=Tribe[p1].TString(Phrases2.Lookup('BELONG'));
-        m.Tag:=p1;
-        m.OnClick:=ViewPointClick;
-        if p1<10 then
-          m.ShortCut:=Shortcut(48+p1, [ssCtrl]);
-        m.RadioItem:=true;
-        if p1=me then
-          m.Checked:=true;
-        mViewPoint.Add(m);
-        end
-    end;
-  mDebugMap.visible:=(ClientMode<>cEditMap) and supervising;
-  if supervising then
-    begin
-    EmptyMenu(mDebugMap);
-    for p1:=0 to nPl-1 do
-      if (p1=0) or (1 shl p1 and G.RO[0].Alive<>0) then
-        begin
-        m:=TMenuItem.Create(mDebugMap);
-        if p1=0 then
-          m.Caption:=Phrases2.Lookup('MENU_DEBUGMAPOFF')
-        else m.Caption:=Tribe[p1].TString(Phrases2.Lookup('BELONG'));
-        if p1=0 then
-          m.Tag:=-1
-        else m.Tag:=p1;
-        m.OnClick:=DebugMapClick;
-        if p1<10 then
-          m.ShortCut:=Shortcut(48+p1, [ssAlt]);
-        m.RadioItem:=true;
-        if m.Tag=IsoEngine.pDebugMap then
-          m.Checked:=true;
-        mDebugMap.Add(m);
-        end
-    end;
-  mSmallTiles.Checked:= xxt=33;
-  mNormalTiles.Checked:= xxt=48;
-  end
-else if Popup=StatPopup then
-  begin
-  mEmpire.Visible:= NoSuper;
-  mEmpire.Enabled:= MyRO.Government<>gAnarchy;
-  mRevolution.Visible:= NoSuper;
-  mRevolution.Enabled:= (MyRO.Government<>gAnarchy) and (ClientMode<scContact);
-  mUnitStat.Enabled:= NoSuper or (MyRO.Turn>0);
-  mCityStat.Visible:= 1 shl me and MyRO.Alive<>0;
-  mCityStat.Enabled:= HaveCities;
-  mScienceStat.Visible:= true;
-  mScienceStat.Enabled:= not NoSuper or (MyRO.ResearchTech>=0)
-    or (MyRO.Happened and phTech<>0)
-    or (MyRO.Happened and phGameEnd<>0) // no researchtech in case just completed
-    or (MyRO.TestFlags and (tfAllTechs or tfUncover or tfAllContact)<>0);
-  mEUnitStat.Enabled:= MyRO.nEnemyModel>0;
-{  mWonders.Enabled:= false;
-  for i:=0 to 27 do if MyRO.Wonder[i].CityID<>-1 then
-    mWonders.Enabled:=true;}
-  mDiagram.Enabled:= MyRO.Turn>=2;
-  mShips.Enabled:=false;
-  for p1:=0 to nPl-1 do
-    if MyRO.Ship[p1].Parts[spComp]+MyRO.Ship[p1].Parts[spPow]
-      +MyRO.Ship[p1].Parts[spHab]>0 then
-      mShips.Enabled:=true;
-  end
-else if Popup=UnitPopup then
-  begin
-  mox:=@MyModel[MyUn[UnFocus].mix];
-  Tile:=MyMap[MyUn[UnFocus].Loc];
-  extended:=Tile and fCity=0;
-  if extended then
-    begin
-    mCity.Caption:=Phrases.Lookup('BTN_FOUND');
-    mHome.Caption:=Phrases.Lookup('BTN_MOVEHOME')
-    end
-  else
-    begin
-    mCity.Caption:=Phrases.Lookup('BTN_ADD');
-    mHome.Caption:=Phrases.Lookup('BTN_SETHOME')
-    end;
-
-  extended:=extended and ((mox.Kind=mkSettler) or (mox.Kind=mkSlaves)
-      and (MyRO.Wonder[woPyramids].EffectiveOwner>=0))
-    and (MyUn[UnFocus].Master<0) and (Tile and fDeadLands=0);
-  if (mox.Kind=mkFreight) and (Tile and fCity<>0) and not Phrases2FallenBackToEnglish
-    or (Server(sRemoveUnit-sExecute,me,UnFocus,nil^)=eUtilized) then
-    begin
-    mDisband.Visible:=false;
-    mUtilize.Visible:=true;
-    if mox.Kind=mkFreight then
-      mUtilize.Caption:=Phrases.Lookup('UTILIZE')
-    else mUtilize.Caption:=Phrases.Lookup('INTEGRATE')
-    end
-  else begin mDisband.Visible:=true; mUtilize.Visible:=false end;
-  mGoOn.Visible:= MyUn[UnFocus].Status and (usGoto or usWaiting)=usGoto or usWaiting;
-  mHome.Visible:=HaveCities;
-  mRecover.Visible:= (MyUn[UnFocus].Health<100) and (Tile and fTerrain>=fGrass)
-    and ((MyRO.Wonder[woGardens].EffectiveOwner=me)
-      or (Tile and fTerrain<>fArctic) and (Tile and fTerrain<>fDesert))
-    and not ((mox.Domain=dAir) and (Tile and fCity=0) and (Tile and fTerImp<>tiBase));
-  mStay.Visible:= not ((mox.Domain=dAir) and (Tile and fCity=0) and (Tile and fTerImp<>tiBase));
-  mCity.Visible:=extended and (mox.Kind=mkSettler) or (Tile and fCity<>0)
-    and ((mox.Kind in [mkSettler,mkSlaves]) or (MyUn[UnFocus].Flags and unConscripts<>0));
-  mPillage.Visible:=(Tile and (fRoad or fRR or fCanal or fTerImp)<>0)
-    and (MyUn[UnFocus].Master<0) and (mox.Domain=dGround);
-  mCancel.Visible:=(MyUn[UnFocus].Job>jNone) or (MyUn[UnFocus].Status and (usRecover or usGoto)<>0);
-
-  Test:=Server(sLoadUnit-sExecute,me,UnFocus,nil^);
-  mLoad.Visible:= (Test>=rExecuted) or (Test=eNoTime_Load);
-  mUnload.Visible:= (MyUn[UnFocus].Master>=0)
-    or (MyUn[UnFocus].TroopLoad+MyUn[UnFocus].AirLoad>0);
-  mSelectTransport.Visible:=
-    Server(sSelectTransport-sExecute,me,UnFocus,nil^)>=rExecuted;
-  end
-else {if Popup=TerrainPopup then}
-  begin
-  mox:=@MyModel[MyUn[UnFocus].mix];
-  Tile:=MyMap[MyUn[UnFocus].Loc];
-  extended:=Tile and fCity=0;
-
-  if (Tile and fRiver<>0) and (MyRO.Tech[adBridgeBuilding]>=tsApplicable) then
-    begin
-    mRoad.Caption:=Phrases.Lookup('BTN_BUILDBRIDGE');
-    mRR.Caption:=Phrases.Lookup('BTN_BUILDRRBRIDGE');
-    end
-  else
-    begin
-    mRoad.Caption:=Phrases.Lookup('BTN_BUILDROAD');
-    mRR.Caption:=Phrases.Lookup('BTN_BUILDRR');
-    end;
-  if Tile and fTerrain=fForest then
-    mClear.Caption:=Phrases.Lookup('BTN_CLEAR')
-  else if Tile and fTerrain=fDesert then
-    mClear.Caption:=Phrases.Lookup('BTN_UNDESERT')
-  else mClear.Caption:=Phrases.Lookup('BTN_DRAIN');
-
-  extended:=extended and ((mox.Kind=mkSettler) or (mox.Kind=mkSlaves)
-      and (MyRO.Wonder[woPyramids].EffectiveOwner>=0))
-    and (MyUn[UnFocus].Master<0);
-  if extended then
-    begin
-    mRoad.Visible:= JobTest(UnFocus,jRoad,[eNoBridgeBuilding,eTreaty]);
-    mRR.Visible:= JobTest(UnFocus,jRR,[eNoBridgeBuilding,eTreaty]);
-    mClear.Visible:= JobTest(UnFocus,jClear,[eTreaty]);
-    mIrrigation.Visible:= JobTest(UnFocus,jIrr,[eTreaty]);
-    mFarm.Visible:= JobTest(UnFocus,jFarm,[eTreaty]);
-    mAfforest.Visible:= JobTest(UnFocus,jAfforest,[eTreaty]);
-    mMine.Visible:= JobTest(UnFocus,jMine,[eTreaty]);
-    MTrans.Visible:= JobTest(UnFocus,jTrans,[eTreaty]);
-    mCanal.Visible:= JobTest(UnFocus,jCanal,[eTreaty]);
-    mFort.Visible:= JobTest(UnFocus,jFort,[eTreaty]);
-    mAirBase.Visible:= JobTest(UnFocus,jBase,[eTreaty]);
-    mPollution.Visible:=JobTest(UnFocus,jPoll,[eTreaty]);
-    mEnhance.Visible:= (Tile and fDeadLands=0)
-      and (MyData.EnhancementJobs[MyMap[MyUn[UnFocus].Loc] and fTerrain,0]<>jNone);
-    end
-  else
-    begin
-    for i:=0 to Popup.Items.Count-1 do Popup.Items[i].Visible:=false;
-    end;
-  end;
-
-// set menu seperators
-LastSep:=nil;
-needsep:=false;
-for i:=0 to Popup.Items.Count-1 do
-  if Popup.Items[i].Caption='-' then
-    begin
-    Popup.Items[i].Visible:=needsep;
-    if needsep then LastSep:=Popup.Items[i];
-    needsep:=false
-    end
-  else if Popup.Items[i].Visible then needsep:=true;
-if (LastSep<>nil) and not NeedSep then LastSep.Visible:=false   
-end;
-
-procedure TMainScreen.PanelBtnClick(Sender: TObject);
-var
-Popup: TPopupMenu;
-begin
-if Sender=UnitBtn then Popup:=UnitPopup
-else {if Sender=TerrainBtn then} Popup:=TerrainPopup;
-InitPopup(Popup);
-if FullScreen then
-  Popup.Popup(Left+TControl(Sender).Left,Top+TControl(Sender).Top)
-else Popup.Popup(Left+TControl(Sender).Left+4,Top+TControl(Sender).Top
-  +GetSystemMetrics(SM_CYCAPTION)+4);
-end;
-
-procedure TMainScreen.CityClosed(Activateuix: integer; StepFocus: boolean;
-  SelectFocus: boolean);
-begin
-if supervising then
-  begin
-  SetTroopLoc(-1);
-  PanelPaint
-  end
-else
-  begin
-  if Activateuix>=0 then
-    begin
-    SetUnFocus(Activateuix);
-    SetTroopLoc(MyUn[Activateuix].Loc);
-    if SelectFocus then FocusOnLoc(TroopLoc,flRepaintPanel)
-    else PanelPaint
-    end
-  else if StepFocus then NextUnit(TroopLoc,true)
-  else
-    begin
-    SetTroopLoc(-1);
-    PanelPaint
-    end
-  end
-end;
-
-procedure TMainScreen.Toggle(Sender: TObject);
-begin
-TMenuItem(Sender).Checked:=not TMenuItem(Sender).Checked
-end;
-
-procedure TMainScreen.PanelBoxMouseMove(Sender: TObject;
-  Shift: TShiftState; x, y: integer);
-var
-xCentre,yCentre: integer;
-begin
-if Tracking and (ssLeft in Shift) then
-  begin
-  if (x>=xMini+2) and (y>=yMini+2) and (x<xMini+2+2*G.lx) and (y<yMini+2+G.ly) then
-    begin
-    xCentre:=(xwMini+(x-xMini-2) div 2+G.lx div 2+MapWidth div (xxt*4)) mod G.lx;
-    yCentre:=(y-yMini-2);
-    xw:=(xCentre-MapWidth div (xxt*4)+G.lx) mod G.lx;
-    if ywmax<=0 then yw:=ywcenter
-    else
-      begin
-      yw:=(yCentre-MapHeight div (yyt*2)+1) and not 1;
-      if yw<0 then yw:=0
-      else if yw>ywmax then yw:=ywmax;
-      end;
-    BitBlt(Buffer.Canvas.Handle,0,0,G.lx*2,G.ly,Mini.Canvas.Handle,0,0,SRCCOPY);
-    if ywmax<=0 then
-      Frame(Buffer.Canvas,x-xMini-2-MapWidth div (xxt*2),0,
-        x-xMini-2+MapWidth div (xxt*2)-1,
-        G.ly-1,MainTexture.clMark,MainTexture.clMark)
-    else Frame(Buffer.Canvas,x-xMini-2-MapWidth div (xxt*2),yw,
-      x-xMini-2+MapWidth div (xxt*2)-1,
-      yw+MapHeight div yyt-2,MainTexture.clMark,MainTexture.clMark);
-    BitBlt(Panel.Canvas.Handle,xMini+2,yMini+2,G.lx*2,G.ly,Buffer.Canvas.Handle,
-      0,0,SRCCOPY);
-    MainOffscreenPaint;
-    RectInvalidate(xMini+2,TopBarHeight+MapHeight-overlap+yMini+2,
-      xMini+2+G.lx*2,TopBarHeight+MapHeight-overlap+yMini+2+G.ly);
-    Update;
-    end
-  end
-else Tracking:=false
-end;
-
-procedure TMainScreen.PanelBoxMouseUp(Sender: TObject;
-  Button: TMouseButton; Shift: TShiftState; x, y: integer);
-begin
-if Tracking then
-  begin
-  Tracking:=false;
-  xwMini:=xw; ywMini:=yw;
-  MiniPaint;
-  PanelPaint;
-  end
-end;
-
-procedure TMainScreen.MapBoxMouseMove(Sender: TObject; Shift: TShiftState; x,
-  y: integer);
-var
-MouseLoc: integer;
-begin
-xMouse:=x; yMouse:=y;
-if (ClientMode=cEditMap) and (ssLeft in Shift) and not tracking then
-  begin
-  MouseLoc:=LocationOfScreenPixel(x,y);
-  if MouseLoc<>BrushLoc then
-    MapBoxMouseDown(nil, mbLeft, Shift, x, y);
-  end
-(*else if idle and (UnFocus>=0) then
-  begin
-  qx:=(xMouse*32+yMouse*66+16*66) div(32*66)-1;
-  qy:=(yMouse*66-xMouse*32-16*66+2000*33*32) div(32*66)-999;
-  MouseLoc:=(xw+(qx-qy+2048) div 2-1024+G.lx) mod G.lx+G.lx*(yw+qx+qy);
-  ShowMoveHint(MouseLoc);
-  end*)
-end;
-
-procedure TMainScreen.mShowClick(Sender: TObject);
-begin
-TMenuItem(Sender).Checked:=not TMenuItem(Sender).Checked;
-SetMapOptions;
-MapValid:=false;
-PaintAllMaps;
-end;
-
-procedure TMainScreen.mNamesClick(Sender: TObject);
-var
-p1: integer;
-begin
-mNames.Checked:=not mNames.Checked;
-GenerateNames:=mNames.Checked;
-for p1:=0 to nPl-1 do if Tribe[p1]<>nil then
-  if GenerateNames then Tribe[p1].NumberName:=-1
-  else Tribe[p1].NumberName:=p1;
-MapValid:=false;
-PaintAll;
-end;
-
-function TMainScreen.IsPanelPixel(x,y: integer): boolean;
-begin
-result:= (y>=TopBarHeight+MapHeight)
-  or (y>=ClientHeight-PanelHeight) and ((x<xMidPanel) or (x>=xRightPanel))
-end;
-
-procedure TMainScreen.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-begin
-if idle then
-  if (x<40) and (y<40) then
-    begin
-    if GameMode<>cMovie then
-      begin
-      InitPopup(GamePopup);
-      if FullScreen then
-        GamePopup.Popup(Left,Top+TopBarHeight-1)
-      else GamePopup.Popup(Left+4,Top+GetSystemMetrics(SM_CYCAPTION)+4+TopBarHeight-1);
-      end
-    end
-  else if IsPanelPixel(x,y) then
-    PanelBoxMouseDown(Sender,Button,Shift,x,y-(ClientHeight-PanelHeight))
-  else if (y>=TopBarHeight) and (x>=MapOffset) and (x<MapOffset+MapWidth) then
-    MapBoxMouseDown(Sender,Button,Shift,x-MapOffset,y-TopBarHeight)
-end;
-
-procedure TMainScreen.FormMouseMove(Sender: TObject; Shift: TShiftState; x,
-  y: integer);
-begin
-if idle then
-  if IsPanelPixel(x,y) then
-    PanelBoxMouseMove(Sender,Shift,x,y-(ClientHeight-PanelHeight))
-  else if (y>=TopBarHeight) and (x>=MapOffset) and (x<MapOffset+MapWidth) then
-    MapBoxMouseMove(Sender,Shift,x-MapOffset,y-TopBarHeight);
-end;
-
-procedure TMainScreen.FormMouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-begin
-if idle then
-  PanelBoxMouseUp(Sender,Button,Shift,x,y-(ClientHeight-PanelHeight));
-end;
-
-procedure TMainScreen.FormPaint(Sender: TObject);
-begin
-MainOffscreenPaint;
-if (MapOffset>0) or (MapOffset+MapWidth<ClientWidth) then with canvas do
-  begin // pillarbox, make left and right border black
-  if me<0 then
-    brush.color:=$000000
-  else brush.color:=EmptySpaceColor;
-  if xMidPanel>MapOffset then
-    FillRect(Rect(0,TopBarHeight,MapOffset,TopBarHeight+MapHeight-overlap))
-  else
-    begin
-    FillRect(Rect(0,TopBarHeight,xMidPanel,TopBarHeight+MapHeight-overlap));
-    FillRect(Rect(xMidPanel,TopBarHeight,MapOffset,TopBarHeight+MapHeight));
-    end;
-  if xRightPanel<MapOffset+MapWidth then
-    FillRect(Rect(MapOffset+MapWidth,TopBarHeight,ClientWidth,TopBarHeight+MapHeight-overlap))
-  else
-    begin
-    FillRect(Rect(MapOffset+MapWidth,TopBarHeight,xRightPanel,TopBarHeight+MapHeight));
-    FillRect(Rect(xRightPanel,TopBarHeight,ClientWidth,TopBarHeight+MapHeight-overlap));
-    end;
-  Brush.Style:=bsClear;
-  end;
-BitBlt(Canvas.Handle,MapOffset,TopBarHeight,MapWidth,MapHeight-overlap,offscreen.Canvas.Handle,
-  0,0,SRCCOPY);
-BitBlt(Canvas.Handle,0,0,ClientWidth,TopBarHeight,TopBar.Canvas.Handle,
-  0,0,SRCCOPY);
-if xMidPanel>MapOffset then
-  BitBlt(Canvas.Handle,xMidPanel,TopBarHeight+MapHeight-overlap,
-    ClientWidth div 2-xMidPanel,overlap,
-    offscreen.Canvas.Handle,xMidPanel-MapOffset,MapHeight-overlap,SRCCOPY)
-else BitBlt(Canvas.Handle,MapOffset,TopBarHeight+MapHeight-overlap,
-  ClientWidth div 2-MapOffset,overlap,
-  offscreen.Canvas.Handle,0,MapHeight-overlap,SRCCOPY);
-if xRightPanel<MapOffset+MapWidth then
-  BitBlt(Canvas.Handle,ClientWidth div 2,TopBarHeight+MapHeight-overlap,
-    xRightPanel-ClientWidth div 2,overlap,
-    offscreen.Canvas.Handle,ClientWidth div 2-MapOffset,MapHeight-overlap,SRCCOPY)
-else BitBlt(Canvas.Handle,ClientWidth div 2,TopBarHeight+MapHeight-overlap,
-  MapOffset+MapWidth-ClientWidth div 2,overlap,
-  offscreen.Canvas.Handle,ClientWidth div 2-MapOffset,MapHeight-overlap,SRCCOPY);
-BitBlt(Canvas.Handle,0,TopBarHeight+MapHeight-overlap,xMidPanel,overlap,
-  Panel.Canvas.Handle,0,0,SRCCOPY);
-BitBlt(Canvas.Handle,xRightPanel,TopBarHeight+MapHeight-overlap,Panel.Width-xRightPanel,
-  overlap,Panel.Canvas.Handle,xRightPanel,0,SRCCOPY);
-BitBlt(Canvas.Handle,0,TopBarHeight+MapHeight,Panel.Width,PanelHeight-overlap,
-  Panel.Canvas.Handle,0,overlap,SRCCOPY);
-if (pLogo>=0) and (G.RO[pLogo]=nil) and (AILogo[pLogo]<>nil) then
-  BitBlt(Canvas.Handle, xRightPanel+10-(16+64), ClientHeight-PanelHeight, 64,64,
-    AILogo[pLogo].Canvas.Handle,0,0,SRCCOPY);     
-end;
-
-procedure TMainScreen.RectInvalidate(Left,Top,Rigth,Bottom: integer);
-var
-r0: HRgn;
-begin
-r0:=CreateRectRgn(Left,Top,Rigth,Bottom);
-InvalidateRgn(Handle,r0,false);
-DeleteObject(r0);
-end;
-
-procedure TMainScreen.SmartRectInvalidate(Left,Top,Rigth,Bottom: integer);
-var
-i: integer;
-r0,r1: HRgn;
-begin
-r0:=CreateRectRgn(Left,Top,Rigth,Bottom);
-for i:=0 to ControlCount-1 do
-  if not (Controls[i] is TArea) and Controls[i].Visible then
-    begin
-    with Controls[i].BoundsRect do
-      r1:=CreateRectRgn(Left,Top,Right,Bottom);
-    CombineRgn(r0,r0,r1,RGN_DIFF);
-    DeleteObject(r1);
-    end;
-InvalidateRgn(Handle,r0,false);
-DeleteObject(r0);
-end;
-
-procedure TMainScreen.mRepClicked(Sender: TObject);
-begin
-with TMenuItem(Sender) do
-  begin
-  Checked:=not Checked;
-  if Checked then CityRepMask:=CityRepMask or (1 shl (Tag shr 8))
-  else CityRepMask:=CityRepMask and not (1 shl (Tag shr 8))
-  end
-end;
-
-procedure TMainScreen.mLogClick(Sender: TObject);
-begin
-LogDlg.Show
-end;
-
-procedure TMainScreen.FormShow(Sender: TObject);
-begin
-Timer1.Enabled:=true
-end;
-
-procedure TMainScreen.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-Timer1.Enabled:=false
-end;
-
-procedure TMainScreen.Radio(Sender: TObject);
-begin
-TMenuItem(Sender).Checked:=true
-end;
-
-procedure TMainScreen.mManipClick(Sender: TObject);
-var
-Flag: integer;
-begin
-with TMenuItem(Sender) do
-  begin
-  Flag:=1 shl (Tag shr 8);
-  if Checked then Server(sClearTestFlag,0,Flag,nil^)
-  else
-    begin
-    Server(sSetTestFlag,0,Flag,nil^);
-    Play('CHEAT');
-    end;
-  if not supervising then
-    begin
-    if Flag=tfUncover then
-      begin MapValid:=false; PaintAllMaps; end
-    else if Flag=tfAllTechs then
-      TellNewModels
-    end
-  end
-end;
-
-procedure TMainScreen.MapBtnClick(Sender: TObject);
-begin
-with TButtonC(Sender) do
-  begin
-  MapOptionChecked:=MapOptionChecked xor (1 shl (Tag shr 8));
-  SetMapOptions;
-  ButtonIndex:=MapOptionChecked shr (Tag shr 8) and 1 +2
-  end;
-if Sender=MapBtn0 then
-  begin MiniPaint; PanelPaint end // update mini map only
-else begin MapValid:=false; PaintAllMaps; end; // update main map
-end;
-
-procedure TMainScreen.GrWallBtnDownChanged(Sender: TObject);
-begin
-if TButtonBase(Sender).Down then
-  begin
-  MapOptionChecked:=MapOptionChecked or (1 shl moGreatWall);
-  TButtonBase(Sender).Hint:='';
-  end
-else
-  begin
-  MapOptionChecked:=MapOptionChecked and not (1 shl moGreatWall);
-  TButtonBase(Sender).Hint:=Phrases.Lookup('CONTROLS',-1+TButtonBase(Sender).Tag and $FF);
-  end;
-SetMapOptions;
-MapValid:=false;
-PaintAllMaps;
-end;
-
-procedure TMainScreen.BareBtnDownChanged(Sender: TObject);
-begin
-if TButtonBase(Sender).Down then
-  begin
-  MapOptionChecked:=MapOptionChecked or (1 shl moBareTerrain);
-  TButtonBase(Sender).Hint:='';
-  end
-else
-  begin
-  MapOptionChecked:=MapOptionChecked and not (1 shl moBareTerrain);
-  TButtonBase(Sender).Hint:=Phrases.Lookup('CONTROLS',-1+TButtonBase(Sender).Tag and $FF);
-  end;
-SetMapOptions;
-MapValid:=false;
-PaintAllMaps;
-end;
-
-procedure TMainScreen.FormKeyUp(Sender: TObject; var Key: Word;
-  Shift: TShiftState);
-begin
-if idle and (Key=VK_APPS) then
-  begin
-  InitPopup(GamePopup);
-  if FullScreen then
-    GamePopup.Popup(Left,Top+TopBarHeight-1)
-  else GamePopup.Popup(Left+4,Top+GetSystemMetrics(SM_CYCAPTION)+4+TopBarHeight-1);
-  exit
-  end // windows menu button calls game menu
-end;
-
-procedure TMainScreen.CreateUnitClick(Sender: TObject);
-var
-p1,mix: integer;
-begin
-p1:=TComponent(Sender).Tag shr 16;
-mix:=TComponent(Sender).Tag and $FFFF;
-if Server(sCreateUnit+p1 shl 4,me,mix,EditLoc)>=rExecuted then
-  PaintLoc(EditLoc);
-end;
-
-procedure TMainScreen.mSoundOffClick(Sender: TObject);
-begin
-SoundMode:=smOff;
-end;
-
-procedure TMainScreen.mSoundOnClick(Sender: TObject);
-begin
-SoundMode:=smOn;
-end;
-
-procedure TMainScreen.mSoundOnAltClick(Sender: TObject);
-begin
-SoundMode:=smOnAlt;
-end;
-
-{procedure TMainScreen.AdviceBtnClick;
-var
-OldAdviceLoc: integer;
-begin
-DestinationMarkON:=false;
-PaintDestination;
-AdvisorDlg.GiveStrategyAdvice;
-OldAdviceLoc:=MainMap.AdviceLoc;
-MainMap.AdviceLoc:=-1;
-PaintLoc(OldAdviceLoc);
-end;}
-
-{procedure TMainScreen.SetAdviceLoc(Loc: integer; AvoidRect: TRect);
-var
-OldAdviceLoc,x,y: integer;
-begin
-if Loc<>MainMap.AdviceLoc then
-  begin
-  if Loc>=0 then
-    begin // center
-    y:=Loc div G.lx;
-    x:=(Loc+G.lx - AvoidRect.Right div (2*66)) mod G.lx;
-    Centre(y*G.lx+x);
-    PaintAllMaps;
-    end;
-  OldAdviceLoc:=MainMap.AdviceLoc;
-  MainMap.AdviceLoc:=Loc;
-  PaintLoc(OldAdviceLoc);
-  PaintLoc(MainMap.AdviceLoc);
-  end;
-end;}
-
-procedure TMainScreen.UnitInfoBtnClick(Sender: TObject);
-begin
-if UnFocus>=0 then
-  UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, MyUn[UnFocus].mix)
-end;
-
-procedure TMainScreen.ViewpointClick(Sender: TObject);
-begin
-SetViewpoint(TMenuItem(Sender).Tag);
-end;
-
-procedure TMainScreen.DebugMapClick(Sender: TObject);
-begin
-SetDebugMap(TMenuItem(Sender).Tag);
-end;
-
-procedure TMainScreen.mSmallTilesClick(Sender: TObject);
-begin
-SetTileSize(33,16);
-end;
-
-procedure TMainScreen.mNormalTilesClick(Sender: TObject);
-begin
-SetTileSize(48,24);
-end;
-
-procedure TMainScreen.SetTileSize(x,y: integer);
-var
-i,CenterLoc: integer;
-begin
-CenterLoc:=(xw+MapWidth div (xxt*4)) mod G.lx+(yw+MapHeight div (yyt*2))*G.lx;
-IsoEngine.ApplyTileSize(x,y);
-FormResize(nil);
-Centre(CenterLoc);
-PaintAllMaps;
-for i:=0 to Screen.FormCount-1 do
-  if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-    TBufferedDrawDlg(Screen.Forms[i]).SmartUpdateContent(false);
-end;
-
-procedure TMainScreen.SaveSettings;
-var
-i,j: integer;
-Reg: TRegistry;
-begin
-OptionChecked:=OptionChecked and soExtraMask;
-for i:=0 to ComponentCount-1 do if Components[i] is TMenuItem then
-  for j:=0 to nSaveOption-1 do
-    if TMenuItem(Components[i]).Checked
-      and (TMenuItem(Components[i]).Tag=SaveOption[j]) then
-      inc(OptionChecked,1 shl j);
-
-Reg:=TRegistry.Create;
-Reg.OpenKey('SOFTWARE\cevo\RegVer9',true);
-Reg.WriteInteger('TileWidth',xxt*2);
-Reg.WriteInteger('TileHeight',yyt*2);
-Reg.WriteInteger('OptionChecked', OptionChecked);
-Reg.WriteInteger('MapOptionChecked', MapOptionChecked);
-Reg.WriteInteger('CityReport',integer(CityRepMask));
-Reg.closekey;
-Reg.Free;
-end;
-
-procedure TMainScreen.MovieSpeedBtnClick(Sender: TObject);
-begin
-MovieSpeed:=TButtonB(Sender).Tag shr 8;
-CheckMovieSpeedBtnState;
-end;
+      end; }
+
+    procedure TMainScreen.UnitInfoBtnClick(Sender: TObject);
+    begin
+      if UnFocus >= 0 then
+        UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, MyUn[UnFocus].mix)
+    end;
+
+    procedure TMainScreen.ViewpointClick(Sender: TObject);
+    begin
+      SetViewpoint(TMenuItem(Sender).Tag);
+    end;
+
+    procedure TMainScreen.DebugMapClick(Sender: TObject);
+    begin
+      SetDebugMap(TMenuItem(Sender).Tag);
+    end;
+
+    procedure TMainScreen.mSmallTilesClick(Sender: TObject);
+    begin
+      SetTileSize(33, 16);
+    end;
+
+    procedure TMainScreen.mNormalTilesClick(Sender: TObject);
+    begin
+      SetTileSize(48, 24);
+    end;
+
+    procedure TMainScreen.SetTileSize(x, y: integer);
+    var
+      i, CenterLoc: integer;
+    begin
+      CenterLoc := (xw + MapWidth div (xxt * 4)) mod G.lx +
+        (yw + MapHeight div (yyt * 2)) * G.lx;
+      IsoEngine.ApplyTileSize(x, y);
+      FormResize(nil);
+      Centre(CenterLoc);
+      PaintAllMaps;
+      for i := 0 to Screen.FormCount - 1 do
+        if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+        then
+          TBufferedDrawDlg(Screen.Forms[i]).SmartUpdateContent(false);
+    end;
+
+    procedure TMainScreen.SaveSettings;
+    var
+      i, j: integer;
+      Reg: TRegistry;
+    begin
+      OptionChecked := OptionChecked and soExtraMask;
+      for i := 0 to ComponentCount - 1 do
+        if Components[i] is TMenuItem then
+          for j := 0 to nSaveOption - 1 do
+            if TMenuItem(Components[i]).Checked and
+              (TMenuItem(Components[i]).Tag = SaveOption[j]) then
+              inc(OptionChecked, 1 shl j);
+
+      Reg := TRegistry.Create;
+      Reg.OpenKey('SOFTWARE\cevo\RegVer9', true);
+      Reg.WriteInteger('TileWidth', xxt * 2);
+      Reg.WriteInteger('TileHeight', yyt * 2);
+      Reg.WriteInteger('OptionChecked', OptionChecked);
+      Reg.WriteInteger('MapOptionChecked', MapOptionChecked);
+      Reg.WriteInteger('CityReport', integer(CityRepMask));
+      Reg.closekey;
+      Reg.free;
+    end;
+
+    procedure TMainScreen.MovieSpeedBtnClick(Sender: TObject);
+    begin
+      MovieSpeed := TButtonB(Sender).Tag shr 8;
+      CheckMovieSpeedBtnState;
+    end;
 
 initialization
+
 QueryPerformanceFrequency(PerfFreq);
 
 end.
-

trunk/LocalPlayer/Tribes.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Tribes;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ScreenTools,
-
-  Classes,Graphics,SysUtils;
+  Protocol, ScreenTools,
+
+  Classes, Graphics, SysUtils;
 
 type
-TCityPicture=record
-  xShield,yShield:integer;
-  end;
-TModelPicture=record
-  HGr,pix,xShield,yShield:integer;
-  end;
-TModelPictureInfo=record
-  trix,mix,pix,Hash: integer;
-  GrName: ShortString
-  end;
-
-TTribe=class
-  symHGr, sympix, faceHGr, facepix, cHGr, cpix, //symbol and city graphics
-  cAge, mixSlaves: integer;
-  Color: TColor;
-  NumberName: integer;
-  CityPicture: array[0..3] of TCityPicture;
-  ModelPicture: array[-1..256] of TModelPicture; // -1 is building site
-  ModelName: array[-1..256] of string;
-  constructor Create(FileName: string);
-  destructor Destroy; override;
-  function GetCityName(i: integer): string;
-  {$IFNDEF SCR}procedure SetCityName(i: integer; NewName: string);{$ENDIF}
-  {$IFNDEF SCR}function TString(Template: string): string;
-  function TPhrase(Item: string): string;{$ENDIF}
-  procedure SetModelPicture(const Info: TModelPictureInfo; IsNew: boolean);
-  function ChooseModelPicture(var Picture: TModelPictureInfo;
-    code,Turn: integer; ForceNew: boolean): boolean;
-  procedure InitAge(Age: integer);
-protected
-  CityLine0,nCityLines: integer;
-  Name: array['a'..'z'] of string;
-  Script: tstringlist;
+  TCityPicture = record
+    xShield, yShield: integer;
+  end;
+
+  TModelPicture = record
+    HGr, pix, xShield, yShield: integer;
+  end;
+
+  TModelPictureInfo = record
+    trix, mix, pix, Hash: integer;
+    GrName: ShortString end;
+
+    TTribe = class symHGr, sympix, faceHGr, facepix, cHGr, cpix,
+    // symbol and city graphics
+    cAge, mixSlaves: integer;
+    Color: TColor;
+    NumberName: integer;
+    CityPicture: array [0 .. 3] of TCityPicture;
+    ModelPicture: array [-1 .. 256] of TModelPicture; // -1 is building site
+    ModelName: array [-1 .. 256] of string;
+    constructor Create(FileName: string);
+    destructor Destroy; override;
+    function GetCityName(i: integer): string;
+{$IFNDEF SCR} procedure SetCityName(i: integer; NewName: string); {$ENDIF}
+{$IFNDEF SCR} function TString(Template: string): string;
+    function TPhrase(Item: string): string; {$ENDIF}
+    procedure SetModelPicture(const Info: TModelPictureInfo; IsNew: boolean);
+    function ChooseModelPicture(var Picture: TModelPictureInfo;
+      code, Turn: integer; ForceNew: boolean): boolean;
+    procedure InitAge(Age: integer);
+  protected
+    CityLine0, nCityLines: integer;
+    Name: array ['a' .. 'z'] of string;
+    Script: tstringlist;
   end;
 
 var
-Tribe: array[0..nPl-1] of TTribe;
-HGrStdUnits: integer;
+  Tribe: array [0 .. nPl - 1] of TTribe;
+  HGrStdUnits: integer;
 
 procedure Init;
@@ -56 +56 @@
 procedure FindStdModelPicture(code: integer; var pix: integer;
   var Name: string);
-function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): boolean;
-procedure FindPosition(HGr,x,y,xmax,ymax: integer; Mark: TColor; var xp,yp: integer);
-
+function GetTribeInfo(FileName: string; var Name: string;
+  var Color: TColor): boolean;
+procedure FindPosition(HGr, x, y, xmax, ymax: integer; Mark: TColor;
+  var xp, yp: integer);
 
 implementation
 
 uses
-Directories;
-
+  Directories;
 
 type
-TChosenModelPictureInfo=record
-  Hash,HGr,pix: integer;
-  ModelName: ShortString
-  end;
-
-TPictureList=array[0..99999] of TChosenModelPictureInfo;
-
-var
-StdUnitScript: tstringlist;
-PictureList: ^TPictureList;
-nPictureList: integer;
-
-
-procedure Init;
-begin
-StdUnitScript:=tstringlist.Create;
-StdUnitScript.LoadFromFile(LocalizedFilePath('Tribes\StdUnits.txt'));
-nPictureList:=0;
-PictureList:=nil;
-end;
-
-procedure Done;
-begin
-ReallocMem(PictureList,0);
-StdUnitScript.Free;
-end;
-
-function CityName(Founder: integer): string;
-begin
-if not GenerateNames then
-  result:=Format('%d.%d',[Founder shr 12, Founder and $FFF])
-else result:=Tribe[Founder shr 12].GetCityName(Founder and $FFF);
-end;
-
-function ModelCode(const ModelInfo: TModelInfo): integer;
-begin
-with ModelInfo do
-  begin
-  case Kind of
-    mkSelfDeveloped, mkEnemyDeveloped:
-      case Domain of {age determination}
-        dGround:
-          if (Attack>=Defense*4)
-            or (Attack>0) and (MaxUpgrade<10)
-              and (Cap and (1 shl (mcArtillery-mcFirstNonCap))<>0) then
-            begin
-            result:=170;
-            if MaxUpgrade>=12 then inc(result,3)
-            else if (MaxUpgrade>=10) or (Weight>7) then inc(result,2)
-            else if MaxUpgrade>=4 then inc(result,1)
+  TChosenModelPictureInfo = record
+    Hash, HGr, pix: integer;
+    ModelName: ShortString end;
+
+    TPictureList = array [0 .. 99999] of TChosenModelPictureInfo;
+
+  var
+    StdUnitScript: tstringlist;
+    PictureList: ^TPictureList;
+    nPictureList: integer;
+
+    procedure Init;
+    begin
+      StdUnitScript := tstringlist.Create;
+      StdUnitScript.LoadFromFile(LocalizedFilePath('Tribes\StdUnits.txt'));
+      nPictureList := 0;
+      PictureList := nil;
+    end;
+
+    procedure Done;
+    begin
+      ReallocMem(PictureList, 0);
+      StdUnitScript.Free;
+    end;
+
+    function CityName(Founder: integer): string;
+    begin
+      if not GenerateNames then
+        result := Format('%d.%d', [Founder shr 12, Founder and $FFF])
+      else
+        result := Tribe[Founder shr 12].GetCityName(Founder and $FFF);
+    end;
+
+    function ModelCode(const ModelInfo: TModelInfo): integer;
+    begin
+      with ModelInfo do
+      begin
+        case Kind of
+          mkSelfDeveloped, mkEnemyDeveloped:
+            case Domain of { age determination }
+              dGround:
+                if (Attack >= Defense * 4) or (Attack > 0) and (MaxUpgrade < 10)
+                  and (Cap and (1 shl (mcArtillery - mcFirstNonCap)) <> 0) then
+                begin
+                  result := 170;
+                  if MaxUpgrade >= 12 then
+                    inc(result, 3)
+                  else if (MaxUpgrade >= 10) or (Weight > 7) then
+                    inc(result, 2)
+                  else if MaxUpgrade >= 4 then
+                    inc(result, 1)
+                end
+                else
+                begin
+                  result := 100;
+                  if MaxUpgrade >= 12 then
+                    inc(result, 6)
+                  else if (MaxUpgrade >= 10) or (Weight > 7) then
+                    inc(result, 5)
+                  else if MaxUpgrade >= 6 then
+                    inc(result, 4)
+                  else if MaxUpgrade >= 4 then
+                    inc(result, 3)
+                  else if MaxUpgrade >= 2 then
+                    inc(result, 2)
+                  else if MaxUpgrade >= 1 then
+                    inc(result, 1);
+                  if Speed >= 250 then
+                    if (result >= 105) and (Attack <= Defense) then
+                      result := 110
+                    else
+                      inc(result, 30)
+                end;
+              dSea:
+                begin
+                  result := 200;
+                  if MaxUpgrade >= 8 then
+                    inc(result, 3)
+                  else if MaxUpgrade >= 6 then
+                    inc(result, 2)
+                  else if MaxUpgrade >= 3 then
+                    inc(result, 1);
+                  if Cap and (1 shl (mcSub - mcFirstNonCap)) <> 0 then
+                    result := 240
+                  else if ATrans_Fuel > 0 then
+                    result := 220
+                  else if (result >= 202) and (Attack = 0) and (TTrans > 0) then
+                    result := 210;
+                end;
+              dAir:
+                begin
+                  result := 300;
+                  if (Bombs > 0) or (TTrans > 0) then
+                    inc(result, 10);
+                  if Speed > 850 then
+                    inc(result, 1)
+                end;
+            end;
+          mkSpecial_TownGuard:
+            result := 41;
+          mkSpecial_Boat:
+            result := 64;
+          mkSpecial_SubCabin:
+            result := 71;
+          mkSpecial_Glider:
+            result := 73;
+          mkSlaves:
+            result := 74;
+          mkSettler:
+            if Speed > 150 then
+              result := 11
+            else
+              result := 10;
+          mkDiplomat:
+            result := 21;
+          mkCaravan:
+            result := 30;
+        end;
+      end;
+    end;
+
+  var
+    Input: string;
+
+    function Get: string;
+
+  var
+    p: integer;
+  begin
+    while (Input <> '') and ((Input[1] = ' ') or (Input[1] = #9)) do
+      Delete(Input, 1, 1);
+    p := pos(',', Input);
+    if p = 0 then
+      p := Length(Input) + 1;
+    result := Copy(Input, 1, p - 1);
+    Delete(Input, 1, p)
+  end;
+
+  function GetNum: integer;
+
+  var
+    i: integer;
+  begin
+    val(Get, result, i);
+    if i <> 0 then
+      result := 0
+  end;
+
+  procedure FindStdModelPicture(code: integer; var pix: integer;
+    var Name: string);
+
+  var
+    i: integer;
+  begin
+    for i := 0 to StdUnitScript.Count - 1 do
+    begin // look through StdUnits
+      Input := StdUnitScript[i];
+      pix := GetNum;
+      if code = GetNum then
+      begin
+        Name := Get;
+        exit;
+      end
+    end;
+    pix := -1
+  end;
+
+  function GetTribeInfo(FileName: string; var Name: string;
+    var Color: TColor): boolean;
+
+  var
+    found: integer;
+    TribeScript: TextFile;
+  begin
+    Name := '';
+    Color := $FFFFFF;
+    found := 0;
+    AssignFile(TribeScript, LocalizedFilePath('Tribes\' + FileName +
+      '.tribe.txt'));
+    Reset(TribeScript);
+    while not EOF(TribeScript) do
+    begin
+      ReadLn(TribeScript, Input);
+      if Copy(Input, 1, 7) = '#CHOOSE' then
+      begin
+        Name := Copy(Input, 9, 255);
+        found := found or 1;
+        if found = 3 then
+          break
+      end
+      else if Copy(Input, 1, 6) = '#COLOR' then
+      begin
+        Color := HexStringToColor(Copy(Input, 7, 255));
+        found := found or 2;
+        if found = 3 then
+          break
+      end
+    end;
+    CloseFile(TribeScript);
+    result := found = 3;
+  end;
+
+  constructor TTribe.Create(FileName: string);
+
+  var
+    line: integer;
+    variant: char;
+    Item: string;
+  begin
+    inherited Create;
+    for variant := 'a' to 'z' do
+      Name[variant] := '';
+    Script := tstringlist.Create;
+    Script.LoadFromFile(LocalizedFilePath('Tribes\' + FileName + '.tribe.txt'));
+    CityLine0 := 0;
+    nCityLines := 0;
+    for line := 0 to Script.Count - 1 do
+    begin
+      Input := Script[line];
+      if (CityLine0 > 0) and (nCityLines = 0) and
+        ((Input = '') or (Input[1] = '#')) then
+        nCityLines := line - CityLine0;
+      if (Length(Input) >= 3) and (Input[1] = '#') and (Input[2] in ['a' .. 'z']
+        ) and (Input[3] = ' ') then
+        Name[Input[2]] := Copy(Input, 4, 255)
+      else if Copy(Input, 1, 6) = '#COLOR' then
+        Color := HexStringToColor(Copy(Input, 7, 255))
+      else if Copy(Input, 1, 7) = '#CITIES' then
+        CityLine0 := line + 1
+      else if Copy(Input, 1, 8) = '#SYMBOLS' then
+      begin
+        Delete(Input, 1, 9);
+        Item := Get;
+        sympix := GetNum;
+        symHGr := LoadGraphicSet(Item);
+      end
+    end;
+    FillChar(ModelPicture, SizeOf(ModelPicture), 0);
+    NumberName := -1;
+    cAge := -1;
+    mixSlaves := -1;
+  end;
+
+  destructor TTribe.Destroy;
+  begin
+    Script.Free;
+    inherited Destroy;
+  end;
+
+  procedure FindPosition(HGr, x, y, xmax, ymax: integer; Mark: TColor;
+    var xp, yp: integer);
+  begin
+    xp := 0;
+    while (xp < xmax) and (GrExt[HGr].Data.Canvas.Pixels[x + 1 + xp, y]
+      <> Mark) do
+      inc(xp);
+    yp := 0;
+    while (yp < ymax) and (GrExt[HGr].Data.Canvas.Pixels[x, y + 1 + yp]
+      <> Mark) do
+      inc(yp);
+  end;
+
+  function TTribe.GetCityName(i: integer): string;
+  begin
+    result := '';
+    if nCityLines > i then
+    begin
+      result := Script[CityLine0 + i];
+      while (result <> '') and ((result[1] = ' ') or (result[1] = #9)) do
+        Delete(result, 1, 1);
+    end
+{$IFNDEF SCR} else
+      result := Format(TPhrase('GENCITY'), [i + 1]){$ENDIF}
+  end;
+
+{$IFNDEF SCR}
+  procedure TTribe.SetCityName(i: integer; NewName: string);
+  begin
+    while nCityLines <= i do
+    begin
+      Script.Insert(CityLine0 + nCityLines, Format(TPhrase('GENCITY'),
+        [nCityLines + 1]));
+      inc(nCityLines);
+    end;
+    Script[CityLine0 + i] := NewName;
+  end;
+
+  function TTribe.TString(Template: string): string;
+
+  var
+    p: integer;
+    variant: char;
+    CaseUp: boolean;
+  begin
+    repeat
+      p := pos('#', Template);
+      if (p = 0) or (p = Length(Template)) then
+        break;
+      variant := Template[p + 1];
+      CaseUp := variant in ['A' .. 'Z'];
+      if CaseUp then
+        inc(variant, 32);
+      Delete(Template, p, 2);
+      if variant in ['a' .. 'z'] then
+      begin
+        if NumberName < 0 then
+          Insert(Name[variant], Template, p)
+        else
+          Insert(Format('P%d', [NumberName]), Template, p);
+        if CaseUp and (Length(Template) >= p) and
+          (Template[p] in ['a' .. 'z', #$E0 .. #$FF]) then
+          dec(Template[p], 32);
+      end
+      until false;
+      result := Template;
+    end;
+
+    function TTribe.TPhrase(Item: string): string;
+    begin
+      result := TString(Phrases.Lookup(Item));
+    end;
+{$ENDIF}
+
+    procedure TTribe.InitAge(Age: integer);
+    type
+      TLine = array [0 .. 649, 0 .. 2] of Byte;
+    var
+      i, x, gray: integer;
+      Item: string;
+    begin
+      if Age = cAge then
+        exit;
+      cAge := Age;
+      with Script do
+      begin
+        i := 0;
+        while (i < Count) and
+          (Copy(Strings[i], 1, 6) <> '#AGE' + char(48 + Age) + ' ') do
+          inc(i);
+        if i < Count then
+        begin
+          Input := Strings[i];
+          system.Delete(Input, 1, 6);
+          Item := Get;
+          cpix := GetNum;
+          // init city graphics
+          if Age < 2 then
+          begin
+            if CompareText(Item, 'stdcities') = 0 then
+              case cpix of
+                3:
+                  cpix := 0;
+                6:
+                  begin
+                    cpix := 0;
+                    Item := 'Nation2';
+                  end
+              end;
+            cHGr := LoadGraphicSet(Item);
+            for x := 0 to 3 do
+              with CityPicture[x] do
+              begin
+                FindPosition(cHGr, x * 65, cpix * 49, 63, 47, $00FFFF,
+                  xShield, yShield);
+                // FindPosition(cHGr,x*65,cpix*49,$FFFFFF,xf,yf);
+              end
+          end
+          else
+            cHGr := -1;
+
+{$IFNDEF SCR}
+          Get;
+          GetNum;
+          Item := Get;
+          if Item = '' then
+            faceHGr := -1
+          else
+          begin
+            faceHGr := LoadGraphicSet(Item);
+            facepix := GetNum;
+            if GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
+              facepix div 10 * 49 + 48] = $00FFFF then
+            begin // generate shield picture
+              GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
+                facepix div 10 * 49 + 48] := $000000;
+              gray := $B8B8B8;
+              ImageOp_BCC(GrExt[faceHGr].Data, Templates,
+                facepix mod 10 * 65 + 1, facepix div 10 * 49 + 1, 1, 25, 64, 48,
+                gray, Color);
             end
-          else
-            begin
-            result:=100;
-            if MaxUpgrade>=12 then inc(result,6)
-            else if (MaxUpgrade>=10) or (Weight>7) then inc(result,5)
-            else if MaxUpgrade>=6 then inc(result,4)
-            else if MaxUpgrade>=4 then inc(result,3)
-            else if MaxUpgrade>=2 then inc(result,2)
-            else if MaxUpgrade>=1 then inc(result,1);
-            if Speed>=250 then
-              if (result>=105) and (Attack<=Defense) then result:=110
-              else inc(result,30)
-            end;
-        dSea:
-          begin
-          result:=200;
-          if MaxUpgrade>=8 then inc(result,3)
-          else if MaxUpgrade>=6 then inc(result,2)
-          else if MaxUpgrade>=3 then inc(result,1);
-          if Cap and (1 shl (mcSub-mcFirstNonCap))<>0 then result:=240
-          else if ATrans_Fuel>0 then result:=220
-          else if (result>=202) and (Attack=0) and (TTrans>0) then result:=210;
           end;
-        dAir:
-          begin
-          result:=300;
-          if (Bombs>0) or (TTrans>0) then inc(result,10);
-          if Speed>850 then inc(result,1)
-          end;
-        end;
-    mkSpecial_TownGuard: result:=41;
-    mkSpecial_Boat: result:=64;
-    mkSpecial_SubCabin: result:=71;
-    mkSpecial_Glider: result:=73;
-    mkSlaves: result:=74;
-    mkSettler: if Speed>150 then result:=11 else result:=10;
-    mkDiplomat: result:=21;
-    mkCaravan: result:=30;
-    end;
-  end;
-end;
-
-var
-Input: string;
-
-function Get: string;
-var
-p:integer;
-begin
-while (Input<>'') and ((Input[1]=' ') or (Input[1]=#9)) do Delete(Input,1,1);
-p:=pos(',',Input);if p=0 then p:=Length(Input)+1;
-result:=Copy(Input,1,p-1);
-Delete(Input,1,p)
-end;
-
-function GetNum: integer;
-var
-i:integer;
-begin
-val(Get,result,i);
-if i<>0 then result:=0
-end;
-
-procedure FindStdModelPicture(code: integer; var pix: integer;
-  var Name: string);
-var
-i: integer;
-begin
-for i:=0 to StdUnitScript.Count-1 do
-  begin // look through StdUnits
-  Input:=StdUnitScript[i];
-  pix:=GetNum;
-  if code=GetNum then begin Name:=Get; exit; end
-  end;
-pix:=-1
-end;
-
-function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): boolean;
-var
-found: integer;
-TribeScript: TextFile;
-begin
-Name:='';
-Color:=$FFFFFF;
-found:=0;
-AssignFile(TribeScript,LocalizedFilePath('Tribes\'+FileName+'.tribe.txt'));
-Reset(TribeScript);
-while not EOF(TribeScript) do
-  begin
-  ReadLn(TribeScript,Input);
-  if Copy(Input,1,7)='#CHOOSE' then
-    begin
-    Name:=Copy(Input,9,255);
-    found:=found or 1;
-    if found=3 then break
-    end
-  else if Copy(Input,1,6)='#COLOR' then
-    begin
-    Color:=HexStringToColor(Copy(Input,7,255));
-    found:=found or 2;
-    if found=3 then break
-    end
-  end;
-CloseFile(TribeScript);
-result:= found=3;
-end;
-
-constructor TTribe.Create(FileName: string);
-var
-line:integer;
-variant: char;
-Item:string;
-begin
-inherited Create;
-for variant:='a' to 'z' do Name[variant]:='';
-Script:=tstringlist.Create;
-Script.LoadFromFile(LocalizedFilePath('Tribes\'+FileName+'.tribe.txt'));
-CityLine0:=0;
-nCityLines:=0;
-for line:=0 to Script.Count-1 do
-  begin
-  Input:=Script[line];
-  if (CityLine0>0) and (nCityLines=0) and ((Input='') or (Input[1]='#')) then
-    nCityLines:=line-CityLine0;
-  if (Length(Input)>=3) and (Input[1]='#') and (Input[2] in ['a'..'z'])
-    and (Input[3]=' ') then
-    Name[Input[2]]:=Copy(Input,4,255)
-  else if Copy(Input,1,6)='#COLOR' then
-    Color:=HexStringToColor(Copy(Input,7,255))
-  else if Copy(Input,1,7)='#CITIES' then CityLine0:=line+1
-  else if Copy(Input,1,8)='#SYMBOLS' then
-    begin
-    Delete(Input,1,9);
-    Item:=Get;
-    sympix:=GetNum;
-    symHGr:=LoadGraphicSet(Item);
-    end
-  end;
-FillChar(ModelPicture,SizeOf(ModelPicture),0);
-NumberName:=-1;
-cAge:=-1;
-mixSlaves:=-1;
-end;
-
-destructor TTribe.Destroy;
-begin
-Script.Free;
-inherited Destroy;
-end;
-
-procedure FindPosition(HGr,x,y,xmax,ymax: integer; Mark: TColor;
-  var xp,yp: integer);
-begin
-xp:=0;
-while (xp<xmax) and (GrExt[HGr].Data.Canvas.Pixels[x+1+xp,y]<>Mark) do
-  inc(xp);
-yp:=0;
-while (yp<ymax) and (GrExt[HGr].Data.Canvas.Pixels[x,y+1+yp]<>Mark) do
-  inc(yp);
-end;
-
-function TTribe.GetCityName(i: integer): string;
-begin
-result:='';
-if nCityLines>i then
-  begin
-  result:=Script[CityLine0+i];
-  while (result<>'') and ((result[1]=' ') or (result[1]=#9)) do
-    Delete(result,1,1);
-  end
-{$IFNDEF SCR}else result:=Format(TPhrase('GENCITY'),[i+1]){$ENDIF}
-end;
-
-{$IFNDEF SCR}
-procedure TTribe.SetCityName(i: integer; NewName: string);
-begin
-while nCityLines<=i do
-  begin
-  Script.Insert(CityLine0+nCityLines, Format(TPhrase('GENCITY'),
-    [nCityLines+1]));
-  inc(nCityLines);
-  end;
-Script[CityLine0+i]:=NewName;
-end;
-
-function TTribe.TString(Template: string): string;
-var
-p: integer;
-variant: char;
-CaseUp: boolean;
-begin
-repeat
-  p:=pos('#',Template);
-  if (p=0) or (p=Length(Template)) then Break;
-  variant:=Template[p+1];
-  CaseUp:= variant in ['A'..'Z'];
-  if CaseUp then inc(variant,32);
-  Delete(Template,p,2);
-  if variant in ['a'..'z'] then
-    begin
-    if NumberName<0 then Insert(Name[variant],Template,p)
-    else Insert(Format('P%d',[NumberName]),Template,p);
-    if CaseUp and (Length(Template)>=p) and (Template[p] in ['a'..'z',#$E0..#$FF]) then
-      dec(Template[p],32);
-    end
-until false;
-result:=Template;
-end;
-
-function TTribe.TPhrase(Item: string): string;
-begin
-result:=TString(Phrases.Lookup(Item));
-end;
 {$ENDIF}
-
-procedure TTribe.InitAge(Age: integer);
-type
-TLine=array[0..649,0..2] of Byte;
-var
-i,x,gray: integer;
-Item: string;
-begin
-if Age=cAge then exit;
-cAge:=Age;
-with Script do
-  begin
-  i:=0;
-  while (i<Count) and (Copy(Strings[i],1,6)<>'#AGE'+char(48+Age)+' ') do
-    inc(i);
-  if i<Count then
-    begin
-    Input:=Strings[i];
-    system.Delete(Input,1,6);
-    Item:=Get;
-    cpix:=GetNum;
-    // init city graphics
-    if age<2 then
-      begin
-      if CompareText(Item,'stdcities')=0 then
-        case cpix of
-          3: cpix:=0;
-          6: begin cpix:=0; Item:='Nation2'; end
-          end;
-      cHGr:=LoadGraphicSet(Item);
-      for x:=0 to 3 do with CityPicture[x] do
-        begin
-        FindPosition(cHGr,x*65,cpix*49,63,47,$00FFFF,xShield,yShield);
-        //FindPosition(cHGr,x*65,cpix*49,$FFFFFF,xf,yf);
         end
       end
-    else cHGr:=-1;
-
-    {$IFNDEF SCR}
-    Get;
-    GetNum;
-    Item:=Get;
-    if Item='' then faceHGr:=-1
-    else
-      begin
-      faceHGr:=LoadGraphicSet(Item);
-      facepix:=GetNum;
-      if GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10*65,facepix div 10*49+48]=$00FFFF then
-        begin // generate shield picture
-        GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10*65,facepix div 10*49+48]:=$000000;
-        gray:=$B8B8B8;
-        ImageOp_BCC(GrExt[faceHGr].Data,Templates,facepix mod 10*65+1,
-          facepix div 10*49+1,1,25,64,48,gray,Color);
+    end;
+
+    procedure TTribe.SetModelPicture(const Info: TModelPictureInfo;
+      IsNew: boolean);
+    var
+      i: integer;
+      ok: boolean;
+    begin
+      with Info do
+      begin
+        if not IsNew then
+        begin
+          i := nPictureList - 1;
+          while (i >= 0) and (PictureList[i].Hash <> Info.Hash) do
+            dec(i);
+          assert(i >= 0);
+          assert(PictureList[i].HGr = LoadGraphicSet(GrName));
+          assert(PictureList[i].pix = pix);
+          ModelPicture[mix].HGr := PictureList[i].HGr;
+          ModelPicture[mix].pix := PictureList[i].pix;
+          ModelName[mix] := PictureList[i].ModelName;
+        end
+        else
+        begin
+          with ModelPicture[mix] do
+          begin
+            HGr := LoadGraphicSet(GrName);
+            pix := Info.pix;
+            inc(GrExt[HGr].pixUsed[pix]);
+          end;
+          ModelName[mix] := '';
+
+          // read model name from tribe script
+          ok := false;
+          for i := 0 to Script.Count - 1 do
+          begin
+            Input := Script[i];
+            if Input = '#UNITS ' + GrName then
+              ok := true
+            else if (Input <> '') and (Input[1] = '#') then
+              ok := false
+            else if ok and (GetNum = pix) then
+            begin
+              Get;
+              ModelName[mix] := Get
+            end
+          end;
+
+          if ModelName[mix] = '' then
+          begin // read model name from StdUnits.txt
+            for i := 0 to StdUnitScript.Count - 1 do
+            begin
+              Input := StdUnitScript[i];
+              if GetNum = pix then
+              begin
+                Get;
+                ModelName[mix] := Get
+              end
+            end
+          end;
+
+          if Hash <> 0 then
+          begin
+            if nPictureList = 0 then
+              ReallocMem(PictureList, 64 * SizeOf(TChosenModelPictureInfo))
+            else if (nPictureList >= 64) and
+              (nPictureList and (nPictureList - 1) = 0) then
+              ReallocMem(PictureList,
+                nPictureList * (2 * SizeOf(TChosenModelPictureInfo)));
+            PictureList[nPictureList].Hash := Info.Hash;
+            PictureList[nPictureList].HGr := ModelPicture[mix].HGr;
+            PictureList[nPictureList].pix := Info.pix;
+            PictureList[nPictureList].ModelName := ModelName[mix];
+            inc(nPictureList);
+          end
+        end;
+
+        with ModelPicture[mix] do
+          FindPosition(HGr, pix mod 10 * 65, pix div 10 * 49, 63, 47, $FFFFFF,
+            xShield, yShield);
+      end;
+    end;
+
+    function TTribe.ChooseModelPicture(var Picture: TModelPictureInfo;
+      code, Turn: integer; ForceNew: boolean): boolean;
+    var
+      i, Cnt, HGr, used, LeastUsed: integer;
+      TestPic: TModelPictureInfo;
+      ok: boolean;
+
+      procedure check;
+      begin
+        TestPic.pix := GetNum;
+        if code = GetNum then
+        begin
+          if ForceNew or (HGr < 0) then
+            used := 0
+          else
+          begin
+            used := 4 * GrExt[HGr].pixUsed[TestPic.pix];
+            if HGr = HGrStdUnits then
+              inc(used, 2); // prefer units not from StdUnits
+          end;
+          if used < LeastUsed then
+          begin
+            Cnt := 0;
+            LeastUsed := used
+          end;
+          if used = LeastUsed then
+          begin
+            inc(Cnt);
+            if Turn mod Cnt = 0 then
+              Picture := TestPic
+          end;
         end
       end;
-    {$ENDIF}  
-    end
-  end
-end;
-
-procedure TTribe.SetModelPicture(const Info: TModelPictureInfo; IsNew: boolean);
-var
-i: integer;
-ok: boolean;
-begin
-with Info do
-  begin
-  if not IsNew then
-    begin
-    i:=nPictureList-1;
-    while (i>=0) and (PictureList[i].Hash<>Info.Hash) do dec(i);
-    assert(i>=0);
-    assert(PictureList[i].HGr = LoadGraphicSet(GrName));
-    assert(PictureList[i].pix = pix);
-    ModelPicture[mix].HGr:=PictureList[i].HGr;
-    ModelPicture[mix].pix:=PictureList[i].pix;
-    ModelName[mix]:=PictureList[i].ModelName;
-    end
-  else
-    begin
-    with ModelPicture[mix] do
-      begin
-      HGr:=LoadGraphicSet(GrName);
-      pix:=Info.pix;
-      inc(GrExt[HGr].pixUsed[pix]);
+
+    begin
+      // look for identical model to assign same picture again
+      if not ForceNew and (Picture.Hash > 0) then
+      begin
+        for i := 0 to nPictureList - 1 do
+          if PictureList[i].Hash = Picture.Hash then
+          begin
+            Picture.GrName := GrExt[PictureList[i].HGr].Name;
+            Picture.pix := PictureList[i].pix;
+            result := false;
+            exit;
+          end
       end;
-    ModelName[mix]:='';
-
-    // read model name from tribe script
-    ok:=false;
-    for i:=0 to Script.Count-1 do
-      begin
-      Input:=Script[i];
-      if Input='#UNITS '+GrName then ok:=true
-      else if (Input<>'') and (Input[1]='#') then ok:=false
-      else if ok and (GetNum=pix) then
-        begin Get; ModelName[mix]:=Get end
+
+      Picture.pix := 0;
+      TestPic := Picture;
+      LeastUsed := MaxInt;
+
+      TestPic.GrName := 'StdUnits';
+      HGr := HGrStdUnits;
+      for i := 0 to StdUnitScript.Count - 1 do
+      begin // look through StdUnits
+        Input := StdUnitScript[i];
+        check;
       end;
 
-    if ModelName[mix]='' then
-      begin // read model name from StdUnits.txt
-      for i:=0 to StdUnitScript.Count-1 do
+      ok := false;
+      for i := 0 to Script.Count - 1 do
+      begin // look through units defined in tribe script
+        Input := Script[i];
+        if Copy(Input, 1, 6) = '#UNITS' then
         begin
-        Input:=StdUnitScript[i];
-        if GetNum=pix then
-          begin Get; ModelName[mix]:=Get end
+          ok := true;
+          TestPic.GrName := Copy(Input, 8, 255);
+          HGr := nGrExt - 1;
+          while (HGr >= 0) and (GrExt[HGr].Name <> TestPic.GrName) do
+            dec(HGr);
         end
+        else if (Input <> '') and (Input[1] = '#') then
+          ok := false
+        else if ok then
+          check;
       end;
-
-    if Hash<>0 then
-      begin
-      if nPictureList=0 then
-        ReallocMem(PictureList, 64*sizeof(TChosenModelPictureInfo))
-      else if (nPictureList>=64) and (nPictureList and (nPictureList-1)=0) then
-        ReallocMem(PictureList, nPictureList*(2*sizeof(TChosenModelPictureInfo)));
-      PictureList[nPictureList].Hash:=Info.Hash;
-      PictureList[nPictureList].HGr:=ModelPicture[mix].HGr;
-      PictureList[nPictureList].pix:=Info.pix;
-      PictureList[nPictureList].ModelName:=ModelName[mix];
-      inc(nPictureList);
-      end
-    end;
-
-  with ModelPicture[mix] do
-    FindPosition(HGr,pix mod 10 *65,pix div 10 *49,63,47,$FFFFFF,xShield,yShield);
-  end;
-end;
-
-function TTribe.ChooseModelPicture(var Picture: TModelPictureInfo;
-  code,Turn: integer; ForceNew: boolean): boolean;
-var
-i,Cnt,HGr,used,LeastUsed: integer;
-TestPic: TModelPictureInfo;
-ok: boolean;
-
-  procedure check;
-  begin
-  TestPic.pix:=GetNum;
-  if code=GetNum then
-    begin
-    if ForceNew or (HGr<0) then used:=0
-    else
-      begin
-      used:=4*GrExt[HGr].pixUsed[TestPic.pix];
-      if HGr=HGrStdUnits then inc(used,2); // prefer units not from StdUnits
-      end;
-    if used<LeastUsed then begin Cnt:=0; LeastUsed:=used end;
-    if used=LeastUsed then
-      begin
-      inc(Cnt);
-      if Turn mod Cnt=0 then Picture:=TestPic
-      end;
-    end
-  end;
-
-begin
-// look for identical model to assign same picture again
-if not ForceNew and (Picture.Hash>0) then
-  begin
-  for i:=0 to nPictureList-1 do
-    if PictureList[i].Hash=Picture.Hash then
-      begin
-      Picture.GrName:=GrExt[PictureList[i].HGr].Name;
-      Picture.pix:=PictureList[i].pix;
-      result:=false;
-      exit;
-      end
-  end;
-
-Picture.pix:=0;
-TestPic:=Picture;
-LeastUsed:=MaxInt;
-
-TestPic.GrName:='StdUnits';
-HGr:=HGrStdUnits;
-for i:=0 to StdUnitScript.Count-1 do
-  begin // look through StdUnits
-  Input:=StdUnitScript[i];
-  check;
-  end;
-
-ok:=false;
-for i:=0 to Script.Count-1 do
-  begin // look through units defined in tribe script
-  Input:=Script[i];
-  if Copy(Input,1,6)='#UNITS' then
-    begin
-    ok:=true;
-    TestPic.GrName:=Copy(Input,8,255);
-    HGr:=nGrExt-1;
-    while (HGr>=0) and (GrExt[HGr].Name<>TestPic.GrName) do dec(HGr);
-    end
-  else if (Input<>'') and (Input[1]='#') then ok:=false
-  else if ok then check;
-  end;
-result:=true;
-end;
+      result := true;
+    end;
 
 end.
-

trunk/LocalPlayer/UnitStat.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit UnitStat;
 
@@ -6 +5 @@
 
 uses
-  Protocol,ClientTools,Term,ScreenTools,BaseWin,
-
-  Windows,Messages,SysUtils,Classes,Graphics,Controls,Forms,ButtonA,ButtonB,
+  Protocol, ClientTools, Term, ScreenTools, BaseWin,
+
+  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
+  ButtonB,
   ButtonBase, ButtonC;
 
@@ -38 +38 @@
   protected
     mixShow, // for dkOwnModel
-    uixShow,euixShow,ecixShow,
-    UnitLoc,AgePrepared: integer; // for dkEnemyUnit, euixShow=-1 ->
+    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: integer;
+    // for dkEnemyUnit, euixShow=-1 ->
     mox: ^TModelInfo; // for dkEnemyModel
-    Kind:(dkOwnModel,dkOwnUnit,dkEnemyModel,dkEnemyUnit,dkEnemyCityDefense,dkEnemyCity);
+    Kind: (dkOwnModel, dkOwnUnit, dkEnemyModel, dkEnemyUnit, dkEnemyCityDefense,
+      dkEnemyCity);
     Back, Template: TBitmap;
     procedure OffscreenPaint; override;
@@ -56 +57 @@
 
 const
-xView=71;
-xTotal=20; StatDown=112;
-yImp=133;
-
-// window size
-wCommon=208; hOwnModel=293; hEnemyModel=236; hEnemyUnit=212;
-hEnemyCityDefense=320; hEnemyCity=166; hMax=320;
-
+  xView = 71;
+  xTotal = 20;
+  StatDown = 112;
+  yImp = 133;
+
+  // window size
+  wCommon = 208;
+  hOwnModel = 293;
+  hEnemyModel = 236;
+  hEnemyUnit = 212;
+  hEnemyCityDefense = 320;
+  hEnemyCity = 166;
+  hMax = 320;
 
 procedure TUnitStatDlg.FormCreate(Sender: TObject);
 begin
-inherited;
-AgePrepared:=-2;
-TitleHeight:=Screen.Height;
-InitButtons();
-
-Back:=TBitmap.Create;
-Back.PixelFormat:=pf24bit;
-Back.Width:=5*wCommon; Back.Height:=hMax;
-Template:=TBitmap.Create;
-LoadGraphicFile(Template, HomeDir+'Graphics\Unit', gfNoGamma);
-Template.PixelFormat:=pf8bit;
+  inherited;
+  AgePrepared := -2;
+  TitleHeight := Screen.Height;
+  InitButtons();
+
+  Back := TBitmap.Create;
+  Back.PixelFormat := pf24bit;
+  Back.Width := 5 * wCommon;
+  Back.Height := hMax;
+  Template := TBitmap.Create;
+  LoadGraphicFile(Template, HomeDir + 'Graphics\Unit', gfNoGamma);
+  Template.PixelFormat := pf8bit;
 end;
 
 procedure TUnitStatDlg.FormDestroy(Sender: TObject);
 begin
-Template.Free;
-Back.Free;
+  Template.Free;
+  Back.Free;
 end;
 
 procedure TUnitStatDlg.CheckAge;
 begin
-if MainTextureAge<>AgePrepared then
-  begin
-  AgePrepared:=MainTextureAge;
-  bitblt(Back.Canvas.Handle,0,0,wCommon,hOwnModel,
-    MainTexture.Image.Canvas.Handle,(wMainTexture-wCommon) div 2,
-    (hMainTexture-hOwnModel) div 2,SRCCOPY);
-  bitblt(Back.Canvas.Handle,wCommon,0,wCommon,hEnemyModel,
-    MainTexture.Image.Canvas.Handle,(wMainTexture-wCommon) div 2,
-    (hMainTexture-hEnemyModel) div 2,SRCCOPY);
-  bitblt(Back.Canvas.Handle,2*wCommon,0,wCommon,hEnemyUnit,
-    MainTexture.Image.Canvas.Handle,(wMainTexture-wCommon) div 2,
-    (hMainTexture-hEnemyUnit) div 2,SRCCOPY);
-  bitblt(Back.Canvas.Handle,3*wCommon,0,wCommon,hEnemyCityDefense,
-    MainTexture.Image.Canvas.Handle,(wMainTexture-wCommon) div 2,
-    (hMainTexture-hEnemyCityDefense) div 2,SRCCOPY);
-  bitblt(Back.Canvas.Handle,4*wCommon,0,wCommon,hEnemyCity,
-    MainTexture.Image.Canvas.Handle,(wMainTexture-wCommon) div 2,
-    (hMainTexture-hEnemyCity) div 2,SRCCOPY);
-  ImageOp_B(Back,Template,0,0,0,0,5*wCommon,hMax);
+  if MainTextureAge <> AgePrepared then
+  begin
+    AgePrepared := MainTextureAge;
+    bitblt(Back.Canvas.Handle, 0, 0, wCommon, hOwnModel,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hOwnModel) div 2, SRCCOPY);
+    bitblt(Back.Canvas.Handle, wCommon, 0, wCommon, hEnemyModel,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyModel) div 2, SRCCOPY);
+    bitblt(Back.Canvas.Handle, 2 * wCommon, 0, wCommon, hEnemyUnit,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyUnit) div 2, SRCCOPY);
+    bitblt(Back.Canvas.Handle, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyCityDefense) div 2, SRCCOPY);
+    bitblt(Back.Canvas.Handle, 4 * wCommon, 0, wCommon, hEnemyCity,
+      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyCity) div 2, SRCCOPY);
+    ImageOp_B(Back, Template, 0, 0, 0, 0, 5 * wCommon, hMax);
   end
 end;
@@ -112 +119 @@
 procedure TUnitStatDlg.FormShow(Sender: TObject);
 var
-owner, mix: integer;
-IsSpecialUnit: boolean;
-begin
-if Kind in [dkEnemyUnit,dkEnemyCityDefense,dkEnemyCity] then
-  begin
-  if MyMap[UnitLoc] and fUnit<>0 then
+  owner, mix: integer;
+  IsSpecialUnit: boolean;
+begin
+  if Kind in [dkEnemyUnit, dkEnemyCityDefense, dkEnemyCity] then
+  begin
+    if MyMap[UnitLoc] and fUnit <> 0 then
     begin // find model
-    if euixShow<0 then
-      begin
-      euixShow:=MyRO.nEnemyUn-1;
-      while (euixShow>=0) and (MyRO.EnemyUn[euixShow].Loc<>UnitLoc) do dec(euixShow);
-      assert(euixShow>=0);
-      end;
-    with MyRO.EnemyUn[euixShow] do
-      begin
-      mox:=@MyRO.EnemyModel[emix];
-      if Tribe[Owner].ModelPicture[mix].HGr=0 then
-        InitEnemyModel(emix);
+      if euixShow < 0 then
+      begin
+        euixShow := MyRO.nEnemyUn - 1;
+        while (euixShow >= 0) and (MyRO.EnemyUn[euixShow].Loc <> UnitLoc) do
+          dec(euixShow);
+        assert(euixShow >= 0);
+      end;
+      with MyRO.EnemyUn[euixShow] do
+      begin
+        mox := @MyRO.EnemyModel[emix];
+        if Tribe[owner].ModelPicture[mix].HGr = 0 then
+          InitEnemyModel(emix);
       end
     end
-  else mox:=nil;
-  if Kind in [dkEnemyCityDefense,dkEnemyCity] then
+    else
+      mox := nil;
+    if Kind in [dkEnemyCityDefense, dkEnemyCity] then
     begin
-    ecixShow:=MyRO.nEnemyCity-1;
-    while (ecixShow>=0) and (MyRO.EnemyCity[ecixShow].Loc<>UnitLoc) do dec(ecixShow);
-    assert(ecixShow>=0);
+      ecixShow := MyRO.nEnemyCity - 1;
+      while (ecixShow >= 0) and (MyRO.EnemyCity[ecixShow].Loc <> UnitLoc) do
+        dec(ecixShow);
+      assert(ecixShow >= 0);
     end
   end;
-case Kind of
-  dkOwnModel: ClientHeight:=hOwnModel;
-  dkOwnUnit: ClientHeight:=hEnemyUnit;
-  dkEnemyModel: ClientHeight:=hEnemyModel;
-  dkEnemyUnit: ClientHeight:=hEnemyUnit;
-  dkEnemyCityDefense: ClientHeight:=hEnemyCityDefense;
-  dkEnemyCity: ClientHeight:=hEnemyCity;
-  end;
-
-if Kind in [dkOwnModel,dkEnemyModel] then
-  begin
-  Left:=UserLeft;
-  Top:=UserTop;
-  end
-else
-  begin
-  Left:=(Screen.Width-Width) div 2;
-  Top:=(Screen.Height-Height) div 2;
-  end;
-
-SwitchBtn.Visible:= not supervising and (Kind=dkOwnModel);
-ConscriptsBtn.Visible:= not supervising and (Kind=dkOwnModel)
-  and (MyRO.Tech[adConscription]>=tsApplicable)
-  and (MyModel[mixShow].Domain=dGround) and (MyModel[mixShow].Kind<mkScout);
-IsSpecialUnit:=false;
-if Kind in [dkEnemyCity,dkEnemyCityDefense] then
-   Caption:=CityName(MyRO.EnemyCity[ecixShow].ID)
-else
-  begin
   case Kind of
     dkOwnModel:
-      begin
-      owner:=me;
-      mix:=mixShow;
-      IsSpecialUnit:= MyModel[mix].Kind>=$10;
-      end;
+      ClientHeight := hOwnModel;
     dkOwnUnit:
-      begin
-      owner:=me;
-      mix:=MyUn[uixShow].mix;
-      IsSpecialUnit:= MyModel[mix].Kind>=$10;
-      end
+      ClientHeight := hEnemyUnit;
+    dkEnemyModel:
+      ClientHeight := hEnemyModel;
+    dkEnemyUnit:
+      ClientHeight := hEnemyUnit;
+    dkEnemyCityDefense:
+      ClientHeight := hEnemyCityDefense;
+    dkEnemyCity:
+      ClientHeight := hEnemyCity;
+  end;
+
+  if Kind in [dkOwnModel, dkEnemyModel] then
+  begin
+    Left := UserLeft;
+    Top := UserTop;
+  end
+  else
+  begin
+    Left := (Screen.Width - Width) div 2;
+    Top := (Screen.Height - Height) div 2;
+  end;
+
+  SwitchBtn.Visible := not supervising and (Kind = dkOwnModel);
+  ConscriptsBtn.Visible := not supervising and (Kind = dkOwnModel) and
+    (MyRO.Tech[adConscription] >= tsApplicable) and
+    (MyModel[mixShow].Domain = dGround) and (MyModel[mixShow].Kind < mkScout);
+  IsSpecialUnit := false;
+  if Kind in [dkEnemyCity, dkEnemyCityDefense] then
+    Caption := CityName(MyRO.EnemyCity[ecixShow].ID)
+  else
+  begin
+    case Kind of
+      dkOwnModel:
+        begin
+          owner := me;
+          mix := mixShow;
+          IsSpecialUnit := MyModel[mix].Kind >= $10;
+        end;
+      dkOwnUnit:
+        begin
+          owner := me;
+          mix := MyUn[uixShow].mix;
+          IsSpecialUnit := MyModel[mix].Kind >= $10;
+        end
     else
       begin
-      owner:=mox.owner;
-      mix:=mox.mix;
-      IsSpecialUnit:= mox.Kind>=$10;
+        owner := mox.owner;
+        mix := mox.mix;
+        IsSpecialUnit := mox.Kind >= $10;
       end;
     end;
-  if MainScreen.mNames.Checked then
-    Caption:=Tribe[Owner].ModelName[mix]
-  else Caption:=Format(Tribe[Owner].TPhrase('GENMODEL'),[mix])
-  end;
-if IsSpecialUnit then
-  HelpBtn.Hint:=Phrases.Lookup('CONTROLS',6);
-HelpBtn.Visible:=IsSpecialUnit;
-OffscreenPaint;
+    if MainScreen.mNames.Checked then
+      Caption := Tribe[owner].ModelName[mix]
+    else
+      Caption := Format(Tribe[owner].TPhrase('GENMODEL'), [mix])
+  end;
+  if IsSpecialUnit then
+    HelpBtn.Hint := Phrases.Lookup('CONTROLS', 6);
+  HelpBtn.Visible := IsSpecialUnit;
+  OffscreenPaint;
 end;
 
 procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode, mix: integer);
 begin
-Kind:=dkOwnModel;
-mixShow:=mix;
-inherited ShowNewContent(NewMode);
+  Kind := dkOwnModel;
+  mixShow := mix;
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode, uix: integer);
 begin
-Kind:=dkOwnUnit;
-uixShow:=uix;
-inherited ShowNewContent(NewMode);
+  Kind := dkOwnUnit;
+  uixShow := uix;
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode, euix: integer);
 begin
-Kind:=dkEnemyUnit;
-euixShow:=euix;
-UnitLoc:=MyRO.EnemyUn[euix].Loc;
-inherited ShowNewContent(NewMode);
+  Kind := dkEnemyUnit;
+  euixShow := euix;
+  UnitLoc := MyRO.EnemyUn[euix].Loc;
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode, Loc: integer);
 begin
-Kind:=dkEnemyUnit;
-UnitLoc:=Loc;
-euixShow:=-1;
-inherited ShowNewContent(NewMode);
+  Kind := dkEnemyUnit;
+  UnitLoc := Loc;
+  euixShow := -1;
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode, emix: integer);
 begin
-Kind:=dkEnemyModel;
-mox:=@MyRO.EnemyModel[emix];
-inherited ShowNewContent(NewMode);
+  Kind := dkEnemyModel;
+  mox := @MyRO.EnemyModel[emix];
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode, Loc: integer);
 begin
-if MyMap[Loc] and fUnit<>0 then
-  Kind:=dkEnemyCityDefense
-else Kind:=dkEnemyCity;
-UnitLoc:=Loc;
-euixShow:=-1;
-inherited ShowNewContent(NewMode);
-end;
-
-procedure TUnitStatDlg.FormClose(Sender: TObject;
-  var Action: TCloseAction);
-begin
-if Kind in [dkOwnModel,dkEnemyModel] then
-  begin UserLeft:=Left; UserTop:=Top end;
-if OffscreenUser=self then OffscreenUser:=nil;
+  if MyMap[Loc] and fUnit <> 0 then
+    Kind := dkEnemyCityDefense
+  else
+    Kind := dkEnemyCity;
+  UnitLoc := Loc;
+  euixShow := -1;
+  inherited ShowNewContent(NewMode);
+end;
+
+procedure TUnitStatDlg.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  if Kind in [dkOwnModel, dkEnemyModel] then
+  begin
+    UserLeft := Left;
+    UserTop := Top
+  end;
+  if OffscreenUser = self then
+    OffscreenUser := nil;
 end;
 
 procedure TUnitStatDlg.CloseBtnClick(Sender: TObject);
 begin
-Close
+  Close
 end;
 
 procedure TUnitStatDlg.OffscreenPaint;
 var
-PPicture: ^TModelPicture;
+  PPicture: ^TModelPicture;
 
   function IsToCount(emix: integer): boolean;
   var
-  PTestPicture: ^TModelPicture;
-  begin
-  if MainScreen.mNames.Checked then
+    PTestPicture: ^TModelPicture;
+  begin
+    if MainScreen.mNames.Checked then
     begin
-    PTestPicture:=@Tribe[MyRO.EnemyModel[emix].Owner].ModelPicture[MyRO.EnemyModel[emix].mix];
-    result:= (PPicture.HGr=PTestPicture.HGr) and (PPicture.pix=PTestPicture.pix)
-      and (ModelHash(mox^)=ModelHash(MyRO.EnemyModel[emix]))
+      PTestPicture := @Tribe[MyRO.EnemyModel[emix].owner].ModelPicture
+        [MyRO.EnemyModel[emix].mix];
+      result := (PPicture.HGr = PTestPicture.HGr) and
+        (PPicture.pix = PTestPicture.pix) and
+        (ModelHash(mox^) = ModelHash(MyRO.EnemyModel[emix]))
     end
-  else result:= (MyRO.EnemyModel[emix].Owner=mox.Owner)
-    and (MyRO.EnemyModel[emix].mix=mox.mix)
-  end;
-
-  procedure FeatureBar(dst: TBitmap; x,y: integer; const mi: TModelInfo;
+    else
+      result := (MyRO.EnemyModel[emix].owner = mox.owner) and
+        (MyRO.EnemyModel[emix].mix = mox.mix)
+  end;
+
+  procedure FeatureBar(dst: TBitmap; x, y: integer; const mi: TModelInfo;
     const T: TTexture);
   var
-  i,w,dx,num: integer;
-  s: string;
-  begin
-  DarkGradient(dst.Canvas,x-6,y+1,180,1);
-  with dst.Canvas do
-    if mi.Kind>=$10 then
-      begin
-      s:=Phrases.Lookup('UNITSPECIAL');
-      Font.Color:=$000000;
-      Textout(x-1,y+1,s);
-      Font.Color:=$B0B0B0;
-      Textout(x-2,y,s);
+    i, w, dx, num: integer;
+    s: string;
+  begin
+    DarkGradient(dst.Canvas, x - 6, y + 1, 180, 1);
+    with dst.Canvas do
+      if mi.Kind >= $10 then
+      begin
+        s := Phrases.Lookup('UNITSPECIAL');
+        Font.Color := $000000;
+        Textout(x - 1, y + 1, s);
+        Font.Color := $B0B0B0;
+        Textout(x - 2, y, s);
       end
-    else
-      begin
-      Font.Color:=$000000;
-      dx:=2;
-      for i:=3 to nFeature-1 do
-        begin
-        num:=0;
-        case i of
-          mcSeaTrans: if mi.Domain=dSea then num:=mi.TTrans;
-          mcCarrier: if mi.Domain=dSea then num:=mi.ATrans_Fuel;
-          mcBombs: num:=mi.Bombs;
-          mcFuel: if mi.Domain=dAir then num:=mi.ATrans_Fuel;
-          mcAirTrans: if mi.Domain=dAir then num:=mi.TTrans;
-          mcFirstNonCap..nFeature-1:
-            if mi.Cap and (1 shl (i-mcFirstNonCap))<>0 then num:=1
+      else
+      begin
+        Font.Color := $000000;
+        dx := 2;
+        for i := 3 to nFeature - 1 do
+        begin
+          num := 0;
+          case i of
+            mcSeaTrans:
+              if mi.Domain = dSea then
+                num := mi.TTrans;
+            mcCarrier:
+              if mi.Domain = dSea then
+                num := mi.ATrans_Fuel;
+            mcBombs:
+              num := mi.Bombs;
+            mcFuel:
+              if mi.Domain = dAir then
+                num := mi.ATrans_Fuel;
+            mcAirTrans:
+              if mi.Domain = dAir then
+                num := mi.TTrans;
+            mcFirstNonCap .. nFeature - 1:
+              if mi.Cap and (1 shl (i - mcFirstNonCap)) <> 0 then
+                num := 1
           end;
-        if (num>0) and ((i<>mcSE) or (mi.Cap and (1 shl (mcNP-mcFirstNonCap))=0)) then
+          if (num > 0) and
+            ((i <> mcSE) or (mi.Cap and (1 shl (mcNP - mcFirstNonCap)) = 0))
+          then
           begin
-          if num>1 then
+            if num > 1 then
             begin
-            s:=IntToStr(num);
-            w:=TextWidth(s);
-            Brush.Color:=$FFFFFF;
-            FillRect(Rect(x-3+dx,y+2,x+w-1+dx,y+16));
-            Brush.Style:=bsClear;
-            Textout(x-3+dx+1,y,s);
-            inc(dx,w+1)
+              s := IntToStr(num);
+              w := TextWidth(s);
+              Brush.Color := $FFFFFF;
+              FillRect(Rect(x - 3 + dx, y + 2, x + w - 1 + dx, y + 16));
+              Brush.Style := bsClear;
+              Textout(x - 3 + dx + 1, y, s);
+              inc(dx, w + 1)
             end;
-          Brush.Color:=$C0C0C0;
-          FrameRect(Rect(x-3+dx,y+2,x+11+dx,y+16));
-          Brush.Style:=bsClear;
-          Sprite(dst,HGrSystem,x-1+dx,y+4,10,10,66+i mod 11 *11,137+i div 11 *11);
-          inc(dx,15)
+            Brush.Color := $C0C0C0;
+            FrameRect(Rect(x - 3 + dx, y + 2, x + 11 + dx, y + 16));
+            Brush.Style := bsClear;
+            Sprite(dst, HGrSystem, x - 1 + dx, y + 4, 10, 10,
+              66 + i mod 11 * 11, 137 + i div 11 * 11);
+            inc(dx, 15)
           end;
         end
       end
-  end;{featurebar}
-
-  procedure NumberBarS(dst:TBitmap; x,y:integer;
-    Cap,s: string; const T: TTexture);
-  begin
-  DLine(dst.Canvas,x-2,x+170,y+16,T.clBevelShade,T.clBevelLight);
-  LoweredTextOut(dst.Canvas,-1,T,x-2,y,Cap);
-  RisedTextout(dst.canvas,x+170-BiColorTextWidth(dst.Canvas,s),y,s);
+  end; { featurebar }
+
+  procedure NumberBarS(dst: TBitmap; x, y: integer; Cap, s: string;
+    const T: TTexture);
+  begin
+    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.clBevelShade, T.clBevelLight);
+    LoweredTextOut(dst.Canvas, -1, T, x - 2, y, Cap);
+    RisedTextout(dst.Canvas, x + 170 - BiColorTextWidth(dst.Canvas, s), y, s);
   end;
 
 var
-i,j,x,y,cix,uix,emix,InProd,Available,Destroyed,Loc,Cnt,yView,yTotal,
-  yCaption: integer;
-s: string;
-ui: TUnitInfo;
-mi: TModelInfo;
-begin
-inherited;
-
-case Kind of
-  dkOwnModel:
-    begin
-    bitblt(offscreen.canvas.handle,0,0,wCommon,hOwnModel,Back.Canvas.handle,0,0,SRCCOPY);
-    yView:=13;
-    yTotal:=92;
-    end;
-  dkEnemyModel:
-    begin
-    bitblt(offscreen.canvas.handle,0,0,wCommon,hEnemyModel,Back.Canvas.handle,wCommon,0,SRCCOPY);
-    yView:=13;
-    yTotal:=92;
-    end;
-  dkEnemyUnit,dkOwnUnit:
-    begin
-    bitblt(offscreen.canvas.handle,0,0,wCommon,hEnemyUnit,Back.Canvas.handle,2*wCommon,0,SRCCOPY);
-    yView:=13;
-    yTotal:=123;
-    end;
-  dkEnemyCityDefense:
-    begin
-    bitblt(offscreen.canvas.handle,0,0,wCommon,hEnemyCityDefense,Back.Canvas.handle,3*wCommon,0,SRCCOPY);
-    yView:=171;
-    yTotal:=231;
-    end;
-  dkEnemyCity:
-    begin
-    bitblt(offscreen.canvas.handle,0,0,wCommon,hEnemyCity,Back.Canvas.handle,4*wCommon,0,SRCCOPY);
-    end;
-  end;
-MarkUsedOffscreen(ClientWidth,ClientHeight);
-HelpBtn.Top:=yTotal+22;
-
-if Kind in [dkEnemyCityDefense,dkEnemyCity] then
+  i, j, x, y, cix, uix, emix, InProd, Available, Destroyed, Loc, Cnt, yView,
+    yTotal, yCaption: integer;
+  s: string;
+  ui: TUnitInfo;
+  mi: TModelInfo;
+begin
+  inherited;
+
+  case Kind of
+    dkOwnModel:
+      begin
+        bitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hOwnModel,
+          Back.Canvas.Handle, 0, 0, SRCCOPY);
+        yView := 13;
+        yTotal := 92;
+      end;
+    dkEnemyModel:
+      begin
+        bitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyModel,
+          Back.Canvas.Handle, wCommon, 0, SRCCOPY);
+        yView := 13;
+        yTotal := 92;
+      end;
+    dkEnemyUnit, dkOwnUnit:
+      begin
+        bitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyUnit,
+          Back.Canvas.Handle, 2 * wCommon, 0, SRCCOPY);
+        yView := 13;
+        yTotal := 123;
+      end;
+    dkEnemyCityDefense:
+      begin
+        bitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyCityDefense,
+          Back.Canvas.Handle, 3 * wCommon, 0, SRCCOPY);
+        yView := 171;
+        yTotal := 231;
+      end;
+    dkEnemyCity:
+      begin
+        bitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyCity,
+          Back.Canvas.Handle, 4 * wCommon, 0, SRCCOPY);
+      end;
+  end;
+  MarkUsedOffscreen(ClientWidth, ClientHeight);
+  HelpBtn.Top := yTotal + 22;
+
+  if Kind in [dkEnemyCityDefense, dkEnemyCity] then
   begin // show city defense facilities
-  cnt:=0;
-  for i:=0 to 3 do
-    if MyRO.EnemyCity[ecixShow].Flags and (2 shl i)<>0 then
-      inc(cnt);
-  x:=(wCommon-cnt*xSizeSmall) div 2 -(cnt-1)*2;
-  for i:=0 to 3 do
-    if MyRO.EnemyCity[ecixShow].Flags and (2 shl i)<>0 then
-      begin
-      case i of
-        0: j:=imWalls;
-        1: j:=imCoastalFort;
-        2: j:=imMissileBat;
-        3: j:=imBunker
+    Cnt := 0;
+    for i := 0 to 3 do
+      if MyRO.EnemyCity[ecixShow].Flags and (2 shl i) <> 0 then
+        inc(Cnt);
+    x := (wCommon - Cnt * xSizeSmall) div 2 - (Cnt - 1) * 2;
+    for i := 0 to 3 do
+      if MyRO.EnemyCity[ecixShow].Flags and (2 shl i) <> 0 then
+      begin
+        case i of
+          0:
+            j := imWalls;
+          1:
+            j := imCoastalFort;
+          2:
+            j := imMissileBat;
+          3:
+            j := imBunker
         end;
-      Frame(offscreen.Canvas,x-1,yImp-1,x+xSizeSmall,yImp+ySizeSmall,
-        MainTexture.clBevelLight,MainTexture.clBevelShade);
-      BitBlt(offscreen.Canvas.Handle,x,yImp,xSizeSmall,ySizeSmall,
-        SmallImp.Canvas.Handle,j mod 7*xSizeSmall,
-        (j+SystemIconLines*7) div 7*ySizeSmall,SRCCOPY);
-      inc(x,xSizeSmall+4)
-      end;
-  end;
-
-if Kind=dkEnemyModel then
-  begin
-  PPicture:=@Tribe[mox.Owner].ModelPicture[mox.mix];
-  Available:=0;
-  if G.Difficulty[me]=0 then // supervisor -- count stacked units too
-    for Loc:=0 to G.lx*G.ly-1 do
-      begin
-      if MyMap[Loc] and fUnit<>0 then
-        begin
-        Server(sGetUnits,me,Loc,Cnt);
-        for uix:=0 to Cnt-1 do
-          if IsToCount(MyRO.EnemyUn[MyRO.nEnemyUn+uix].emix) then
-            inc(Available);
+        Frame(offscreen.Canvas, x - 1, yImp - 1, x + xSizeSmall,
+          yImp + ySizeSmall, MainTexture.clBevelLight,
+          MainTexture.clBevelShade);
+        bitblt(offscreen.Canvas.Handle, x, yImp, xSizeSmall, ySizeSmall,
+          SmallImp.Canvas.Handle, j mod 7 * xSizeSmall,
+          (j + SystemIconLines * 7) div 7 * ySizeSmall, SRCCOPY);
+        inc(x, xSizeSmall + 4)
+      end;
+  end;
+
+  if Kind = dkEnemyModel then
+  begin
+    PPicture := @Tribe[mox.owner].ModelPicture[mox.mix];
+    Available := 0;
+    if G.Difficulty[me] = 0 then // supervisor -- count stacked units too
+      for Loc := 0 to G.lx * G.ly - 1 do
+      begin
+        if MyMap[Loc] and fUnit <> 0 then
+        begin
+          Server(sGetUnits, me, Loc, Cnt);
+          for uix := 0 to Cnt - 1 do
+            if IsToCount(MyRO.EnemyUn[MyRO.nEnemyUn + uix].emix) then
+              inc(Available);
         end
       end
-  else // no supervisor -- can only count stack top units
-    for uix:=0 to MyRO.nEnemyUn-1 do
-      if (MyRO.EnemyUn[uix].Loc>=0) and IsToCount(MyRO.EnemyUn[uix].emix) then
+    else // no supervisor -- can only count stack top units
+      for uix := 0 to MyRO.nEnemyUn - 1 do
+        if (MyRO.EnemyUn[uix].Loc >= 0) and IsToCount(MyRO.EnemyUn[uix].emix)
+        then
+          inc(Available);
+    Destroyed := 0;
+    for emix := 0 to MyRO.nEnemyModel - 1 do
+      if IsToCount(emix) then
+        inc(Destroyed, MyRO.EnemyModel[emix].Lost);
+  end
+  else
+  begin
+    Available := 0;
+    for uix := 0 to MyRO.nUn - 1 do
+      if (MyUn[uix].Loc >= 0) and (MyUn[uix].mix = mixShow) then
         inc(Available);
-  Destroyed:=0;
-  for emix:=0 to MyRO.nEnemyModel-1 do if IsToCount(emix) then
-    inc(Destroyed,MyRO.EnemyModel[emix].Lost);
-  end
-else
-  begin
-  Available:=0;
-  for uix:=0 to MyRO.nUn-1 do
-    if (MyUn[uix].Loc>=0) and (MyUn[uix].mix=mixShow) then inc(Available);
-  InProd:=0;
-  for cix:=0 to MyRO.nCity-1 do
-    if (MyCity[cix].Loc>=0) and (MyCity[cix].Project and (cpImp+cpIndex)=mixShow) then
-      inc(InProd);
-  end;
-
-offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-if Kind in [dkEnemyCityDefense,dkEnemyCity] then
-  begin
-  NoMap.SetOutput(offscreen);
-  NoMap.PaintCity(ClientWidth div 2,53,MyRO.EnemyCity[ecixShow],false);
-
-  s:=Tribe[MyRO.EnemyCity[ecixShow].Owner].TPhrase('UNITOWNER');
-  LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-    (ClientWidth-BiColorTextWidth(offscreen.Canvas,s)) div 2, 105, s);
-  end;
-
-if Kind<>dkEnemyCity then
+    InProd := 0;
+    for cix := 0 to MyRO.nCity - 1 do
+      if (MyCity[cix].Loc >= 0) and
+        (MyCity[cix].Project and (cpImp + cpIndex) = mixShow) then
+        inc(InProd);
+  end;
+
+  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  if Kind in [dkEnemyCityDefense, dkEnemyCity] then
+  begin
+    NoMap.SetOutput(offscreen);
+    NoMap.PaintCity(ClientWidth div 2, 53, MyRO.EnemyCity[ecixShow], false);
+
+    s := Tribe[MyRO.EnemyCity[ecixShow].owner].TPhrase('UNITOWNER');
+    LoweredTextOut(offscreen.Canvas, -1, MainTexture,
+      (ClientWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2, 105, s);
+  end;
+
+  if Kind <> dkEnemyCity then
   begin // show unit stats
-  if Kind=dkOwnModel then
-    MakeModelInfo(me,mixShow,MyModel[mixShow],mi)
-  else if Kind=dkOwnUnit then
+    if Kind = dkOwnModel then
+      MakeModelInfo(me, mixShow, MyModel[mixShow], mi)
+    else if Kind = dkOwnUnit then
     begin
-    MakeUnitInfo(me,MyUn[uixShow],ui);
-    MakeModelInfo(me,MyUn[uixShow].mix,MyModel[MyUn[uixShow].mix],mi)
+      MakeUnitInfo(me, MyUn[uixShow], ui);
+      MakeModelInfo(me, MyUn[uixShow].mix, MyModel[MyUn[uixShow].mix], mi)
     end
-  else
+    else
     begin
-    mi:=mox^;
-    if Kind in [dkEnemyUnit,dkEnemyCityDefense] then
-      ui:=MyRO.EnemyUn[euixShow]
+      mi := mox^;
+      if Kind in [dkEnemyUnit, dkEnemyCityDefense] then
+        ui := MyRO.EnemyUn[euixShow]
     end;
 
-  with Tribe[mi.Owner].ModelPicture[mi.mix] do
+    with Tribe[mi.owner].ModelPicture[mi.mix] do
     begin
-    if Kind in [dkOwnUnit,dkEnemyUnit,dkEnemyCityDefense] then with ui do
-      begin
-      {Frame(offscreen.canvas,xView-1,yView-1,xView+64,yView+48,
-        MainTexture.clBevelShade,MainTexture.clBevelLight);
-      RFrame(offscreen.canvas,xView-2,yView-2,xView+65,yView+49,
-        MainTexture.clBevelShade,MainTexture.clBevelLight);}
-      with offscreen.canvas do
-        begin
-        Brush.Color:=GrExt[HGrSystem].Data.Canvas.Pixels[98,67];
-        offscreen.canvas.FillRect(Rect(xView,yView,xView+64,yView+16));
-        Brush.Style:=bsClear;
+      if Kind in [dkOwnUnit, dkEnemyUnit, dkEnemyCityDefense] then
+        with ui do
+        begin
+          { Frame(offscreen.canvas,xView-1,yView-1,xView+64,yView+48,
+            MainTexture.clBevelShade,MainTexture.clBevelLight);
+            RFrame(offscreen.canvas,xView-2,yView-2,xView+65,yView+49,
+            MainTexture.clBevelShade,MainTexture.clBevelLight); }
+          with offscreen.Canvas do
+          begin
+            Brush.Color := GrExt[HGrSystem].Data.Canvas.Pixels[98, 67];
+            offscreen.Canvas.FillRect(Rect(xView, yView, xView + 64,
+              yView + 16));
+            Brush.Style := bsClear;
+          end;
+
+          if MyMap[Loc] and fTerrain >= fForest then
+          begin
+            x := 1 + 2 * (xxt * 2 + 1);
+            y := 1 + yyt + 2 * (yyt * 3 + 1)
+          end
+          else
+          begin
+            x := integer(MyMap[Loc] and fTerrain) * (xxt * 2 + 1) + 1;
+            y := 1 + yyt
+          end;
+          for j := -1 to 1 do
+            for i := -1 to 1 do
+              if (i + j) and 1 = 0 then
+              begin
+                Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2,
+                  yyt * 2, x, y);
+                if MyMap[Loc] and (fTerrain or fSpecial) = fGrass or fSpecial1
+                then
+                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                    1 + 2 * (xxt * 2 + 1), 1 + yyt + 1 * (yyt * 3 + 1))
+                else if (MyMap[Loc] and fTerrain = fForest) and
+                  IsJungle(Loc div G.lx) then
+                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                    1 + 7 * (xxt * 2 + 1), 1 + yyt + 19 * (yyt * 3 + 1))
+                else if MyMap[Loc] and fTerrain >= fForest then
+                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                    1 + 7 * (xxt * 2 + 1),
+                    1 + yyt + 2 * integer(2 + MyMap[Loc] and fTerrain - fForest)
+                    * (yyt * 3 + 1));
+              end;
+          bitblt(offscreen.Canvas.Handle, xView, yView + 16, 64, 32,
+            Buffer.Canvas.Handle, 1, 0, SRCCOPY);
+
+          // show unit, experience and health
+          Sprite(offscreen, HGr, xView, yView, 64, 48, pix mod 10 * 65 + 1,
+            pix div 10 * 49 + 1);
+          if Flags and unFortified <> 0 then
+            Sprite(offscreen, HGrStdUnits, xView, yView, xxu * 2, yyu * 2,
+              1 + 6 * (xxu * 2 + 1), 1);
+          FrameImage(offscreen.Canvas, GrExt[HGrSystem].Data, xView - 20,
+            yView + 5, 12, 14, 121 + Exp div ExpCost * 13, 28);
+          if Health < 100 then
+          begin
+            s := IntToStr(Health) + '%';
+            LightGradient(offscreen.Canvas, xView - 45, yView + 24, 38,
+              (ColorOfHealth(Health) and $FEFEFE shr 2) * 3);
+            RisedTextout(offscreen.Canvas, xView - 45 + 20 -
+              BiColorTextWidth(offscreen.Canvas, s) div 2, yView + 23, s);
+          end;
+
+          if Kind = dkEnemyUnit then
+          begin
+            s := Tribe[mox.owner].TPhrase('UNITOWNER');
+            LoweredTextOut(offscreen.Canvas, -1, MainTexture,
+              (ClientWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2,
+              yView + 80, s);
+          end
+        end
+      else
+      begin
+        FrameImage(offscreen.Canvas, BigImp, xView + 4, yView, 56, 40, 0, 0);
+        Sprite(offscreen, HGr, xView, yView - 4, 64, 44, pix mod 10 * 65 + 1,
+          pix div 10 * 49 + 1);
+      end;
+
+      DarkGradient(offscreen.Canvas, xTotal - 6, yTotal + 1, 180, 2);
+      RisedTextout(offscreen.Canvas, xTotal - 2, yTotal,
+        Phrases.Lookup('UNITSTRENGTH'));
+      s := IntToStr(mi.Attack) + '/' + IntToStr(mi.Defense);
+      RisedTextout(offscreen.Canvas,
+        xTotal + 170 - BiColorTextWidth(offscreen.Canvas, s), yTotal, s);
+      FeatureBar(offscreen, xTotal, yTotal + 19, mi, MainTexture);
+      NumberBarS(offscreen, xTotal, yTotal + 38, Phrases.Lookup('UNITSPEED'),
+        MovementToString(mi.Speed), MainTexture);
+      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, yTotal + 57,
+        Phrases.Lookup('UNITCOST'));
+      DLine(offscreen.Canvas, xTotal - 2, xTotal + 170, yTotal + 57 + 16,
+        MainTexture.clBevelShade, MainTexture.clBevelLight);
+      if G.Difficulty[me] = 0 then
+        s := IntToStr(mi.cost)
+      else
+        s := IntToStr(mi.cost * BuildCostMod[G.Difficulty[me]] div 12);
+      RisedTextout(offscreen.Canvas,
+        xTotal + 159 - BiColorTextWidth(offscreen.Canvas, s), yTotal + 57, s);
+      Sprite(offscreen, HGrSystem, xTotal + 160, yTotal + 57 + 5, 10,
+        10, 88, 115);
+
+      if Kind = dkOwnModel then
+      begin
+        if MyModel[mixShow].IntroTurn > 0 then
+        begin
+          if MyModel[mixShow].Kind = mkEnemyDeveloped then
+            LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2,
+              (yTotal + StatDown - 19), Phrases.Lookup('UNITADOPT'))
+          else
+            LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2,
+              (yTotal + StatDown - 19), Phrases.Lookup('UNITINTRO'));
+          DLine(offscreen.Canvas, xTotal - 2, xTotal + 170,
+            (yTotal + StatDown - 19) + 16, MainTexture.clTextShade,
+            MainTexture.clTextLight);
+          s := TurnToString(MyModel[mixShow].IntroTurn);
+          RisedTextout(offscreen.Canvas,
+            xTotal + 170 - BiColorTextWidth(offscreen.Canvas, s),
+            (yTotal + StatDown - 19), s);
         end;
 
-      if MyMap[Loc] and fTerrain>=fForest then
-        begin x:=1+2*(xxt*2+1); y:=1+yyt+2*(yyt*3+1) end
-      else begin x:=integer(MyMap[Loc] and fTerrain) *(xxt*2+1)+1; y:=1+yyt end;
-      for j:=-1 to 1 do for i:=-1 to 1 do if (i+j) and 1=0 then
-        begin
-        Sprite(Buffer,HGrTerrain,i*xxt,j*yyt,xxt*2,yyt*2,x,y);
-        if MyMap[Loc] and (fTerrain or fSpecial)=fGrass or fSpecial1 then
-          Sprite(Buffer,HGrTerrain,i*xxt,j*yyt,xxt*2,yyt*2,1+2*(xxt*2+1),
-            1+yyt+1*(yyt*3+1))
-        else if (MyMap[Loc] and fTerrain=fForest)
-          and IsJungle(Loc div G.lx) then
-          Sprite(Buffer,HGrTerrain,i*xxt,j*yyt,xxt*2,yyt*2,1+7*(xxt*2+1),
-            1+yyt+19*(yyt*3+1))
-        else if MyMap[Loc] and fTerrain>=fForest then
-          Sprite(Buffer,HGrTerrain,i*xxt,j*yyt,xxt*2,yyt*2,1+7*(xxt*2+1),
-            1+yyt+2*integer(2+MyMap[Loc] and fTerrain-fForest)*(yyt*3+1));
+        NumberBar(offscreen, xTotal, yTotal + StatDown,
+          Phrases.Lookup('UNITBUILT'), MyModel[mixShow].Built, MainTexture);
+        if MyModel[mixShow].Lost > 0 then
+          NumberBar(offscreen, xTotal, yTotal + StatDown + 19,
+            Phrases.Lookup('UNITLOST'), MyModel[mixShow].Lost, MainTexture);
+        if InProd > 0 then
+          NumberBar(offscreen, xTotal, yTotal + StatDown + 57,
+            Phrases.Lookup('UNITINPROD'), InProd, MainTexture);
+        if Available > 0 then
+          NumberBar(offscreen, xTotal, yTotal + StatDown + 38,
+            Phrases.Lookup('UNITAVAILABLE'), Available, MainTexture);
+
+        if MyModel[mixShow].Status and msObsolete <> 0 then
+        begin
+          SwitchBtn.ButtonIndex := 12;
+          SwitchBtn.Hint := Phrases.Lookup('BTN_OBSOLETE');
+        end
+        else
+        begin
+          SwitchBtn.ButtonIndex := 11;
+          SwitchBtn.Hint := Phrases.Lookup('BTN_NONOBSOLETE');
         end;
-      BitBlt(offscreen.canvas.handle,xView,yView+16,64,32,Buffer.Canvas.Handle,1,0,
-        SRCCOPY);
-
-      // show unit, experience and health
-      Sprite(offscreen,HGr,xView,yView,64,48,pix mod 10 *65+1,pix div 10*49+1);
-      if Flags and unFortified<>0 then
-        Sprite(offscreen,HGrStdUnits,xView,yView,xxu*2,yyu*2,1+6*(xxu*2+1),1);
-      FrameImage(offscreen.canvas,GrExt[HGrSystem].Data,xView-20,yView+5,12,14,
-        121+Exp div ExpCost *13,28);
-      if Health<100 then
-        begin
-        s:=IntToStr(Health)+'%';
-        LightGradient(offscreen.canvas,xView-45,yView+24,38,
-          (ColorOfHealth(Health) and $FEFEFE shr 2)*3);
-        RisedTextOut(offscreen.canvas,xView-45+20-BiColorTextWidth(offscreen.Canvas,s) div 2,
-          yView+23,s);
-        end;
-
-      if Kind=dkEnemyUnit then
-        begin
-        s:=Tribe[mox.Owner].TPhrase('UNITOWNER');
-        LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-          (ClientWidth-BiColorTextWidth(offscreen.Canvas,s)) div 2, yView+80, s);
+        if MyModel[mixShow].Status and msAllowConscripts = 0 then
+        begin
+          ConscriptsBtn.ButtonIndex := 30;
+          ConscriptsBtn.Hint := Phrases.Lookup('BTN_NOCONSCRIPTS');
+        end
+        else
+        begin
+          ConscriptsBtn.ButtonIndex := 29;
+          ConscriptsBtn.Hint := Phrases.Lookup('BTN_ALLOWCONSCRIPTS');
         end
       end
-    else
-      begin
-      FrameImage(offscreen.canvas,BigImp,xView+4,yView,56,40,0,0);
-      Sprite(offscreen,HGr,xView,yView-4,64,44,pix mod 10 *65+1,pix div 10*49+1);
-      end;
-
-    DarkGradient(offscreen.Canvas,xTotal-6,yTotal+1,180,2);
-    RisedTextOut(offscreen.Canvas,xTotal-2,yTotal,Phrases.Lookup('UNITSTRENGTH'));
-    s:=IntToStr(mi.Attack)+'/'+IntToStr(mi.Defense);
-    RisedTextOut(offscreen.Canvas,xTotal+170-BiColorTextWidth(Offscreen.Canvas,s),yTotal,s);
-    FeatureBar(offscreen,xTotal,yTotal+19,mi,MainTexture);
-    NumberBarS(offscreen,xTotal,yTotal+38,Phrases.Lookup('UNITSPEED'),MovementToString(mi.Speed),MainTexture);
-    LoweredTextOut(offscreen.Canvas,-1,MainTexture,xTotal-2,yTotal+57,Phrases.Lookup('UNITCOST'));
-    DLine(offscreen.Canvas,xTotal-2,xTotal+170,yTotal+57+16,
-      MainTexture.clBevelShade,MainTexture.clBevelLight);
-    if G.Difficulty[me]=0 then s:=IntToStr(mi.cost)
-    else s:=IntToStr(mi.cost*BuildCostMod[G.Difficulty[me]] div 12);
-    RisedTextout(offscreen.Canvas,xTotal+159-BiColorTextWidth(Offscreen.Canvas,s),yTotal+57,s);
-    Sprite(offscreen,HGrSystem,xTotal+160,yTotal+57+5,10,10,88,115);
-
-    if Kind=dkOwnModel then
-      begin
-      if MyModel[mixShow].IntroTurn>0 then
-        begin
-        if MyModel[mixShow].Kind=mkEnemyDeveloped then
-          LoweredTextOut(offscreen.Canvas,-1,MainTexture,xTotal-2,(yTotal+StatDown-19),Phrases.Lookup('UNITADOPT'))
-        else LoweredTextOut(offscreen.Canvas,-1,MainTexture,xTotal-2,(yTotal+StatDown-19),Phrases.Lookup('UNITINTRO'));
-        DLine(offscreen.Canvas,xTotal-2,xTotal+170,(yTotal+StatDown-19)+16,
-          MainTexture.clTextShade,MainTexture.clTextLight);
-        s:=TurnToString(MyModel[mixShow].IntroTurn);
-        RisedTextOut(offscreen.Canvas,xTotal+170-BiColorTextWidth(Offscreen.Canvas,s),(yTotal+StatDown-19),s);
-        end;
-
-      NumberBar(offscreen,xTotal,yTotal+StatDown,Phrases.Lookup('UNITBUILT'),MyModel[mixShow].Built,MainTexture);
-      if MyModel[mixShow].Lost>0 then
-        NumberBar(offscreen,xTotal,yTotal+StatDown+19,Phrases.Lookup('UNITLOST'),MyModel[mixShow].Lost,MainTexture);
-      if InProd>0 then
-        NumberBar(offscreen,xTotal,yTotal+StatDown+57,Phrases.Lookup('UNITINPROD'),InProd,MainTexture);
-      if Available>0 then
-        NumberBar(offscreen,xTotal,yTotal+StatDown+38,Phrases.Lookup('UNITAVAILABLE'),Available,MainTexture);
-
-      if MyModel[mixShow].Status and msObsolete<>0 then
-        begin
-        SwitchBtn.ButtonIndex:=12;
-        SwitchBtn.Hint:=Phrases.Lookup('BTN_OBSOLETE');
-        end
-      else
-        begin
-        SwitchBtn.ButtonIndex:=11;
-        SwitchBtn.Hint:=Phrases.Lookup('BTN_NONOBSOLETE');
-        end;
-      if MyModel[mixShow].Status and msAllowConscripts=0 then
-        begin
-        ConscriptsBtn.ButtonIndex:=30;
-        ConscriptsBtn.Hint:=Phrases.Lookup('BTN_NOCONSCRIPTS');
-        end
-      else
-        begin
-        ConscriptsBtn.ButtonIndex:=29;
-        ConscriptsBtn.Hint:=Phrases.Lookup('BTN_ALLOWCONSCRIPTS');
-        end
-      end
-    else if Kind=dkEnemyModel then
-      begin
-      if Destroyed>0 then
-        NumberBar(offscreen,xTotal,yTotal+StatDown-19,Phrases.Lookup('UNITDESTROYED'),Destroyed,MainTexture);
-      if Available>0 then
-        NumberBar(offscreen,xTotal,yTotal+StatDown,Phrases.Lookup('UNITKNOWN'),Available,MainTexture);
+      else if Kind = dkEnemyModel then
+      begin
+        if Destroyed > 0 then
+          NumberBar(offscreen, xTotal, yTotal + StatDown - 19,
+            Phrases.Lookup('UNITDESTROYED'), Destroyed, MainTexture);
+        if Available > 0 then
+          NumberBar(offscreen, xTotal, yTotal + StatDown,
+            Phrases.Lookup('UNITKNOWN'), Available, MainTexture);
       end
     end;
   end;
 
-offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-case Kind of
-  dkOwnModel,dkEnemyModel: yCaption:=yView+46;
-  dkEnemyUnit,dkOwnUnit: yCaption:=yView+54;
-  dkEnemyCityDefense,dkEnemyCity: yCaption:=79;
-  end;
-RisedTextOut(offscreen.Canvas, (ClientWidth-BiColorTextWidth(offscreen.Canvas,caption)) div 2, yCaption, caption);
-end; {OffscreenPaint}
+  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  case Kind of
+    dkOwnModel, dkEnemyModel:
+      yCaption := yView + 46;
+    dkEnemyUnit, dkOwnUnit:
+      yCaption := yView + 54;
+    dkEnemyCityDefense, dkEnemyCity:
+      yCaption := 79;
+  end;
+  RisedTextout(offscreen.Canvas,
+    (ClientWidth - BiColorTextWidth(offscreen.Canvas, Caption)) div 2,
+    yCaption, Caption);
+end; { OffscreenPaint }
 
 procedure TUnitStatDlg.ModelBoxChange(Sender: TObject);
 begin
-SmartUpdateContent
+  SmartUpdateContent
 end;
 
 procedure TUnitStatDlg.SwitchBtnClick(Sender: TObject);
 begin
-MyModel[mixShow].Status:=MyModel[mixShow].Status xor msObsolete;
-if MyModel[mixShow].Status and msObsolete<>0 then
-  begin
-  SwitchBtn.ButtonIndex:=12;
-  SwitchBtn.Hint:=Phrases.Lookup('BTN_OBSOLETE');
+  MyModel[mixShow].Status := MyModel[mixShow].Status xor msObsolete;
+  if MyModel[mixShow].Status and msObsolete <> 0 then
+  begin
+    SwitchBtn.ButtonIndex := 12;
+    SwitchBtn.Hint := Phrases.Lookup('BTN_OBSOLETE');
   end
-else
-  begin
-  SwitchBtn.ButtonIndex:=11;
-  SwitchBtn.Hint:=Phrases.Lookup('BTN_NONOBSOLETE');
+  else
+  begin
+    SwitchBtn.ButtonIndex := 11;
+    SwitchBtn.Hint := Phrases.Lookup('BTN_NONOBSOLETE');
   end
 end;
@@ -627 +722 @@
 procedure TUnitStatDlg.ConscriptsBtnClick(Sender: TObject);
 begin
-MyModel[mixShow].Status:=MyModel[mixShow].Status xor msAllowConscripts;
-if MyModel[mixShow].Status and msAllowConscripts=0 then
-  begin
-  ConscriptsBtn.ButtonIndex:=30;
-  ConscriptsBtn.Hint:=Phrases.Lookup('BTN_NOCONSCRIPTS');
+  MyModel[mixShow].Status := MyModel[mixShow].Status xor msAllowConscripts;
+  if MyModel[mixShow].Status and msAllowConscripts = 0 then
+  begin
+    ConscriptsBtn.ButtonIndex := 30;
+    ConscriptsBtn.Hint := Phrases.Lookup('BTN_NOCONSCRIPTS');
   end
-else
-  begin
-  ConscriptsBtn.ButtonIndex:=29;
-  ConscriptsBtn.Hint:=Phrases.Lookup('BTN_ALLOWCONSCRIPTS');
+  else
+  begin
+    ConscriptsBtn.ButtonIndex := 29;
+    ConscriptsBtn.Hint := Phrases.Lookup('BTN_ALLOWCONSCRIPTS');
   end
 end;
@@ -642 +737 @@
 procedure TUnitStatDlg.HelpBtnClick(Sender: TObject);
 begin
-HelpDlg.ShowNewContent(wmPersistent, hkModel, 0)
+  HelpDlg.ShowNewContent(wmPersistent, hkModel, 0)
 end;
 
 end.
-

trunk/LocalPlayer/Wonders.pas

@@ -1 +1 @@
 {$INCLUDE switches}
-
 unit Wonders;
 
@@ -6 +5 @@
 
 uses
-  ScreenTools,BaseWin,Protocol,
+  ScreenTools, BaseWin, Protocol,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
@@ -16 +15 @@
     procedure FormCreate(Sender: TObject);
     procedure CloseBtnClick(Sender: TObject);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X,
-      Y: Integer);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
     procedure FormShow(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
@@ -24 +22 @@
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer); 
+    procedure ShowNewContent(NewMode: Integer);
 
   private
-    xm,ym,Selection: integer;
+    xm, ym, Selection: Integer;
   end;
 
@@ -36 +34 @@
 
 uses
-Term, ClientTools, Help,Tribes;
+  Term, ClientTools, Help, Tribes;
 
 {$R *.DFM}
 
 const
-RingPosition: array[0..20,0..1] of integer=
-((-80,-32), // Pyramids
-(80,-32), // Zeus
-(0,-64), // Gardens
-(0,0), // Colossus
-(0,64), // Lighthouse
-(-80,32), // GrLibrary
-(-90,114), // Oracle
-(80,32), // Sun
-(90,-114), // Leo
-(-180,0), // Magellan
-(90,114), // Mich
-(0,0), //{11;}
-(180,0), // Newton
-(-90,-114), // Bach
-(0,0), //{14;}
-(-160,-64), // Liberty
-(0,128), // Eiffel
-(160,-64), // Hoover
-(-160,64), // Shinkansen
-(0,-128), // Manhattan
-(160,64)); // Mir
-
+  RingPosition: array [0 .. 20, 0 .. 1] of Integer = ((-80, -32), // Pyramids
+    (80, -32), // Zeus
+    (0, -64), // Gardens
+    (0, 0), // Colossus
+    (0, 64), // Lighthouse
+    (-80, 32), // GrLibrary
+    (-90, 114), // Oracle
+    (80, 32), // Sun
+    (90, -114), // Leo
+    (-180, 0), // Magellan
+    (90, 114), // Mich
+    (0, 0), // {11;}
+    (180, 0), // Newton
+    (-90, -114), // Bach
+    (0, 0), // {14;}
+    (-160, -64), // Liberty
+    (0, 128), // Eiffel
+    (160, -64), // Hoover
+    (-160, 64), // Shinkansen
+    (0, -128), // Manhattan
+    (160, 64)); // Mir
 
 procedure TWondersDlg.FormCreate(Sender: TObject);
 begin
-Canvas.Font.Assign(UniFont[ftNormal]);
-Canvas.Brush.Style:=bsClear;
-InitButtons();
+  Canvas.Font.Assign(UniFont[ftNormal]);
+  Canvas.Brush.Style := bsClear;
+  InitButtons();
 end;
 
 procedure TWondersDlg.FormShow(Sender: TObject);
 begin
-Selection:=-1;
-OffscreenPaint;
-end;
-
-procedure TWondersDlg.ShowNewContent(NewMode: integer);
-begin
-inherited ShowNewContent(NewMode);
+  Selection := -1;
+  OffscreenPaint;
+end;
+
+procedure TWondersDlg.ShowNewContent(NewMode: Integer);
+begin
+  inherited ShowNewContent(NewMode);
 end;
 
 procedure TWondersDlg.OffscreenPaint;
 type
-TLine=array[0..649,0..2] of Byte;
-
-  procedure DarkIcon(i: integer);
+  TLine = array [0 .. 649, 0 .. 2] of Byte;
+
+  procedure DarkIcon(i: Integer);
   var
-  x,y,ch,x0Dst,y0Dst,x0Src,y0Src,darken,c: integer;
-  Src,Dst: ^TLine;
-  begin
-  x0Dst:=ClientWidth div 2-xSizeBig div 2+RingPosition[i,0];
-  y0Dst:=ClientHeight div 2-ySizeBig div 2+RingPosition[i,1];
-  x0Src:=(i mod 7)*xSizeBig;
-  y0Src:=(i div 7+SystemIconLines)*ySizeBig;
-  for y:=0 to ySizeBig-1 do
-    begin
-    Src:=BigImp.ScanLine[y0Src+y];
-    Dst:=Offscreen.ScanLine[y0Dst+y];
-    for x:=0 to xSizeBig-1 do
+    X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, c: Integer;
+    Src, Dst: ^TLine;
+  begin
+    x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[i, 0];
+    y0Dst := ClientHeight div 2 - ySizeBig div 2 + RingPosition[i, 1];
+    x0Src := (i mod 7) * xSizeBig;
+    y0Src := (i div 7 + SystemIconLines) * ySizeBig;
+    for Y := 0 to ySizeBig - 1 do
+    begin
+      Src := BigImp.ScanLine[y0Src + Y];
+      Dst := Offscreen.ScanLine[y0Dst + Y];
+      for X := 0 to xSizeBig - 1 do
       begin
-      darken:=((255-Src[x0Src+x][0])*3
-        +(255-Src[x0Src+x][1])*15
-        +(255-Src[x0Src+x][2])*9) div 128;
-      for ch:=0 to 2 do
+        darken := ((255 - Src[x0Src + X][0]) * 3 + (255 - Src[x0Src + X][1]) *
+          15 + (255 - Src[x0Src + X][2]) * 9) div 128;
+        for ch := 0 to 2 do
         begin
-        c:=Dst[x0Dst+x][ch]-darken;
-        if c<0 then Dst[x0Dst+x][ch]:=0
-        else Dst[x0Dst+x][ch]:=c;
+          c := Dst[x0Dst + X][ch] - darken;
+          if c < 0 then
+            Dst[x0Dst + X][ch] := 0
+          else
+            Dst[x0Dst + X][ch] := c;
         end
       end
@@ -115 +112 @@
   end;
 
-  procedure Glow(i,GlowColor: integer);
-  begin
-  GlowFrame(Offscreen, ClientWidth div 2-xSizeBig div 2+RingPosition[i,0],
-    ClientHeight div 2-ySizeBig div 2+RingPosition[i,1],
-    xSizeBig, ySizeBig, GlowColor);
+  procedure Glow(i, GlowColor: Integer);
+  begin
+    GlowFrame(Offscreen, ClientWidth div 2 - xSizeBig div 2 + RingPosition[i,
+      0], ClientHeight div 2 - ySizeBig div 2 + RingPosition[i, 1], xSizeBig,
+      ySizeBig, GlowColor);
   end;
 
 const
-darken=24;
-// space=pi/120;
-amax0=15734; // 1 shl 16*tan(pi/12-space);
-amin1=19413; // 1 shl 16*tan(pi/12+space);
-amax1=62191; // 1 shl 16*tan(pi/4-space);
-amin2=69061; // 1 shl 16*tan(pi/4+space);
-amax2=221246; // 1 shl 16*tan(5*pi/12-space);
-amin3=272977; // 1 shl 16*tan(5*pi/12+space);
+  darken = 24;
+  // space=pi/120;
+  amax0 = 15734; // 1 shl 16*tan(pi/12-space);
+  amin1 = 19413; // 1 shl 16*tan(pi/12+space);
+  amax1 = 62191; // 1 shl 16*tan(pi/4-space);
+  amin2 = 69061; // 1 shl 16*tan(pi/4+space);
+  amax2 = 221246; // 1 shl 16*tan(5*pi/12-space);
+  amin3 = 272977; // 1 shl 16*tan(5*pi/12+space);
 var
-i,x,y,r,ax,ch,c: integer;
-HaveWonder: boolean;
-Line: array[0..1] of ^TLine;
-s: string;
-begin
-if (OffscreenUser<>nil) and (OffscreenUser<>self) then OffscreenUser.Update;
+  i, X, Y, r, ax, ch, c: Integer;
+  HaveWonder: boolean;
+  Line: array [0 .. 1] of ^TLine;
+  s: string;
+begin
+  if (OffscreenUser <> nil) and (OffscreenUser <> self) then
+    OffscreenUser.Update;
   // complete working with old owner to prevent rebound
-OffscreenUser:=self;
-
-Fill(Offscreen.Canvas,3,3,ClientWidth-6,ClientHeight-6,
-  (wMaintexture-ClientWidth) div 2,(hMaintexture-ClientHeight) div 2);
-Frame(Offscreen.Canvas,0,0,ClientWidth-1,ClientHeight-1,0,0);
-Frame(Offscreen.Canvas,1,1,ClientWidth-2,ClientHeight-2,MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(Offscreen.Canvas,2,2,ClientWidth-3,ClientHeight-3,MainTexture.clBevelLight,MainTexture.clBevelShade);
-Corner(Offscreen.Canvas,1,1,0,MainTexture);
-Corner(Offscreen.Canvas,ClientWidth-9,1,1,MainTexture);
-Corner(Offscreen.Canvas,1,ClientHeight-9,2,MainTexture);
-Corner(Offscreen.Canvas,ClientWidth-9,ClientHeight-9,3,MainTexture);
-
-BtnFrame(Offscreen.Canvas,CloseBtn.BoundsRect,MainTexture);
-
-Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-s:=Phrases.Lookup('TITLE_WONDERS');
-RisedTextOut(Offscreen.Canvas,(ClientWidth-BiColorTextWidth(Offscreen.Canvas,s)) div 2-1,7,s);
-Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-
-xm:=ClientWidth div 2;
-ym:=ClientHeight div 2;
-for y:=0 to 127 do
-  begin
-  Line[0]:=Offscreen.Scanline[ym+y];
-  Line[1]:=Offscreen.Scanline[ym-1-y];
-  for x:=0 to 179 do
-    begin
-    r:=x*x*(32*32)+y*y*(45*45);
-    ax:=((1 shl 16 div 32)*45)*y;
-    if (r<8*128*180*180)
-      and ((r>=32*64*90*90) and (ax<amax2*x) and ((ax<amax0*x) or (ax>amin2*x))
-        or (ax>amin1*x) and ((ax<amax1*x) or (ax>amin3*x))) then
-        for i:=0 to 1 do for ch:=0 to 2 do
+  OffscreenUser := self;
+
+  Fill(Offscreen.Canvas, 3, 3, ClientWidth - 6, ClientHeight - 6,
+    (wMaintexture - ClientWidth) div 2, (hMaintexture - ClientHeight) div 2);
+  Frame(Offscreen.Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
+  Frame(Offscreen.Canvas, 1, 1, ClientWidth - 2, ClientHeight - 2,
+    MainTexture.clBevelLight, MainTexture.clBevelShade);
+  Frame(Offscreen.Canvas, 2, 2, ClientWidth - 3, ClientHeight - 3,
+    MainTexture.clBevelLight, MainTexture.clBevelShade);
+  Corner(Offscreen.Canvas, 1, 1, 0, MainTexture);
+  Corner(Offscreen.Canvas, ClientWidth - 9, 1, 1, MainTexture);
+  Corner(Offscreen.Canvas, 1, ClientHeight - 9, 2, MainTexture);
+  Corner(Offscreen.Canvas, ClientWidth - 9, ClientHeight - 9, 3, MainTexture);
+
+  BtnFrame(Offscreen.Canvas, CloseBtn.BoundsRect, MainTexture);
+
+  Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  s := Phrases.Lookup('TITLE_WONDERS');
+  RisedTextOut(Offscreen.Canvas,
+    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s)) div 2 - 1, 7, s);
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+
+  xm := ClientWidth div 2;
+  ym := ClientHeight div 2;
+  for Y := 0 to 127 do
+  begin
+    Line[0] := Offscreen.ScanLine[ym + Y];
+    Line[1] := Offscreen.ScanLine[ym - 1 - Y];
+    for X := 0 to 179 do
+    begin
+      r := X * X * (32 * 32) + Y * Y * (45 * 45);
+      ax := ((1 shl 16 div 32) * 45) * Y;
+      if (r < 8 * 128 * 180 * 180) and
+        ((r >= 32 * 64 * 90 * 90) and (ax < amax2 * X) and
+        ((ax < amax0 * X) or (ax > amin2 * X)) or (ax > amin1 * X) and
+        ((ax < amax1 * X) or (ax > amin3 * X))) then
+        for i := 0 to 1 do
+          for ch := 0 to 2 do
           begin
-          c:=Line[i][xm+x][ch]-darken;
-          if c<0 then Line[i][xm+x][ch]:=0
-          else Line[i][xm+x][ch]:=c;
-          c:=Line[i][xm-1-x][ch]-darken;
-          if c<0 then Line[i][xm-1-x][ch]:=0
-          else Line[i][xm-1-x][ch]:=c;
+            c := Line[i][xm + X][ch] - darken;
+            if c < 0 then
+              Line[i][xm + X][ch] := 0
+            else
+              Line[i][xm + X][ch] := c;
+            c := Line[i][xm - 1 - X][ch] - darken;
+            if c < 0 then
+              Line[i][xm - 1 - X][ch] := 0
+            else
+              Line[i][xm - 1 - X][ch] := c;
           end
     end;
   end;
 
-HaveWonder:=false;
-for i:=0 to 20 do if Imp[i].Preq<>preNA then
-  begin
-  case MyRO.Wonder[i].CityID of
-    -1: // not built yet
+  HaveWonder := false;
+  for i := 0 to 20 do
+    if Imp[i].Preq <> preNA then
+    begin
+      case MyRO.Wonder[i].CityID of
+        - 1: // not built yet
+          begin
+            Fill(Offscreen.Canvas, xm - xSizeBig div 2 + RingPosition[i, 0] - 3,
+              ym - ySizeBig div 2 + RingPosition[i, 1] - 3, xSizeBig + 6,
+              ySizeBig + 6, (wMaintexture - ClientWidth) div 2,
+              (hMaintexture - ClientHeight) div 2);
+            DarkIcon(i);
+          end;
+        -2: // destroyed
+          begin
+            HaveWonder := true;
+            Glow(i, $000000);
+            BitBlt(Offscreen.Canvas.Handle, xm - xSizeBig div 2 + RingPosition
+              [i, 0], ym - ySizeBig div 2 + RingPosition[i, 1], xSizeBig,
+              ySizeBig, BigImp.Canvas.Handle, 0, (SystemIconLines + 3) *
+              ySizeBig, SRCCOPY);
+          end;
+      else
+        begin
+          HaveWonder := true;
+          if MyRO.Wonder[i].EffectiveOwner >= 0 then
+            Glow(i, Tribe[MyRO.Wonder[i].EffectiveOwner].Color)
+          else
+            Glow(i, $000000);
+          BitBlt(Offscreen.Canvas.Handle, xm - xSizeBig div 2 + RingPosition[i,
+            0], ym - ySizeBig div 2 + RingPosition[i, 1], xSizeBig, ySizeBig,
+            BigImp.Canvas.Handle, (i mod 7) * xSizeBig,
+            (i div 7 + SystemIconLines) * ySizeBig, SRCCOPY);
+        end
+      end
+    end;
+
+  if not HaveWonder then
+  begin
+    s := Phrases.Lookup('NOWONDER');
+    RisedTextOut(Offscreen.Canvas, xm - BiColorTextWidth(Offscreen.Canvas, s)
+      div 2, ym - Offscreen.Canvas.TextHeight(s) div 2, s);
+  end;
+
+  MarkUsedOffscreen(ClientWidth, ClientHeight);
+end; { OffscreenPaint }
+
+procedure TWondersDlg.CloseBtnClick(Sender: TObject);
+begin
+  Close
+end;
+
+procedure TWondersDlg.FormMouseMove(Sender: TObject; Shift: TShiftState;
+  X, Y: Integer);
+var
+  i, OldSelection: Integer;
+  s: string;
+begin
+  OldSelection := Selection;
+  Selection := -1;
+  for i := 0 to 20 do
+    if (Imp[i].Preq <> preNA) and (X >= xm - xSizeBig div 2 + RingPosition[i, 0]
+      ) and (X < xm + xSizeBig div 2 + RingPosition[i, 0]) and
+      (Y >= ym - ySizeBig div 2 + RingPosition[i, 1]) and
+      (Y < ym + ySizeBig div 2 + RingPosition[i, 1]) then
+    begin
+      Selection := i;
+      break
+    end;
+  if Selection <> OldSelection then
+  begin
+    Fill(Canvas, 9, ClientHeight - 3 - 46, ClientWidth - 18, 44,
+      (wMaintexture - ClientWidth) div 2, (hMaintexture - ClientHeight) div 2);
+    if Selection >= 0 then
+    begin
+      if MyRO.Wonder[Selection].CityID = -1 then
+      begin // not built yet
+        { s:=Phrases.Lookup('IMPROVEMENTS',Selection);
+          Canvas.Font.Color:=$000000;
+          Canvas.TextOut(
+          (ClientWidth-BiColorTextWidth(Canvas,s)) div 2+1,
+          ClientHeight-3-36+1, s);
+          Canvas.Font.Color:=MainTexture.clBevelLight;
+          Canvas.TextOut(
+          (ClientWidth-BiColorTextWidth(Canvas,s)) div 2,
+          ClientHeight-3-36, s); }
+      end
+      else
       begin
-      Fill(Offscreen.Canvas,
-        xm-xSizeBig div 2+RingPosition[i,0]-3,
-        ym-ySizeBig div 2+RingPosition[i,1]-3,
-        xSizeBig+6, ySizeBig+6,
-        (wMaintexture-ClientWidth) div 2,(hMaintexture-ClientHeight) div 2);
-      DarkIcon(i);
-      end;
-    -2: // destroyed
-      begin
-      HaveWonder:=true;
-      Glow(i,$000000);
-      BitBlt(Offscreen.Canvas.Handle, xm-xSizeBig div 2+RingPosition[i,0],
-        ym-ySizeBig div 2+RingPosition[i,1], xSizeBig, ySizeBig,
-        BigImp.Canvas.Handle, 0, (SystemIconLines+3)*ySizeBig, SRCCOPY);
-      end;
-    else
-      begin
-      HaveWonder:=true;
-      if MyRO.Wonder[i].EffectiveOwner>=0 then
-        Glow(i,Tribe[MyRO.Wonder[i].EffectiveOwner].Color)
-      else Glow(i,$000000);
-      BitBlt(Offscreen.Canvas.Handle, xm-xSizeBig div 2+RingPosition[i,0],
-        ym-ySizeBig div 2+RingPosition[i,1], xSizeBig, ySizeBig,
-        BigImp.Canvas.Handle, (i mod 7)*xSizeBig,
-        (i div 7+SystemIconLines)*ySizeBig, SRCCOPY);
-      end
-    end
-  end;
-
-if not HaveWonder then
-  begin
-  s:=Phrases.Lookup('NOWONDER');
-  RisedTextout(Offscreen.Canvas,xm-BiColorTextWidth(Offscreen.Canvas,s) div 2,
-    ym-Offscreen.Canvas.TextHeight(s) div 2, s);
-  end;
-
-MarkUsedOffscreen(ClientWidth,ClientHeight);
-end; {OffscreenPaint}
-
-procedure TWondersDlg.CloseBtnClick(Sender: TObject);
-begin
-Close
-end;
-
-procedure TWondersDlg.FormMouseMove(Sender: TObject; Shift: TShiftState; X,
-  Y: Integer);
-var
-i,OldSelection: integer;
-s: string;
-begin
-OldSelection:=Selection;
-Selection:=-1;
-for i:=0 to 20 do
-  if (Imp[i].Preq<>preNA) and (x>=xm-xSizeBig div 2+RingPosition[i,0])
-    and (x<xm+xSizeBig div 2+RingPosition[i,0])
-    and (y>=ym-ySizeBig div 2+RingPosition[i,1])
-    and (y<ym+ySizeBig div 2+RingPosition[i,1]) then
-    begin Selection:=i; break end;
-if Selection<>OldSelection then
-  begin
-  Fill(Canvas,9,ClientHeight-3-46,ClientWidth-18,44,
-    (wMaintexture-ClientWidth) div 2,(hMaintexture-ClientHeight) div 2);
-  if Selection>=0 then
-    begin
-    if MyRO.Wonder[Selection].CityID=-1 then
-      begin // not built yet
-{      s:=Phrases.Lookup('IMPROVEMENTS',Selection);
-      Canvas.Font.Color:=$000000;
-      Canvas.TextOut(
-        (ClientWidth-BiColorTextWidth(Canvas,s)) div 2+1,
-        ClientHeight-3-36+1, s);
-      Canvas.Font.Color:=MainTexture.clBevelLight;
-      Canvas.TextOut(
-        (ClientWidth-BiColorTextWidth(Canvas,s)) div 2,
-        ClientHeight-3-36, s);}
-      end
-    else
-      begin
-      s:=Phrases.Lookup('IMPROVEMENTS',Selection);
-      if MyRO.Wonder[Selection].CityID<>-2 then
-        s:=Format(Phrases.Lookup('WONDEROF'),
-          [s,CityName(MyRO.Wonder[Selection].CityID)]);
-      LoweredTextOut(Canvas, -1, MainTexture, (ClientWidth-BiColorTextWidth(Canvas,s)) div 2,
-        ClientHeight-3-36-10, s);
-      if MyRO.Wonder[Selection].CityID=-2 then
-        s:=Phrases.Lookup('DESTROYED')
-      else if MyRO.Wonder[Selection].EffectiveOwner<0 then
-        s:=Phrases.Lookup('EXPIRED')
-      else s:=Tribe[MyRO.Wonder[Selection].EffectiveOwner].TPhrase('WONDEROWNER');
-      LoweredTextOut(Canvas, -1, MainTexture, (ClientWidth-BiColorTextWidth(Canvas,s)) div 2,
-        ClientHeight-3-36+10, s);
+        s := Phrases.Lookup('IMPROVEMENTS', Selection);
+        if MyRO.Wonder[Selection].CityID <> -2 then
+          s := Format(Phrases.Lookup('WONDEROF'),
+            [s, CityName(MyRO.Wonder[Selection].CityID)]);
+        LoweredTextOut(Canvas, -1, MainTexture,
+          (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
+          ClientHeight - 3 - 36 - 10, s);
+        if MyRO.Wonder[Selection].CityID = -2 then
+          s := Phrases.Lookup('DESTROYED')
+        else if MyRO.Wonder[Selection].EffectiveOwner < 0 then
+          s := Phrases.Lookup('EXPIRED')
+        else
+          s := Tribe[MyRO.Wonder[Selection].EffectiveOwner]
+            .TPhrase('WONDEROWNER');
+        LoweredTextOut(Canvas, -1, MainTexture,
+          (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
+          ClientHeight - 3 - 36 + 10, s);
       end
     end;
@@ -288 +304 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-if Selection>=0 then
-  HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Selection);
+  if Selection >= 0 then
+    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Selection);
 end;
 
 end.
-