Silence autosave audio notification

PunkPun · pchote · commit 5c51f458f2e9 · 2026-02-22T17:17:59.000Z
diff --git a/OpenRA.Game/Network/Order.cs b/OpenRA.Game/Network/Order.cs
@@ -269,6 +269,11 @@ public static Order FromTargetString(string order, string targetString, bool isI
 			return new Order(order, null, false) { IsImmediate = isImmediate, TargetString = targetString };
 		}
 
+		public static Order FromTargetString(string order, string targetString, bool isImmediate, uint extraData)
+		{
+			return new Order(order, null, false) { IsImmediate = isImmediate, TargetString = targetString, ExtraData = extraData };
+		}
+
 		public static Order FromGroupedOrder(Order grouped, Actor subject)
 		{
 			return new Order(
diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs
@@ -211,7 +211,7 @@ internal static void ProcessOrder(OrderManager orderManager, World world, int cl
 
 				case "GameSaved":
 					foreach (var nsr in orderManager.World.WorldActor.TraitsImplementing<INotifyGameSaved>())
-						nsr.GameSaved(orderManager.World);
+						nsr.GameSaved(orderManager.World, order.ExtraData != 0);
 					break;
 
 				case "PauseGame":
diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
@@ -1056,7 +1056,7 @@ void InterpretServerOrder(Connection conn, Order o)
 								Directory.CreateDirectory(baseSavePath);
 
 							GameSave.Save(Path.Combine(baseSavePath, filename));
-							DispatchServerOrdersToClients(Order.FromTargetString("GameSaved", filename, true));
+							DispatchServerOrdersToClients(Order.FromTargetString("GameSaved", filename, true, o.ExtraData));
 						}
 
 						break;
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -373,7 +373,7 @@ public interface IWorldLoaded { void WorldLoaded(World w, WorldRenderer wr); }
 	public interface IPostWorldLoaded { void PostWorldLoaded(World w, WorldRenderer wr); }
 	public interface INotifyGameLoading { void GameLoading(World w); }
 	public interface INotifyGameLoaded { void GameLoaded(World w); }
-	public interface INotifyGameSaved { void GameSaved(World w); }
+	public interface INotifyGameSaved { void GameSaved(World w, bool isAutoSave); }
 
 	public interface IGameSaveTraitData
 	{
diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs
@@ -562,7 +562,7 @@ internal void OnClientDisconnected(int clientId)
 			}
 		}
 
-		public void RequestGameSave(string filename)
+		public void RequestGameSave(string filename, bool isAutosave)
 		{
 			// Allow traits to save arbitrary data that will be passed back via IGameSaveTraitData.ResolveTraitData
 			// at the end of the save restoration
@@ -580,7 +580,8 @@ public void RequestGameSave(string filename)
 				i++;
 			}
 
-			IssueOrder(Order.FromTargetString("CreateGameSave", filename, true));
+			var extraData = isAutosave ? 1u : 0u;
+			IssueOrder(Order.FromTargetString("CreateGameSave", filename, true, extraData));
 		}
 
 		public bool Disposing;
diff --git a/OpenRA.Mods.Common/Traits/World/AutoSave.cs b/OpenRA.Mods.Common/Traits/World/AutoSave.cs
@@ -80,7 +80,7 @@ void ITick.Tick(Actor self)
 
 			var dateTime = DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ", CultureInfo.InvariantCulture);
 			var fileName = $"{AutoSavePattern}{dateTime}{SaveFileExtension}";
-			self.World.RequestGameSave(fileName);
+			self.World.RequestGameSave(fileName, true);
 			ticksUntilAutoSave = GetTicksBetweenAutosaves(self);
 		}
 
diff --git a/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs b/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs
@@ -64,11 +64,13 @@ void INotifyGameLoaded.GameLoaded(World world)
 			}
 		}
 
-		void INotifyGameSaved.GameSaved(World world)
+		void INotifyGameSaved.GameSaved(World world, bool isAutosave)
 		{
 			if (!world.IsReplay)
 			{
-				Game.Sound.PlayNotification(world.Map.Rules, null, "Speech", info.SavedNotification, world.RenderPlayer?.Faction.InternalName);
+				if (!isAutosave)
+					Game.Sound.PlayNotification(world.Map.Rules, null, "Speech", info.SavedNotification, world.RenderPlayer?.Faction.InternalName);
+
 				TextNotificationsManager.AddTransientLine(null, info.SavedTextNotification);
 			}
 		}
diff --git a/OpenRA.Mods.Common/Widgets/Logic/GameSaveBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/GameSaveBrowserLogic.cs
@@ -377,7 +377,7 @@ void Save(World world)
 
 			void Inner()
 			{
-				world.RequestGameSave(filename);
+				world.RequestGameSave(filename, false);
 				Ui.CloseWindow();
 				onExit();
 			}

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,11 @@ public static Order FromTargetString(string order, string targetString, bool isI`
`269`	`269`	`return new Order(order, null, false) { IsImmediate = isImmediate, TargetString = targetString };`
`270`	`270`	`}`
`271`	`271`
	`272`	`+ public static Order FromTargetString(string order, string targetString, bool isImmediate, uint extraData)`
	`273`	`+ {`
	`274`	`+ return new Order(order, null, false) { IsImmediate = isImmediate, TargetString = targetString, ExtraData = extraData };`
	`275`	`+ }`
	`276`	`+`
`272`	`277`	`public static Order FromGroupedOrder(Order grouped, Actor subject)`
`273`	`278`	`{`
`274`	`279`	`return new Order(`
Original file line number	Diff line number	Diff line change
`@@ -1056,7 +1056,7 @@ void InterpretServerOrder(Connection conn, Order o)`
`1056`	`1056`	`Directory.CreateDirectory(baseSavePath);`
`1057`	`1057`
`1058`	`1058`	`GameSave.Save(Path.Combine(baseSavePath, filename));`
`1059`		`- DispatchServerOrdersToClients(Order.FromTargetString("GameSaved", filename, true));`
	`1059`	`+ DispatchServerOrdersToClients(Order.FromTargetString("GameSaved", filename, true, o.ExtraData));`
`1060`	`1060`	`}`
`1061`	`1061`
`1062`	`1062`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ public interface IWorldLoaded { void WorldLoaded(World w, WorldRenderer wr); }`
`373`	`373`	`public interface IPostWorldLoaded { void PostWorldLoaded(World w, WorldRenderer wr); }`
`374`	`374`	`public interface INotifyGameLoading { void GameLoading(World w); }`
`375`	`375`	`public interface INotifyGameLoaded { void GameLoaded(World w); }`
`376`		`- public interface INotifyGameSaved { void GameSaved(World w); }`
	`376`	`+ public interface INotifyGameSaved { void GameSaved(World w, bool isAutoSave); }`
`377`	`377`
`378`	`378`	`public interface IGameSaveTraitData`
`379`	`379`	`{`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ internal void OnClientDisconnected(int clientId)`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`
`565`		`- public void RequestGameSave(string filename)`
	`565`	`+ public void RequestGameSave(string filename, bool isAutosave)`
`566`	`566`	`{`
`567`	`567`	`// Allow traits to save arbitrary data that will be passed back via IGameSaveTraitData.ResolveTraitData`
`568`	`568`	`// at the end of the save restoration`
`@@ -580,7 +580,8 @@ public void RequestGameSave(string filename)`
`580`	`580`	`i++;`
`581`	`581`	`}`
`582`	`582`
`583`		`- IssueOrder(Order.FromTargetString("CreateGameSave", filename, true));`
	`583`	`+ var extraData = isAutosave ? 1u : 0u;`
	`584`	`+ IssueOrder(Order.FromTargetString("CreateGameSave", filename, true, extraData));`
`584`	`585`	`}`
`585`	`586`
`586`	`587`	`public bool Disposing;`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ void ITick.Tick(Actor self)`
`80`	`80`
`81`	`81`	`var dateTime = DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ", CultureInfo.InvariantCulture);`
`82`	`82`	`var fileName = $"{AutoSavePattern}{dateTime}{SaveFileExtension}";`
`83`		`- self.World.RequestGameSave(fileName);`
	`83`	`+ self.World.RequestGameSave(fileName, true);`
`84`	`84`	`ticksUntilAutoSave = GetTicksBetweenAutosaves(self);`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,13 @@ void INotifyGameLoaded.GameLoaded(World world)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- void INotifyGameSaved.GameSaved(World world)`
	`67`	`+ void INotifyGameSaved.GameSaved(World world, bool isAutosave)`
`68`	`68`	`{`
`69`	`69`	`if (!world.IsReplay)`
`70`	`70`	`{`
`71`		`- Game.Sound.PlayNotification(world.Map.Rules, null, "Speech", info.SavedNotification, world.RenderPlayer?.Faction.InternalName);`
	`71`	`+ if (!isAutosave)`
	`72`	`+ Game.Sound.PlayNotification(world.Map.Rules, null, "Speech", info.SavedNotification, world.RenderPlayer?.Faction.InternalName);`
	`73`	`+`
`72`	`74`	`TextNotificationsManager.AddTransientLine(null, info.SavedTextNotification);`
`73`	`75`	`}`
`74`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ void Save(World world)`
`377`	`377`
`378`	`378`	`void Inner()`
`379`	`379`	`{`
`380`		`- world.RequestGameSave(filename);`
	`380`	`+ world.RequestGameSave(filename, false);`
`381`	`381`	`Ui.CloseWindow();`
`382`	`382`	`onExit();`
`383`	`383`	`}`