Changeset 73

Timestamp:

Jan 15, 2017, 4:12:10 PM (7 years ago)

Author:

chronos

Message:

• Modified: All graphics images converted from BMP to PNG.

Location:

trunk

Files:

• AI/StdAI.bmp (deleted)
• AI/StdAI.png (added)
• Back.pas (modified) (3 diffs)
• Graphics/Background.bmp (deleted)
• Graphics/Background.png (added)
• Graphics/BigCityMap.bmp (deleted)
• Graphics/BigCityMap.png (added)
• Graphics/Cities66x32.bmp (deleted)
• Graphics/Cities66x32.png (added)
• Graphics/Cities96x48.bmp (deleted)
• Graphics/Cities96x48.png (added)
• Graphics/City.bmp (deleted)
• Graphics/City.png (added)
• Graphics/Colors.bmp (deleted)
• Graphics/Colors.png (added)
• Graphics/Icons.bmp (deleted)
• Graphics/Icons.png (added)
• Graphics/MiliRes.bmp (deleted)
• Graphics/MiliRes.png (added)
• Graphics/Nation.bmp (deleted)
• Graphics/Nation.png (added)
• Graphics/Nation1.bmp (deleted)
• Graphics/Nation1.png (added)
• Graphics/Nation2.bmp (deleted)
• Graphics/Nation2.png (added)
• Graphics/SmallCityMap.bmp (deleted)
• Graphics/SmallCityMap.png (added)
• Graphics/StdCities.bmp (deleted)
• Graphics/StdCities.png (added)
• Graphics/StdUnits.bmp (deleted)
• Graphics/StdUnits.png (added)
• Graphics/System.bmp (deleted)
• Graphics/System.png (added)
• Graphics/System2.bmp (deleted)
• Graphics/System2.png (added)
• Graphics/Templates.bmp (deleted)
• Graphics/Templates.png (added)
• Graphics/Terrain66x32.bmp (deleted)
• Graphics/Terrain66x32.png (added)
• Graphics/Terrain96x48.bmp (deleted)
• Graphics/Terrain96x48.png (added)
• Graphics/Unit.bmp (deleted)
• Graphics/Unit.png (added)
• Help/AITShot.bmp (deleted)
• Help/AITShot.png (added)
• Help/AdvTree.bmp (deleted)
• Help/AdvTree.png (added)
• Help/CityShot.bmp (deleted)
• Help/CityShot.png (added)
• Help/Corruption.bmp (deleted)
• Help/Corruption.png (added)
• Help/DraftShot.bmp (deleted)
• Help/DraftShot.png (added)
• Help/MoveShot.bmp (deleted)
• Help/MoveShot.png (added)
• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (2 diffs)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (4 diffs)
• LocalPlayer/Tribes.pas (modified) (5 diffs)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• Localization/cs/Help/CityShot.bmp (deleted)
• Localization/cs/Help/CityShot.png (added)
• Localization/cs/Help/DraftShot.bmp (deleted)
• Localization/cs/Help/DraftShot.png (added)
• Localization/de/Help/PanelShot.bmp (deleted)
• Localization/de/Help/PanelShot.png (added)
• ScreenTools.pas (modified) (9 diffs)
• Start.pas (modified) (4 diffs)

trunk/Back.pas

@@ -39 +39 @@
 begin
   img := nil;
-  if FullScreen then
-  begin
-    if FileExists(HomeDir + 'Graphics' + DirectorySeparator + 'Background.bmp') or
-      FileExists(HomeDir + 'Graphics' + DirectorySeparator + 'Background.png') then
-    begin
+  if FullScreen then begin
+    if FileExists(HomeDir + 'Graphics' + DirectorySeparator + 'Background.png') then begin
       img := TBitmap.Create;
-      LoadGraphicFile(img, HomeDir + 'Graphics' + DirectorySeparator + 'Background');
-    end
-  end
-  else
-  begin
+      LoadGraphicFile(img, HomeDir + 'Graphics' + DirectorySeparator + 'Background.png');
+    end;
+  end else begin
     WindowState := wsNormal;
     Width := StartDlg.Width + 16;
@@ -55 +50 @@
     Left := StartDlg.Left - 8;
     Top := StartDlg.Top - 8;
-  end
+  end;
 end;
 
@@ -75 +70 @@
 procedure TBackground.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  if img <> nil then
-  begin
+  if img <> nil then begin
     img.Free;
     img := nil

trunk/LocalPlayer/CityScreen.pas

@@ -10 +10 @@
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonA, ButtonC, Area;
+  ButtonA, ButtonC, Area, GraphType;
 
 const
@@ -217 +217 @@
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'City', gfNoGamma);
-  Template.PixelFormat := pf8bit;
+  Template.PixelFormat := pf24bit;
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'City.png', gfNoGamma);
   CityMapTemplate := TBitmap.Create;
-  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'BigCityMap', gfNoGamma);
-  CityMapTemplate.PixelFormat := pf8bit;
+  CityMapTemplate.PixelFormat := pf24bit;
+  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
   SmallCityMapTemplate := TBitmap.Create;
-  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'SmallCityMap',
+  SmallCityMapTemplate.PixelFormat := pf24bit;
+  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'SmallCityMap.png',
     gfNoGamma);
-  SmallCityMapTemplate.PixelFormat := pf24bit;
   SmallCityMap := TBitmap.Create;
   SmallCityMap.PixelFormat := pf24bit;

trunk/LocalPlayer/Draft.pas

@@ -91 +91 @@
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes', gfNoGamma);
-  Template.PixelFormat := pf8bit;
+  Template.PixelFormat := pf24bit;
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes.png', gfNoGamma);
 end;
 

trunk/LocalPlayer/Help.pas

@@ -968 +968 @@
           until (p > length(s)) or (s[p] = '\');
           if LoadGraphicFile(ExtPic, LocalizedFilePath('Help' +
-            DirectorySeparator + copy(s, 2, p - 2))) then
+            DirectorySeparator + copy(s, 2, p - 2)) + '.png') then
           begin
             MainText.AddLine('', pkExternal);

trunk/LocalPlayer/IsoEngine.pas

@@ -111 +111 @@
 begin
   result := false;
-  HGrTerrainNew := LoadGraphicSet(Format('Terrain%dx%d',
+  HGrTerrainNew := LoadGraphicSet(Format('Terrain%dx%d.png',
     [xxtNew * 2, yytNew * 2]));
   if HGrTerrainNew < 0 then
     exit;
-  HGrCitiesNew := LoadGraphicSet(Format('Cities%dx%d',
+  HGrCitiesNew := LoadGraphicSet(Format('Cities%dx%d.png',
     [xxtNew * 2, yytNew * 2]));
   if HGrCitiesNew < 0 then
@@ -334 +334 @@
   OceanMore.Free;
   DitherMask.Free;
-  //LandPatch.Savetofile('landpatch.bmp');
 
   // reduce size of terrain icons

trunk/LocalPlayer/NatStat.pas

@@ -92 +92 @@
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Nation', gfNoGamma);
-  Template.PixelFormat := pf8bit;
+  Template.PixelFormat := pf24bit;
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Nation.png', gfNoGamma);
 end;
 

trunk/LocalPlayer/TechTree.pas

@@ -128 +128 @@
   begin
     Image := TBitmap.Create;
-    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree', gfNoGamma);
     Image.PixelFormat := pf24bit;
+    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png', gfNoGamma);
 
     with Image.Canvas do

trunk/LocalPlayer/Term.pas

@@ -588 +588 @@
   SmallImp.EndUpdate;
   FreeMem(resampled);
-  // smallimp.savetofile(homedir+'smallimp.bmp'); //!!!
 end;
 
@@ -674 +673 @@
     with Tribe[p].ModelPicture[mix] do
     begin
-      HGr := LoadGraphicSet(Picture.GrName);
+      HGr := LoadGraphicSet(Picture.GrName + '.png');
       pix := Picture.pix;
     end;
@@ -1203 +1202 @@
     if AILogo[p] = nil then
       AILogo[p] := TBitmap.Create;
-    if not LoadGraphicFile(AILogo[p], HomeDir + Name, gfNoError) then
+    if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', gfNoError) then
     begin
       AILogo[p].free;
@@ -1467 +1466 @@
     MainMap.SetOutput(offscreen);
 
-    HGrStdUnits := LoadGraphicSet('StdUnits');
+    HGrStdUnits := LoadGraphicSet('StdUnits.png');
     SmallImp := TBitmap.Create;
     SmallImp.PixelFormat := pf24bit;

trunk/LocalPlayer/Tribes.pas

@@ -301 +301 @@
         Item := Get;
         sympix := GetNum;
-        symHGr := LoadGraphicSet(Item);
+        symHGr := LoadGraphicSet(Item + '.png');
       end
     end;
@@ -425 +425 @@
                   end
               end;
-            cHGr := LoadGraphicSet(Item);
+            cHGr := LoadGraphicSet(Item + '.png');
             for x := 0 to 3 do
               with CityPicture[x] do
@@ -445 +445 @@
           else
           begin
-            faceHGr := LoadGraphicSet(Item);
+            faceHGr := LoadGraphicSet(Item + '.png');
             facepix := GetNum;
             if GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
@@ -477 +477 @@
             dec(i);
           assert(i >= 0);
-          assert(PictureList[i].HGr = LoadGraphicSet(GrName));
+          assert(PictureList[i].HGr = LoadGraphicSet(GrName + '.png'));
           assert(PictureList[i].pix = pix);
           ModelPicture[mix].HGr := PictureList[i].HGr;
@@ -487 +487 @@
           with ModelPicture[mix] do
           begin
-            HGr := LoadGraphicSet(GrName);
+            HGr := LoadGraphicSet(GrName + '.png');
             pix := Info.pix;
             inc(GrExt[HGr].pixUsed[pix]);

trunk/LocalPlayer/UnitStat.pas

@@ -82 +82 @@
   Back.Canvas.FillRect(0, 0, Back.Width,Back.Height);
   Template := TBitmap.Create;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Unit', gfNoGamma);
-  Template.PixelFormat := pf8bit;
+  Template.PixelFormat := pf24bit;
+  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Unit.png', gfNoGamma);
 end;
 

trunk/ScreenTools.pas

@@ -9 +9 @@
   {$ENDIF}
   StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls,
-  Forms, Menus;
+  Forms, Menus, GraphType;
 
 type
@@ -42 +42 @@
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
-    procedure Init(Bitmap: TBitmap; BaseX: Integer = 0; BaseY: Integer = 0); inline;
+    procedure Init(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0); inline;
   end;
   PPixelPointer = ^TPixelPointer;
@@ -188 +188 @@
   gfNoError = $01;
   gfNoGamma = $02;
-  gfJPG = $04;
 
 type
@@ -411 +410 @@
 end;
 
+procedure ApplyGammaToBitmap(Bitmap: TBitmap);
+var
+  PixelPtr: TPixelPointer;
+  X, Y: Integer;
+begin
+  Bitmap.BeginUpdate;
+  PixelPtr.Init(Bitmap);
+  for Y := 0 to Bitmap.Height - 1 do begin
+    for X := 0 to Bitmap.Width - 1 do begin
+      PixelPtr.Pixel^.B := GammaLUT[PixelPtr.Pixel^.B];
+      PixelPtr.Pixel^.G := GammaLUT[PixelPtr.Pixel^.G];
+      PixelPtr.Pixel^.R := GammaLUT[PixelPtr.Pixel^.R];
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
+  end;
+  Bitmap.EndUpdate;
+end;
+
+procedure CopyGray8BitTo24bitBitmap(Dst, Src: TRasterImage);
+var
+  SrcPtr, DstPtr: TPixelPointer;
+  X, Y: Integer;
+begin
+  //Dst.SetSize(Src.Width, Src.Height);
+  SrcPtr.Init(Src);
+  DstPtr.Init(Dst);
+  for Y := 0 to Src.Height - 1 do begin
+    for X := 0 to Src.Width - 1 do begin
+      DstPtr.Pixel^.B := SrcPtr.Pixel^.B;
+      DstPtr.Pixel^.G := SrcPtr.Pixel^.B;
+      DstPtr.Pixel^.R := SrcPtr.Pixel^.B;
+      SrcPtr.NextPixel;
+      DstPtr.NextPixel;
+    end;
+    SrcPtr.NextLine;
+    DstPtr.NextLine;
+  end;
+end;
+
 function LoadGraphicFile(bmp: TBitmap; Path: string; Options: integer): boolean;
 var
-  PixelPtr: TPixelPointer;
   jtex: tjpegimage;
-  X, Y: Integer;
-begin
-  result := true;
-  if Options and gfJPG <> 0 then
-  begin
+  Png: TPortableNetworkGraphic;
+begin
+  Result := True;
+  if ExtractFileExt(Path) = '.jpg' then begin
     jtex := tjpegimage.create;
     try
-      jtex.loadfromfile(Path + '.jpg');
+      jtex.LoadFromFile(Path);
     except
-      result := false;
-    end;
-    if result then
-    begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-      bmp.Width := jtex.Width;
-      bmp.Height := jtex.Height;
-      bmp.Canvas.draw(0, 0, jtex);
+      Result := False;
+    end;
+    if result then begin
+      if Options and gfNoGamma = 0 then bmp.PixelFormat := pf24bit;
+      Bmp.SetSize(jtex.Width, jtex.Height);
+      Bmp.Canvas.Draw(0, 0, jtex);
     end;
     jtex.Free;
-  end
-  else
-  begin
+  end else
+  if ExtractFileExt(Path) = '.png' then begin
+    Png := TPortableNetworkGraphic.Create;
+    Png.PixelFormat := Bmp.PixelFormat;
     try
-      bmp.loadfromfile(Path + '.bmp');
+      Png.LoadFromFile(Path);
     except
-      result := false;
-    end;
-    if result then
-    begin
+      Result := False;
+    end;
+    if Result then begin
+      if Options and gfNoGamma = 0 then bmp.PixelFormat := pf24bit;
+      bmp.SetSize(Png.Width, Png.Height);
+      if (Png.RawImage.Description.Format = ricfGray) then begin
+        // LCL doesn't support 8-bit colors properly. Use 24-bit instead.
+        Bmp.PixelFormat := pf24bit;
+        CopyGray8BitTo24bitBitmap(Bmp, Png)
+      end else Bmp.Canvas.draw(0, 0, Png);
+    end;
+    Png.Free;
+  end else
+  if ExtractFileExt(Path) = '.bmp' then begin
+    try
+      bmp.LoadFromFile(Path);
+    except
+      Result := False;
+    end;
+    if Result then begin
       if Options and gfNoGamma = 0 then
         bmp.PixelFormat := pf24bit;
     end
-  end;
-  if not result then
-  begin
+  end else
+    raise Exception.Create('Unsupported image file type ' + ExtractFileExt(Path));
+
+  if not Result then begin
     if Options and gfNoError = 0 then
       Application.MessageBox(PChar(Format(Phrases.Lookup('FILENOTFOUND'),
         [Path])), 'C-evo', 0);
-    exit;
-  end;
+    Exit;
+  end;
+
   if (Options and gfNoGamma = 0) and (Gamma <> 100) then
-  begin
-    Bmp.BeginUpdate;
-    PixelPtr.Init(bmp);
-    for Y := 0 to Bmp.Height - 1 do begin
-      for X := 0 to Bmp.Width - 1 do begin
-        PixelPtr.Pixel^.B := GammaLUT[PixelPtr.Pixel^.B];
-        PixelPtr.Pixel^.G := GammaLUT[PixelPtr.Pixel^.G];
-        PixelPtr.Pixel^.R := GammaLUT[PixelPtr.Pixel^.R];
-        PixelPtr.NextPixel;
-      end;
-      PixelPtr.NextLine;
-    end;
-    Bmp.EndUpdate;
-  end
+    ApplyGammaToBitmap(Bmp);
 end;
 
@@ -484 +524 @@
     inc(i);
   result := i;
-  if i = nGrExt then
-  begin
-    FileName := HomeDir + 'Graphics' + DirectorySeparator + Name + '.bmp';
+  if i = nGrExt then begin
     Source := TBitmap.Create;
-    try
-      Source.LoadFromFile(FileName)
-    except
+    Source.PixelFormat := pf24bit;
+    FileName := HomeDir + 'Graphics' + DirectorySeparator + Name;
+    if not LoadGraphicFile(Source, FileName) then begin
       Result := -1;
-      Application.MessageBox(PChar(Format(Phrases.Lookup('FILENOTFOUND'),
-        [FileName])), 'C-evo', 0);
-      exit;
+      Exit;
     end;
 
@@ -501 +537 @@
 
     xmax := Source.Width - 1; // allows 4-byte access even for last pixel
-    if xmax > 970 then
-      xmax := 970;
+    if xmax > 970 then xmax := 970;
 
     GrExt[nGrExt].Data := Source;
@@ -1396 +1431 @@
           MainTextureAge := Age;
           LoadGraphicFile(Image, HomeDir + 'Graphics' + DirectorySeparator + 'Texture' +
-            IntToStr(Age + 1), gfJPG);
+            IntToStr(Age + 1) + '.jpg');
           clBevelLight := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelLight];
           clBevelShade := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelShade];
@@ -1442 +1477 @@
 end;
 
-procedure TPixelPointer.Init(Bitmap: TBitmap; BaseX: Integer = 0; BaseY: Integer = 0); inline;
+procedure TPixelPointer.Init(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0); inline;
 begin
   BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
@@ -1571 +1606 @@
 
   nGrExt := 0;
-  HGrSystem := LoadGraphicSet('System');
-  HGrSystem2 := LoadGraphicSet('System2');
-  Templates := TBitmap.create;
-  LoadGraphicFile(Templates, HomeDir + 'Graphics' + DirectorySeparator + 'Templates', gfNoGamma);
+  HGrSystem := LoadGraphicSet('System.png');
+  HGrSystem2 := LoadGraphicSet('System2.png');
+  Templates := TBitmap.Create;
   Templates.PixelFormat := pf24bit;
-  Colors := TBitmap.create;
-  LoadGraphicFile(Colors, HomeDir + 'Graphics' + DirectorySeparator + 'Colors');
-  Paper := TBitmap.create;
-  LoadGraphicFile(Paper, HomeDir + 'Graphics' + DirectorySeparator + 'Paper', gfJPG);
-  BigImp := TBitmap.create;
-  LoadGraphicFile(BigImp, HomeDir + 'Graphics' + DirectorySeparator + 'Icons');
-  MainTexture.Image := TBitmap.create;
+  LoadGraphicFile(Templates, HomeDir + 'Graphics' + DirectorySeparator + 'Templates.png', gfNoGamma);
+  Colors := TBitmap.Create;
+  Colors.PixelFormat := pf24bit;
+  LoadGraphicFile(Colors, HomeDir + 'Graphics' + DirectorySeparator + 'Colors.png');
+  Paper := TBitmap.Create;
+  Paper.PixelFormat := pf24bit;
+  LoadGraphicFile(Paper, HomeDir + 'Graphics' + DirectorySeparator + 'Paper.jpg');
+  BigImp := TBitmap.Create;
+  BigImp.PixelFormat := pf24bit;
+  LoadGraphicFile(BigImp, HomeDir + 'Graphics' + DirectorySeparator + 'Icons.png');
+  MainTexture.Image := TBitmap.Create;
   MainTextureAge := -2;
   ClickFrameColor := GrExt[HGrSystem].Data.Canvas.Pixels[187, 175];
-  InitOrnamentDone := false;
-  GenerateNames := true;
+  InitOrnamentDone := False;
+  GenerateNames := True;
 end;
 

trunk/Start.pas

@@ -330 +330 @@
 
   BrainPicture[0] := TBitmap.Create;
-  BrainPicture[0].width := 64;
-  BrainPicture[0].height := 64;
+  BrainPicture[0].SetSize(64, 64);
   BitBlt(BrainPicture[0].Canvas.Handle, 0, 0, 64, 64,
     GrExt[HGrSystem2].Data.Canvas.Handle, 1, 111, SRCCOPY);
   BrainPicture[1] := TBitmap.Create;
-  BrainPicture[1].width := 64;
-  BrainPicture[1].height := 64;
+  BrainPicture[1].SetSize(64, 64);
   BitBlt(BrainPicture[1].Canvas.Handle, 0, 0, 64, 64,
     GrExt[HGrSystem2].Data.Canvas.Handle, 66, 111, SRCCOPY);
   BrainPicture[2] := TBitmap.Create;
-  BrainPicture[2].width := 64;
-  BrainPicture[2].height := 64;
+  BrainPicture[2].SetSize(64, 64);
   BitBlt(BrainPicture[2].Canvas.Handle, 0, 0, 64, 64,
     GrExt[HGrSystem2].Data.Canvas.Handle, 131, 111, SRCCOPY);
   BrainPicture[3] := TBitmap.Create;
-  BrainPicture[3].width := 64;
-  BrainPicture[3].height := 64;
+  BrainPicture[3].SetSize(64, 64);
   BitBlt(BrainPicture[3].Canvas.Handle, 0, 0, 64, 64,
     GrExt[HGrSystem2].Data.Canvas.Handle, 131, 46, SRCCOPY);
-  for i := bixFirstAI to nBrain - 1 do
-  begin
+  for i := bixFirstAI to nBrain - 1 do begin
     BrainPicture[i] := TBitmap.Create;
-    if not LoadGraphicFile(BrainPicture[i], HomeDir + 'AI' + DirectorySeparator + Brain[i].FileName,
-      gfNoError) then
-    begin
+    if not LoadGraphicFile(BrainPicture[i], HomeDir + 'AI' + DirectorySeparator + Brain[i].FileName + '.png',
+      gfNoError) then begin
       BrainPicture[i].width := 64;
       BrainPicture[i].height := 64;
-      with BrainPicture[i].Canvas do
-      begin
+      with BrainPicture[i].Canvas do begin
         Brush.Color := $904830;
         FillRect(Rect(0, 0, 64, 64));
@@ -366 +359 @@
         Textout(32 - TextWidth(Brain[i].FileName) div 2,
           32 - TextHeight(Brain[i].FileName) div 2, Brain[i].FileName);
-      end
-    end
+      end;
+    end;
   end;
 
@@ -1168 +1161 @@
           MapFileName := List.Items[List.ItemIndex] + '.cevo map';
         if LoadGraphicFile(Mini, DataDir + 'Maps' + DirectorySeparator + Copy(MapFileName, 1,
-          Length(MapFileName) - 9), gfNoError) then
+          Length(MapFileName) - 9) + '.png', gfNoError) then
         begin
           if Mini.width div 2 > MaxWidthMapLogo then
@@ -1765 +1758 @@
         try // rename map picture
           AssignFile(f, DataDir + 'Maps'+ DirectorySeparator + List.Items[List.ItemIndex]
-            + '.bmp');
-          Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + '.bmp');
+            + '.png');
+          Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + '.png');
         except
         end;