Changeset 676 for trunk/LocalPlayer

Timestamp:

Jul 26, 2025, 1:44:34 PM (4 days ago)

Author:

chronos

Message:

• Added: Allow to switch music on/off from game window main menu.

Location:

trunk/LocalPlayer

Files:

• Term.lfm (modified) (1 diff)
• Term.pas (modified) (7 diffs)

trunk/LocalPlayer/Term.lfm

@@ -470 +470 @@
         end
       end
+      object mMusic: TMenuItem
+        Tag = 103
+        object mMusicOn: TMenuItem
+          Tag = 104
+          Caption = 'mMusicOn'
+          RadioItem = True
+          OnClick = mMusicOnClick
+        end
+        object mMusicOff: TMenuItem
+          Tag = 105
+          RadioItem = True
+          OnClick = mMusicOffClick
+        end
+      end
       object N6: TMenuItem
         Caption = '-'

trunk/LocalPlayer/Term.pas

@@ -12 +12 @@
 {$ENDIF}
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
-  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, Math,
+  LCLIntf, LCLType, Menus, SysUtils, Classes, DrawDlg, Types, Math,
   DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area, Help,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
@@ -33 +33 @@
   TMainScreen = class(TDrawDlg)
     mBigTiles: TMenuItem;
+    mMusicOff: TMenuItem;
+    mMusicOn: TMenuItem;
+    mMusic: TMenuItem;
     mFillMap: TMenuItem;
     mNextUnit: TMenuItem;
@@ -212 +215 @@
     procedure mLoadClick(Sender: TObject);
     procedure mmineClick(Sender: TObject);
+    procedure mMusicOffClick(Sender: TObject);
+    procedure mMusicOnClick(Sender: TObject);
     procedure mNationsClick(Sender: TObject);
     procedure mNextUnitClick(Sender: TObject);
@@ -431 +436 @@
     procedure PaintZoomedTile(Dst: TBitmap; X, Y, Loc: Integer);
     procedure UpdateInterface;
+    procedure UpdateMusic;
   public
     UsedOffscreenWidth: Integer;
@@ -1132 +1138 @@
   mFillMap.Enabled := BrushType in [fShore, fGrass, fTundra, fPrairie, fDesert, fSwamp, fForest,
     fHills, fMountains, fArctic];
+end;
+
+procedure TMainScreen.UpdateMusic;
+begin
+  if MusicEnabled then begin
+    MusicPlayer.Volume := MusicVolume;
+    if not MusicPlayer.Playing then begin
+      MusicPlayer.LoadPlaylistFromDir(GetMusicDir);
+      MusicPlayer.RandomizePlaylist;
+      if MusicPlayer.Playlist.Count > 0 then MusicPlayer.Play;
+    end;
+  end else begin
+    if MusicPlayer.Playing then MusicPlayer.Stop;
+  end;
 end;
 
@@ -3926 +3946 @@
     with TUn(MyUn[UnFocus]) do
       DoJob(jMine);
+end;
+
+procedure TMainScreen.mMusicOffClick(Sender: TObject);
+begin
+  MusicEnabled := False;
+  UpdateMusic;
+end;
+
+procedure TMainScreen.mMusicOnClick(Sender: TObject);
+begin
+  MusicEnabled := True;
+  UpdateMusic;
 end;
 
@@ -7494 +7526 @@
       end;
 
+      mMusicOn.Checked := MusicEnabled;
+      mMusicOff.Checked := not MusicEnabled;
+
       for I := 0 to nTestFlags - 1 do
         mManip[I].Checked := MyRO.TestFlags and (1 shl I) <> 0;