Changeset 227

Timestamp:

May 14, 2020, 9:31:00 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Wrong timeout calculation in movie mode.
• Fixed: City dialog sound index out of range.

Location:

trunk

Files:

• Database.pas (modified) (2 diffs)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (3 diffs)

trunk/Database.pas

@@ -29 +29 @@
 
   CityOwnTile = 13;
+
+type
+  TGameMode = (moLoading_Fast, moLoading, moMovie, moPlaying);
 
 var
@@ -45 +48 @@
   GTurn: Integer; { current turn }
   GTestFlags: Integer;
-  Mode: (moLoading_Fast, moLoading, moMovie, moPlaying);
+  Mode: TGameMode;
   GWonder: array [0 .. 27] of TWonderInfo;
   ServerVersion: array [0 .. nPl - 1] of integer;

trunk/LocalPlayer/CityScreen.pas

@@ -1657 +1657 @@
   end
   else
+  if OpenSoundEvent >= 0 then
     Play(CityEventSoundItem[OpenSoundEvent]);
   OpenSoundEvent := -2;

trunk/LocalPlayer/MessgEx.pas

@@ -212 +212 @@
         Sleep(1);
         Ticks := NowPrecise;
-      until MovieCancelled or (MillisecondOf(Ticks - Ticks0) >= 1500);
+      until MovieCancelled or (Round((Ticks - Ticks0) / OneMillisecond) >= 1500);
       Hide;
     end;
@@ -373 +373 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
+        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+        Buffer.Canvas.FillRect(0, 0, 1, 1);
         BitBltCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
           ySizeBig + 2 * GlowRange, Canvas,

trunk/LocalPlayer/Term.pas

@@ -6080 +6080 @@
       NoMap.PaintUnit(xMoving - xMin, yMoving - yMin, UnitInfo, 0);
       PaintBufferToScreen(xMin, yMin, xRange, yRange);
+      {$IFDEF LINUX}
+      // TODO: Force animation under linux
+      Application.ProcessMessages;
+      {$ENDIF}
 
       SliceCount := 0;
@@ -6085 +6089 @@
       repeat
         if (SliceCount = 0) or
-          (MillisecondOf(Ticks - Ticks0) * 12 * (SliceCount + 1) div SliceCount
+          (Round(((Ticks - Ticks0) * 12) / OneMillisecond) * (SliceCount + 1) div SliceCount
           < MoveTime) then
         begin
           if not idle or (GameMode = cMovie) then
             Application.ProcessMessages;
-          {$IFDEF LINUX}
-          // TODO: Force animation under linux
-          Application.ProcessMessages;
-          {$ENDIF}
           Sleep(1);
           inc(SliceCount)
         end;
         Ticks := NowPrecise;
-      until (Ticks - Ticks0) / OneMillisecond * 12 >= MoveTime;
+      until (((Ticks - Ticks0) * 12) / OneMillisecond) >= MoveTime;
       Ticks0 := Ticks
     end;
@@ -6539 +6539 @@
           time1 := NowPrecise;
           SimpleMessage(Format('Map repaint time: %.3f ms',
-            [MillisecondOf(time1 - time0)]));
+            [(time1 - time0) / OneMillisecond]));
         end
     end