dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't save matchsettings when loading a savegame

Browse source 
When loading a savegame more settings are loaded then normally. Thous
settings (such as TriggerScripts) can't be changed from the
matchsetting-screen.
With this commit the saved matchsettings.mp.json isn't overritten when
loading a savegame.

Fixes: #7632
This commit is contained in:
phosit 2025-09-25 19:56:27 +02:00 committed by Phosit
parent ea12766834
commit 3a6540110b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js
View file

@ -7,6 +7,7 @@ class GameSettingsController
{
this.setupWindow = setupWindow;
this.mapCache = mapCache;
this.isSavedGame = isSavedGame;
this.persistentMatchSettings = new PersistentMatchSettings(g_IsNetworked);
this.guiData = new GameSettingsGuiData();
@ -25,7 +26,7 @@ class GameSettingsController
this.loadingChangeHandlers = new Set();
this.settingsLoadedHandlers = new Set();
setupWindow.registerLoadHandler(this.onLoad.bind(this, isSavedGame));
setupWindow.registerLoadHandler(this.onLoad.bind(this));
setupWindow.registerGetHotloadDataHandler(this.onGetHotloadData.bind(this));
setupWindow.registerClosePageHandler(this.onClose.bind(this));
@ -75,9 +76,9 @@ class GameSettingsController
this.settingsLoadedHandlers.add(handler);
}
onLoad(isSavedGame, initData, hotloadData)
onLoad(initData, hotloadData)
{
if (!isSavedGame)
if (!this.isSavedGame)
{
// This initial settings parsing in wrapped in a try-catch because it can fail unexpectedly,
// and particularly could fail with mods that change persistent settings, so this is
@ -314,7 +315,7 @@ class GameSettingsController
savePersistentMatchSettings()
{
if (g_IsController)
if (g_IsController && !this.isSavedGame)
// TODO: ought to only save a subset of settings.
this.persistentMatchSettings.saveFile(this.getSettings());
}