From 546450712d8e381321b4259bad7cd899213d756f Mon Sep 17 00:00:00 2001 From: EvilFactory Date: Thu, 10 Apr 2025 10:55:39 -0300 Subject: [PATCH] Fixed compiler errors --- .../ClientSource/Sounds/SoundPlayer.cs | 11 ----------- .../BarotraumaShared/Lua/DefaultLib/LibShared.lua | 3 ++- .../Lua/DefaultRegister/RegisterShared.lua | 3 ++- .../SharedSource/Events/Missions/PirateMission.cs | 4 ---- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundPlayer.cs b/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundPlayer.cs index 825ede7f0..d8c37f0ff 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundPlayer.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundPlayer.cs @@ -709,17 +709,6 @@ namespace Barotrauma } } - bool muteBackgroundMusic = false; - for (int i = 0; i < SoundManager.SourceCount; i++) - { - SoundChannel playingSoundChannel = GameMain.SoundManager.GetSoundChannelFromIndex(SoundManager.SourcePoolIndex.Default, i); - if (playingSoundChannel is { MuteBackgroundMusic: true, IsPlaying: true }) - { - muteBackgroundMusic = true; - break; - } - } - int activeTrackCount = targetMusic.Count(m => m != null); for (int i = 0; i < MaxMusicChannels; i++) { diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua index 7f0536555..1fde8456b 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibShared.lua @@ -148,7 +148,8 @@ defaultLib["AIObjectiveCleanupItem"] = CreateStatic("Barotrauma.AIObjectiveClean defaultLib["AIObjectiveCleanupItems"] = CreateStatic("Barotrauma.AIObjectiveCleanupItems", true) defaultLib["AIObjectiveCombat"] = CreateStatic("Barotrauma.AIObjectiveCombat", true) defaultLib["AIObjectiveContainItem"] = CreateStatic("Barotrauma.AIObjectiveContainItem", true) -defaultLib["AIObjectiveDecontainItem"] = CreateStatic("Barotrauma.AIObjectiveDecontainItem", true) +defaultLib["AIObjectiveDeconstructItem"] = CreateStatic("Barotrauma.AIObjectiveDeconstructItem", true) +defaultLib["AIObjectiveDeconstructItems"] = CreateStatic("Barotrauma.AIObjectiveDeconstructItems", true) defaultLib["AIObjectiveEscapeHandcuffs"] = CreateStatic("Barotrauma.AIObjectiveEscapeHandcuffs", true) defaultLib["AIObjectiveExtinguishFire"] = CreateStatic("Barotrauma.AIObjectiveExtinguishFire", true) defaultLib["AIObjectiveExtinguishFires"] = CreateStatic("Barotrauma.AIObjectiveExtinguishFires", true) diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua index a3603fe58..fc5ee9b2c 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua @@ -282,7 +282,8 @@ RegisterBarotrauma("AIObjectiveCleanupItem") RegisterBarotrauma("AIObjectiveCleanupItems") RegisterBarotrauma("AIObjectiveCombat") RegisterBarotrauma("AIObjectiveContainItem") -RegisterBarotrauma("AIObjectiveDecontainItem") +RegisterBarotrauma("AIObjectiveDeconstructItem") +RegisterBarotrauma("AIObjectiveDeconstructItems") RegisterBarotrauma("AIObjectiveEscapeHandcuffs") RegisterBarotrauma("AIObjectiveExtinguishFire") RegisterBarotrauma("AIObjectiveExtinguishFires") diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs index e03515c67..d22a6da82 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs @@ -22,10 +22,6 @@ namespace Barotrauma private Submarine enemySub; - private readonly Dictionary> characterStatusEffects = new Dictionary>(); - - private readonly Dictionary> characterStatusEffects = new Dictionary>(); - // Update the last sighting periodically so that the players can find the pirate sub even if they have lost the track of it. private readonly float pirateSightingUpdateFrequency = 30; private float pirateSightingUpdateTimer;