[Scummvm-git-logs] scummvm master -> c54f12ef335a83ee4e05847f356c181c741a11bf

[LittleToonCat]

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

Summary:
c54f12ef33 SCUMM HE: Make initProvider initialize ENet.


Commit: c54f12ef335a83ee4e05847f356c181c741a11bf
    https://github.com/scummvm/scummvm/commit/c54f12ef335a83ee4e05847f356c181c741a11bf
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2023-03-09T04:11:01-04:00

Commit Message:
SCUMM HE: Make initProvider initialize ENet.

Changed paths:
    engines/scumm/he/net/net_lobby.cpp
    engines/scumm/he/net/net_main.cpp
    engines/scumm/he/net/net_main.h


diff --git a/engines/scumm/he/net/net_lobby.cpp b/engines/scumm/he/net/net_lobby.cpp
index 802f85e1b11..cd9a69e2f85 100644
--- a/engines/scumm/he/net/net_lobby.cpp
+++ b/engines/scumm/he/net/net_lobby.cpp
@@ -896,7 +896,8 @@ void Lobby::startHostingGame(int playerId) {
 	_vm->writeVar(111, 0);
 
 	// Create ENet instance.
-	if (!_vm->_net->setProviderByName(0, 0)) {
+	if (!_vm->_net->initProvider()) {
+		// Tell the game that hosting has failed.
 		_vm->writeVar(111, 1);
 		return;
 	}
@@ -925,8 +926,10 @@ void Lobby::startHostingGame(int playerId) {
 			// Tell the game that we're hosting.
 			_vm->writeVar(111, 99);
 		} else
+			// Tell the game that hosting has failed.
 			_vm->writeVar(111, 1);
 	} else
+		// Tell the game that hosting has failed.
 		_vm->writeVar(111, 1);
 }
 
@@ -934,7 +937,7 @@ void Lobby::handleGameSession(int sessionId) {
 	_sessionId = sessionId;
 	_inGame = true;
 
-	if (_vm->_net->setProviderByName(0, 0)) {
+	if (_vm->_net->initProvider()) {
 		// Tell the game to start connecting to our host.
 		int args[25];
 		memset(args, 0, sizeof(args));
diff --git a/engines/scumm/he/net/net_main.cpp b/engines/scumm/he/net/net_main.cpp
index ab956e6808f..b39d7e246ec 100644
--- a/engines/scumm/he/net/net_main.cpp
+++ b/engines/scumm/he/net/net_main.cpp
@@ -514,18 +514,8 @@ int32 Net::setProviderByName(int32 parameter1, int32 parameter2) {
 
 	// Emulate that we found a TCP/IP provider
 
-	// Create a new ENet instance and initialize the library.
-	if (_enet) {
-		warning("Net::setProviderByName: ENet instance already exists.");
-		return 1;
-	}
-	_enet = new Networking::ENet();
-	if (!_enet->initialize()) {
-		_vm->displayMessage(0, "Unable to initialize ENet library.");
-		Net::closeProvider();
-		return 0;
-	}
-	return 1;
+	// Initialize provider:
+	return initProvider();
 }
 
 void Net::setFakeLatency(int time) {
@@ -702,8 +692,17 @@ bool Net::initAll() {
 }
 
 bool Net::initProvider() {
-	warning("STUB: Net::initProvider()"); // PN_DoInitProvider
-	return false;
+	debugC(DEBUG_NETWORK, "Net::initProvider"); // PN_DoInitProvider
+	// Create a new ENet instance and initialize the library.
+	if (_enet)
+		return true;
+	_enet = new Networking::ENet();
+	if (!_enet->initialize()) {
+		_vm->displayMessage(0, "Unable to initialize ENet library.");
+		Net::closeProvider();
+		return false;
+	}
+	return true;
 }
 
 bool Net::initSession() {
diff --git a/engines/scumm/he/net/net_main.h b/engines/scumm/he/net/net_main.h
index c5c330a336b..fd7b74216a7 100644
--- a/engines/scumm/he/net/net_main.h
+++ b/engines/scumm/he/net/net_main.h
@@ -285,12 +285,10 @@ public:
 	 */
 	bool initAll();
 	/**
-	 * Initializes the provider.
+	 * Initializes the ENet provider.
 	 *
 	 * @return true on success.
 	 * @return false on failure.
-	 *
-	 * @note Currently stubbed.
 	 */
 	bool initProvider();
 	/**