Changeset 321 for trunk

Timestamp:

Mar 22, 2021, 10:51:43 PM (4 years ago)

Author:

chronos

Message:

• Added: Allow to switch between three tile sizes by mouse wheel over map to perform zoom in or zoom out.

Location:

trunk

Files:

• Language.txt (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (4 diffs)
• LocalPlayer/Term.lfm (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (15 diffs)
• Localization/cs/Language.txt (modified) (1 diff)
• Localization/de/Language.txt (modified) (2 diffs)
• Localization/it/Language.txt (modified) (2 diffs)
• Localization/ru/Language.txt (modified) (2 diffs)
• Localization/zh-Hans/language.txt (modified) (2 diffs)
• Localization/zh-Hant/language.txt (modified) (2 diffs)

trunk/Language.txt

@@ -542 +542 @@
 Patrols, Attacks and Captures Only
 Tile Size
+Small
+Medium
+Big
 
 #ADVANCES

trunk/LocalPlayer/IsoEngine.pas

@@ -77 +77 @@
 function IsJungle(y: integer): boolean;
 procedure Init(InitEnemyModelHandler: TInitEnemyModelEvent);
-function ApplyTileSize(xxtNew, yytNew: integer): boolean;
+function ApplyTileSize(ATileSize: TTileSize): boolean;
 procedure Done;
 procedure Reset;
@@ -137 +137 @@
 end;
 
-function ApplyTileSize(xxtNew, yytNew: integer): boolean;
+function ApplyTileSize(ATileSize: TTileSize): boolean;
 var
   i: Integer;
@@ -151 +151 @@
   MaskLine: array [0 .. 50 * 3 - 1] of TPixelPointer; // 32 = assumed maximum for yyt
   Border: boolean;
-begin
+  xxtNew: Integer;
+  yytNew: Integer;
+begin
+  xxtNew := TileSizes[ATileSize].X;
+  yytNew := TileSizes[ATileSize].Y;
   result := false;
   HGrTerrainNew := LoadGraphicSet(Format('Terrain%dx%d.png',
@@ -163 +167 @@
   xxt := xxtNew;
   yyt := yytNew;
+  TileSize := ATileSize;
   HGrTerrain := HGrTerrainNew;
   HGrCities := HGrCitiesNew;

trunk/LocalPlayer/Term.lfm

@@ -446 +446 @@
         GroupIndex = 1
         object mSmallTiles: TMenuItem
-          Caption = '40px'
+          Tag = 97
           RadioItem = True
           OnClick = mSmallTilesClick
         end
         object mNormalTiles: TMenuItem
-          Caption = '60px'
+          Tag = 98
           RadioItem = True
           OnClick = mNormalTilesClick
         end
         object mBigTiles: TMenuItem
-          Caption = '90px'
+          Tag = 99
           RadioItem = True
           OnClick = mBigTilesClick

trunk/LocalPlayer/Term.pas

@@ -19 +19 @@
   WM_EOT = WM_USER;
 
-  pltsNormal = 0;
-  pltsBlink = 1;
-
 type
+  TPaintLocTempStyle = (pltsNormal, pltsBlink);
+  TTileSize = (tsSmall, tsMedium, tsBig);
 
   { TMainScreen }
@@ -257 +256 @@
     procedure PaintLoc(Loc: integer; Radius: integer = 0);
     procedure PaintLoc_BeforeMove(FromLoc: integer);
-    procedure PaintLocTemp(Loc: integer; Style: integer = pltsNormal);
+    procedure PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle = pltsNormal);
     procedure PaintBufferToScreen(xMap, yMap, width, height: integer);
     procedure PaintDestination;
@@ -277 +276 @@
     procedure SetViewpoint(p: integer);
     function LocationOfScreenPixel(x, y: integer): integer;
-    procedure SetTileSize(x, y: integer);
+    procedure SetTileSize(TileSize: TTileSize);
     procedure RectInvalidate(Left, Top, Rigth, Bottom: integer);
     procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
@@ -312 +311 @@
     FileName: ShortString;
   end;
+
   TCityNameInfo = record
     ID: integer;
     NewName: ShortString;
   end;
+
   TModelNameInfo = record
     mix: integer;
     NewName: ShortString;
   end;
+
   TPriceSet = Set of $00 .. $FF;
 
@@ -413 +415 @@
   sbTurn = $10;
   sbAll = $FF;
+
+  TileSizes: array [TTileSize] of TPoint = ((X: 33; Y: 16), (X: 48; Y: 24), (X: 72; Y: 36));
 
 type
@@ -434 +438 @@
   AdvIcon: array [0 .. nAdv - 1] of Integer;
   { icons displayed with the technologies }
-  xxt, yyt, // half of tile size x/y
+  xxt: Integer; // half of tile size x/y
+  yyt: Integer; // half of tile size x/y
+  TileSize: TTileSize;
   GameMode: Integer;
   ClientMode: Integer;
@@ -1606 +1612 @@
       MiniColors[x, y] := HGrSystem.Data.Canvas.Pixels[66 + x, 67 + y];
   IsoEngine.Init(InitEnemyModel);
-  if not IsoEngine.ApplyTileSize(xxt, yyt) and ((xxt <> 48) or (yyt <> 24) or (xxt <> 72))
-  then
-    ApplyTileSize(48, 24);
+  if not IsoEngine.ApplyTileSize(TileSize) and (TileSize <> tsMedium) then
+    ApplyTileSize(tsMedium);
   // non-default tile size is missing a file, switch to default
   MainMap := TIsoMap.Create;
@@ -3537 +3542 @@
     PanelPaint;
     Update;
+  end else begin
+    if (WheelDelta > 0) and (TileSize < High(TTileSize)) then SetTileSize(Succ(TileSize))
+    else if (WheelDelta < 0) and (TileSize > Low(TTileSize)) then SetTileSize(Pred(TileSize));
   end;
 end;
@@ -3981 +3989 @@
 end;
 
-procedure TMainScreen.PaintLocTemp(Loc: integer; Style: integer);
+procedure TMainScreen.PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle);
 var
   y0, x0, xMap, yMap: integer;
@@ -7295 +7303 @@
         end;
     end;
-    mSmallTiles.Checked := xxt = 33;
-    mNormalTiles.Checked := xxt = 48;
-    mBigTiles.Checked := xxt = 72;
+    mSmallTiles.Checked := TileSize = tsSmall;
+    mNormalTiles.Checked := TileSize = tsMedium;
+    mBigTiles.Checked := TileSize = tsBig;
   end
   else if Popup = StatPopup then
@@ -7759 +7767 @@
   with Reg do try
     OpenKey(AppRegistryKey, False);
-    if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2
-      else xxt := 48;
-    if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2
-      else yyt := 24;
+    if ValueExists('TileSize') then TileSize := TTileSize(ReadInteger('TileSize'))
+      else TileSize := tsMedium;
+    xxt := TileSizes[TileSize].X;
+    yyt := TileSizes[TileSize].Y;
     if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
       else OptionChecked := DefaultOptionChecked;
@@ -7991 +7999 @@
 procedure TMainScreen.mSmallTilesClick(Sender: TObject);
 begin
-  SetTileSize(33, 16);
+  SetTileSize(tsSmall);
 end;
 
 procedure TMainScreen.mNormalTilesClick(Sender: TObject);
 begin
-  SetTileSize(48, 24);
+  SetTileSize(tsMedium);
 end;
 
 procedure TMainScreen.mBigTilesClick(Sender: TObject);
 begin
-  SetTileSize(72, 36);
-end;
-
-procedure TMainScreen.SetTileSize(x, y: integer);
+  SetTileSize(tsBig);
+end;
+
+procedure TMainScreen.SetTileSize(TileSize: TTileSize);
 var
   i, CenterLoc: integer;
@@ -8010 +8018 @@
   CenterLoc := (xw + MapWidth div (xxt * 4)) mod G.lx +
     (yw + MapHeight div (yyt * 2)) * G.lx;
-  IsoEngine.ApplyTileSize(x, y);
+  IsoEngine.ApplyTileSize(TileSize);
   FormResize(nil);
   Centre(CenterLoc);
@@ -8036 +8044 @@
   try
     OpenKey(AppRegistryKey, true);
-    WriteInteger('TileWidth', xxt * 2);
-    WriteInteger('TileHeight', yyt * 2);
+    WriteInteger('TileSize', Integer(TileSize));
     WriteInteger('OptionChecked', OptionChecked);
     WriteInteger('MapOptionChecked', MapOptionChecked);
@@ -8061 +8068 @@
 
 end.
+

trunk/Localization/cs/Language.txt

@@ -542 +542 @@
 Pouze hlídkování, útoky a obsazení
 Velikost políčka
+Malá
+Střední
+Velká
 
 #ADVANCES

trunk/Localization/de/Language.txt

@@ -551 +551 @@
 Nur Angriffe und Eroberungen
 Tile Size
+Small
+Medium
+Big
 
 #ADVANCES
@@ -963 +966 @@
 #SETTINGS
 Full screen
+Gamma
+Restart is needed to apply changes

trunk/Localization/it/Language.txt

@@ -532 +532 @@
 Solo pattuglie, attacchi e conquiste
 Dimensione casella
+Small
+Medium
+Big
 
 #ADVANCES
@@ -935 +938 @@
 #SETTINGS
 Full screen
+Gamma
+Restart is needed to apply changes

trunk/Localization/ru/Language.txt

@@ -558 +558 @@
 Только военные действия
 Размер секции
+Small
+Medium
+Big
 
 #ADVANCES
@@ -970 +973 @@
 #SETTINGS
 Full screen
+Gamma
+Restart is needed to apply changes

trunk/Localization/zh-Hans/language.txt

@@ -550 +550 @@
 Ö»ÏÔʾѲÂß¡¢¹¥»÷¼°Õ¼ÁìÐж¯
 µØ¿é³ß´ç
+Small
+Medium
+Big
 
 #ADVANCES
@@ -962 +965 @@
 #SETTINGS
 Full screen
+Gamma
+Restart is needed to apply changes

trunk/Localization/zh-Hant/language.txt

@@ -550 +550 @@
 ¥uÅã¥Ü¨µÅÞ¡B§ðÀ»¤Î¥e»â¦æ°Ê
 ¦a¶ô¤Ø¤o
+Small
+Medium
+Big
 
 #ADVANCES
@@ -962 +965 @@
 #SETTINGS
 Full screen
+Gamma
+Restart is needed to apply changes