[Scummvm-git-logs] scummvm branch-3-0 -> 839152c717135f508b8cfcf336dcd95f0647a6d7

[lephilousophe]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
839152c717 SCUMM: Fix HENetworkGameOptionsDialog layout not being defined


Commit: 839152c717135f508b8cfcf336dcd95f0647a6d7
    https://github.com/scummvm/scummvm/commit/839152c717135f508b8cfcf336dcd95f0647a6d7
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-01-01T21:46:16+01:00

Commit Message:
SCUMM: Fix HENetworkGameOptionsDialog layout not being defined

This happens when ENet is enabled but there is no basic net support.
Football and Baseball 2001 need the lobby support which depends on
BASIC_NET.
These games can still be played locally, so just strip the irrelevant
parts.

This fixes #16157.

Changed paths:
    engines/scumm/dialogs.cpp


diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 9aaf262b423..b15c11a04d2 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -1836,19 +1836,25 @@ HENetworkGameOptionsWidget::HENetworkGameOptionsWidget(GuiObject *boss, const Co
 	if (guiOptions.contains(GAMEOPTION_AUDIO_OVERRIDE))
 		_audioOverride = new GUI::CheckboxWidget(widgetsBoss(), "HENetworkGameOptionsDialog.AudioOverride", _("Load modded audio"), _("Replace music, sound effects, and speech clips with modded audio files, if available."));
 
-	GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.SessionServerLabel", _("Multiplayer Server:"));
-	text->setAlign(Graphics::TextAlign::kTextAlignEnd);
-
 	if (_gameid == "football" || _gameid == "baseball2001") {
 		// Lobby configuration (Do not include LAN settings)
 #ifdef USE_BASIC_NET
+		GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.SessionServerLabel", _("Multiplayer Server:"));
+		text->setAlign(Graphics::TextAlign::kTextAlignEnd);
+
 		text->setLabel(_("Online Server:"));
 		_lobbyServerAddr = new GUI::EditTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.LobbyServerAddress", Common::U32String(""), _("Address of the server to connect to for online play.  It must start with either \"https://\" or \"http://\" schemas."));
 		_serverResetButton = addClearButton(widgetsBoss(), "HENetworkGameOptionsDialog.ServerReset", kResetServersCmd);
 		_enableCompetitiveMods = new GUI::CheckboxWidget(widgetsBoss(), "HENetworkGameOptionsDialog.EnableCompetitiveMods", _("Enable online competitive mods"), _("Enables custom-made modifications intended for online competitive play."));
+
+		// Display network version
+		_networkVersion = new GUI::StaticTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.NetworkVersion", Common::String::format("Multiplayer Version: %s", NETWORK_VERSION));
 #endif
 	} else {
 		// Network configuration (Include LAN settings)
+		GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.SessionServerLabel", _("Multiplayer Server:"));
+		text->setAlign(Graphics::TextAlign::kTextAlignEnd);
+
 		_enableSessionServer = new GUI::CheckboxWidget(widgetsBoss(), "HENetworkGameOptionsDialog.EnableSessionServer", _("Enable connection to Multiplayer Server"), _("Toggles the connection to the server that allows hosting and joining online multiplayer games over the Internet."), kEnableSessionCmd);
 		_enableLANBroadcast = new GUI::CheckboxWidget(widgetsBoss(), "HENetworkGameOptionsDialog.EnableLANBroadcast", _("Host games over LAN"), _("Allows the game sessions to be discovered over your local area network."));
 
@@ -1860,10 +1866,10 @@ HENetworkGameOptionsWidget::HENetworkGameOptionsWidget(GuiObject *boss, const Co
 		_sessionServerAddr = new GUI::EditTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.SessionServerAddress", Common::U32String(""), _("Address of the server to connect to for hosting and joining online game sessions."));
 
 		_serverResetButton = addClearButton(widgetsBoss(), "HENetworkGameOptionsDialog.ServerReset", kResetServersCmd);
-	}
 
-	// Display network version
-	_networkVersion = new GUI::StaticTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.NetworkVersion", Common::String::format("Multiplayer Version: %s", NETWORK_VERSION));
+		// Display network version
+		_networkVersion = new GUI::StaticTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.NetworkVersion", Common::String::format("Multiplayer Version: %s", NETWORK_VERSION));
+	}
 }
 
 void HENetworkGameOptionsWidget::load() {
@@ -1932,11 +1938,11 @@ bool HENetworkGameOptionsWidget::save() {
 
 void HENetworkGameOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
 	if (_gameid == "football" || _gameid == "baseball2001") {
-#ifdef USE_BASIC_NET
 		layouts.addDialog(layoutName, overlayedLayout)
 			.addLayout(GUI::ThemeLayout::kLayoutVertical, 5)
 				.addPadding(0, 0, 12, 0)
 				.addWidget("AudioOverride", "Checkbox")
+#ifdef USE_BASIC_NET
 				.addLayout(GUI::ThemeLayout::kLayoutHorizontal, 12)
 					.addPadding(0, 0, 12, 0)
 					.addWidget("SessionServerLabel", "OptionsLabel")
@@ -1945,9 +1951,9 @@ void HENetworkGameOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Com
 				.closeLayout()
 				.addWidget("EnableCompetitiveMods", "Checkbox")
 				.addWidget("NetworkVersion", "")
+#endif
 			.closeLayout()
 		.closeDialog();
-#endif
 	} else {
 		layouts.addDialog(layoutName, overlayedLayout)
 			.addLayout(GUI::ThemeLayout::kLayoutVertical, 5)