Changeset 329 for trunk

Timestamp:

Mar 25, 2021, 3:30:05 PM (4 years ago)

Author:

chronos

Message:

• Modified: Use enumeration type for sound blocks for preload.

File:

• trunk/LocalPlayer/Term.pas (modified) (9 diffs)

trunk/LocalPlayer/Term.pas

@@ -22 +22 @@
   TPaintLocTempStyle = (pltsNormal, pltsBlink);
   TTileSize = (tsSmall, tsMedium, tsBig);
+
+  TSoundBlock = (sbStart, sbWonder, sbScience, sbContact, sbTurn);
+  TSoundBlocks = set of TSoundBlock;
 
   { TMainScreen }
@@ -315 +318 @@
     procedure OnScroll(var m: TMessage); message WM_VSCROLL;
     procedure OnEOT(var Msg: TMessage); message WM_EOT;
-    procedure SoundPreload(Check: integer);
+    procedure SoundPreload(Check: TSoundBlocks);
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
@@ -435 +438 @@
     'CITY_INVALIDTYPE');
 
-  // sound blocks for preload
-  sbStart = $01;
-  sbWonder = $02;
-  sbScience = $04;
-  sbContact = $08;
-  sbTurn = $10;
-  sbAll = $FF;
-
   TileSizes: array [TTileSize] of TPoint = ((X: 33; Y: 16), (X: 48; Y: 24),
     (X: 72; Y: 36));
@@ -494 +489 @@
   ScienceSum: Integer;
   TaxSum: Integer;
-  SoundPreloadDone: Integer;
+  SoundPreloadDone: TSoundBlocks;
   MarkCityLoc: Integer;
   HGrTerrain: TGraphicSet;
@@ -1362 +1357 @@
 end;
 
-procedure TMainScreen.SoundPreload(Check: integer);
+procedure TMainScreen.SoundPreload(Check: TSoundBlocks);
 const
   nStartBlock = 27;
@@ -1398 +1393 @@
   mi: TModelInfo;
 begin
-  if Check and sbStart and not SoundPreloadDone <> 0 then
-  begin
+  if (sbStart in Check) and not (sbStart in SoundPreloadDone) 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
+    SoundPreloadDone := SoundPreloadDone + [sbStart];
+  end;
+  if (sbWonder in Check) and not (sbWonder in SoundPreloadDone) then begin
     need := false;
     for i := 0 to nWonder - 1 do
       if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
         need := true;
-    if need then
-    begin
+    if need then begin
       for i := 0 to nWonderBlock - 1 do
         PreparePlay(WonderBlock[i]);
-      SoundPreloadDone := SoundPreloadDone or sbWonder;
+      SoundPreloadDone := SoundPreloadDone + [sbWonder];
     end;
   end;
-  if (Check and sbScience and not SoundPreloadDone <> 0) and
-    (MyRO.Tech[adScience] >= tsApplicable) then
-  begin
+  if ((sbScience in Check) and not (sbScience in SoundPreloadDone)) 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
+    SoundPreloadDone := SoundPreloadDone + [sbScience];
+  end;
+  if ((sbContact in Check) and not (sbContact in SoundPreloadDone)) 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
+    SoundPreloadDone := SoundPreloadDone + [sbContact];
+  end;
+  if sbTurn in Check then begin
     if MyRO.Happened and phShipComplete <> 0 then
       PreparePlay('MSG_YOUWIN');
@@ -1659 +1648 @@
   SmallImp.PixelFormat := pf24bit;
   InitSmallImp;
-  SoundPreloadDone := 0;
+  SoundPreloadDone := [];
   StartRunning := false;
   StayOnTop_Ensured := false;
@@ -1681 +1670 @@
     Icon: imRecycling), (Adv: adComputers; Icon: imResLab),
     (Adv: adSpaceFlight; Icon: woMIR));
+  sbAll = [sbStart, sbWonder, sbScience, sbContact, sbTurn];
 var
   p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1,
@@ -2618 +2608 @@
               FillChar(ToldTech, SizeOf(ToldTech), Byte(tsNA));
               if G.Difficulty[p1] > 0 then
-                SoundPreload(sbStart);
+                SoundPreload([sbStart]);
             end;