Changeset 52 for trunk/UEngine.pas

Timestamp:

Dec 20, 2021, 7:47:26 PM (2 years ago)

Author:

chronos

Message:

• Modified: Renamed forms to start their name with Form prefix.
• Fixed: Drawing game scene.

File:

• trunk/UEngine.pas (modified) (7 diffs)

trunk/UEngine.pas

@@ -823 +823 @@
 begin
   with Engine.FBitmapLower do begin
-    //Brush.Color := SurfaceMatterColors[smRock];
-    //FillRect(ScreenFrame);
-    for Y := ScreenFrame.Top to ScreenFrame.Bottom - 1 do
-      for X := ScreenFrame.Left to ScreenFrame.Right - 1 do begin
-        ItemsXY[X, Y] := 0;
-      end;
-
     Fill(CreateIndex(ScreenFrame.Left, ScreenFrame.Top),
       CreateIndex(ScreenFrame.Width, ScreenFrame.Height),
       Engine.World.Matters[Integer(miRock)].Color);
-
 
     with Engine.World do
@@ -861 +853 @@
     for I := ScreenFrame.Left to ScreenFrame.Right - 1 do
       ItemsXY[I, 0] := $010101 * I;
-
-      for Y := ScreenFrame.Top to ScreenFrame.Bottom - 1 do
-      for X := ScreenFrame.Left to ScreenFrame.Right - 1 do begin
-        ItemsXY[X, Y] := 0;
-      end;
   end;
 end;
@@ -1210 +1197 @@
   BgColor: Cardinal;
 begin
-  if Assigned(FBitmap) then
+  if Assigned(FBitmap) then begin
+  Lock.Acquire;
+  Bitmap.BeginUpdate;
   try
-    Lock.Acquire;
-    Bitmap.BeginUpdate;
     {$IFDEF WINDOWS}
     Bitmap.PixelFormat := pf32bit;
@@ -1221 +1208 @@
     BytePerRow := RawImage.Description.BytesPerLine;
     if ClearBackground then begin
-      BgColor := TMatter(World.Matters[Integer(miBorder)]).Color;
+      BgColor := World.Matters[Integer(miBorder)].Color;
       BgColor := SwapBRComponent(BgColor);
       FillDWord(RawImage.Data^, Bitmap.Height * BytePerRow div 4, BgColor);
@@ -1281 +1268 @@
     end;
   finally
-    FBitmap.EndUpdate;
+    Bitmap.EndUpdate;
     Lock.Release;
+  end;
   end;
 end;
@@ -1594 +1582 @@
   I: Integer;
   DrawStart: TDateTime;
+  OldCount: TBitmapTColorIndex;
 begin
   if FRedrawPending then begin
@@ -1600 +1589 @@
     Lock.Acquire;
     try
-      //if ClearBackground then FBitmapLower.FillAll(clNavy);
+      // TODO: Without this (re)initialization we get range error
+      OldCount := FBitmapLower.Count;
+      FBitmapLower.Count := FBitmapLower.CreateIndex(0, 0);
+      FBitmapLower.Count := OldCount;
+
+      if ClearBackground then FBitmapLower.FillAll(clNavy);
       for I := 0 to Players.Count - 1 do
       if Players[I].Enabled then begin