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

[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:
a6bf8859bc SCUMM HE: Silence unknown op warnings.


Commit: a6bf8859bca7316a34885044b60598727f2ffd9c
    https://github.com/scummvm/scummvm/commit/a6bf8859bca7316a34885044b60598727f2ffd9c
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2023-03-29T06:10:10-03:00

Commit Message:
SCUMM HE: Silence unknown op warnings.

Changed paths:
    engines/scumm/he/logic/baseball2001.cpp
    engines/scumm/he/logic/football.cpp
    engines/scumm/he/net/net_lobby.cpp
    engines/scumm/he/net/net_lobby.h


diff --git a/engines/scumm/he/logic/baseball2001.cpp b/engines/scumm/he/logic/baseball2001.cpp
index 5aef724de91..68a20429ecc 100644
--- a/engines/scumm/he/logic/baseball2001.cpp
+++ b/engines/scumm/he/logic/baseball2001.cpp
@@ -48,6 +48,7 @@
 
 // MAIA (Updater) opcodes.
 #define OP_NET_CHECK_INTERNET_STATUS	3001
+#define OP_NET_SHUT_DOWN_MAIA			3004
 
 
 namespace Scumm {
@@ -87,7 +88,7 @@ int LogicHEbaseball2001::startOfFrame() {
 
 int32 LogicHEbaseball2001::dispatch(int op, int numArgs, int32 *args) {
 #if defined(USE_ENET) && defined(USE_LIBCURL)
-	if (op > 2120 && op < 3003 && op != OP_NET_CHECK_INTERNET_STATUS) 
+	if (op > 2120 && op < 3003 && op != OP_NET_CHECK_INTERNET_STATUS)
 		return _vm->_lobby->dispatch(op, numArgs, args);
 #endif
 
@@ -165,6 +166,9 @@ case OP_NET_INIT:
 #endif
 		break;
 
+	case OP_NET_SHUT_DOWN_MAIA:
+		break;
+
 	default:
 		LogicHE::dispatch(op, numArgs, args);
 	}
diff --git a/engines/scumm/he/logic/football.cpp b/engines/scumm/he/logic/football.cpp
index 052892d4d41..f67fb54de51 100644
--- a/engines/scumm/he/logic/football.cpp
+++ b/engines/scumm/he/logic/football.cpp
@@ -51,6 +51,7 @@
 
 // MAIA (Updater) opcodes.
 #define OP_NET_CHECK_INTERNET_STATUS	3001
+#define OP_NET_SHUT_DOWN_MAIA			3004
 
 
 namespace Scumm {
@@ -159,6 +160,10 @@ int32 LogicHEfootball::dispatch(int op, int numArgs, int32 *args) {
 		netRemoteStartScript(numArgs, args);
 		break;
 
+	case OP_NET_CLOSE_PROVIDER:
+		res = _vm->_net->closeProvider();
+		break;
+
 	case OP_NET_QUERY_SESSIONS:
 #ifdef USE_LIBCURL
 		if (_vm->_lobby->_sessionId) {
@@ -216,6 +221,9 @@ int32 LogicHEfootball::dispatch(int op, int numArgs, int32 *args) {
 #endif
 		break;
 
+	case OP_NET_SHUT_DOWN_MAIA:
+		break;
+
 	case 1493: case 1494: case 1495: case 1496:
 	case 1498: case 1499:
 	case 1502: case 1503:
@@ -507,10 +515,6 @@ int32 LogicHEfootball2002::dispatch(int op, int numArgs, int32 *args) {
 		break;
 
 #ifdef USE_ENET
-	case OP_NET_CLOSE_PROVIDER:
-		res = _vm->_net->closeProvider();
-		break;
-
 	case OP_NET_QUERY_SESSIONS:
 		if (_requestedSessionIndex > -1)
 			// Emulate that we've found a session.
diff --git a/engines/scumm/he/net/net_lobby.cpp b/engines/scumm/he/net/net_lobby.cpp
index cd9a69e2f85..afd89a7f7ae 100644
--- a/engines/scumm/he/net/net_lobby.cpp
+++ b/engines/scumm/he/net/net_lobby.cpp
@@ -214,6 +214,9 @@ int32 Lobby::dispatch(int op, int numArgs, int32 *args) {
 	case OP_NET_CALL_PLAYER:
 		challengePlayer(args[0], args[1]);
 		break;
+	case OP_NET_PING_OPPONENT:
+		// TODO
+		break;
 	case OP_NET_RECEIVER_BUSY:
 		sendBusy(args[0]);
 		break;
@@ -250,6 +253,9 @@ int32 Lobby::dispatch(int op, int numArgs, int32 *args) {
 	case OP_NET_GET_POPULATION:
 		getPopulation(args[0], args[1]);
 		break;
+	case OP_NET_UNKNOWN_2229:
+		// TODO
+		break;
 	case OP_NET_CHANGE_ICON:
 		setIcon(args[0]);
 		break;
diff --git a/engines/scumm/he/net/net_lobby.h b/engines/scumm/he/net/net_lobby.h
index c182f12e7dd..a67eedd4451 100644
--- a/engines/scumm/he/net/net_lobby.h
+++ b/engines/scumm/he/net/net_lobby.h
@@ -42,6 +42,7 @@
 #define OP_NET_GET_PLAYERS_INFO					2207
 #define OP_NET_START_HOSTING_GAME				2208
 #define OP_NET_CALL_PLAYER						2209
+#define OP_NET_PING_OPPONENT					2211
 #define OP_NET_RECEIVER_BUSY					2212
 #define OP_NET_COUNTER_CHALLENGE				2213
 #define OP_NET_GET_PROFILE						2214
@@ -57,6 +58,7 @@
 #define OP_NET_UPDATE_PROFILE_ARRAY				2225
 #define OP_NET_LOCATE_PLAYER					2226
 #define OP_NET_GET_POPULATION					2227
+#define OP_NET_UNKNOWN_2229						2229
 // Used in baseball to get news, poll and banner.
 #define OP_NET_DOWNLOAD_FILE					2238