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

[sev-]

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

Summary:
dcab6674f1 SCUMM HE: MBC: Fix package sending
f8272de0ed SCUMM HE: MBC: Implement whoSentThis()
a3c65b1a15 SCUMM HE: MBC: Fix unpackageArray() parameters


Commit: dcab6674f1c55b078bf692f7338dd8de6e637d2c
    https://github.com/scummvm/scummvm/commit/dcab6674f1c55b078bf692f7338dd8de6e637d2c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-30T10:19:58+01:00

Commit Message:
SCUMM HE: MBC: Fix package sending

Changed paths:
    engines/scumm/he/moonbase/net_main.cpp


diff --git a/engines/scumm/he/moonbase/net_main.cpp b/engines/scumm/he/moonbase/net_main.cpp
index d6443ad..7095912 100644
--- a/engines/scumm/he/moonbase/net_main.cpp
+++ b/engines/scumm/he/moonbase/net_main.cpp
@@ -337,7 +337,7 @@ int Net::remoteSendData(int typeOfSend, int sendTypeParam, int type, byte *data,
 	// Since I am lazy, instead of constructing the JSON object manually
 	// I'd rather parse it
 	Common::String res = Common::String::format(
-		"{\"sessionid\":%d, \"userid\":%d, \"to\":%d, \"toparam\": %d, "
+		"{\"sessionid\":%d, \"from\":%d, \"to\":%d, \"toparam\": %d, "
 		"\"type\":%d, \"timestamp\": %d, \"size\": %d, \"data\": [", _sessionid, _myUserId,
 		typeOfSend, sendTypeParam, type, g_system->getMillis(), len);
 


Commit: f8272de0ed8f44e9876b3a7e103380577a82fedb
    https://github.com/scummvm/scummvm/commit/f8272de0ed8f44e9876b3a7e103380577a82fedb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-30T10:19:58+01:00

Commit Message:
SCUMM HE: MBC: Implement whoSentThis()

Changed paths:
    engines/scumm/he/moonbase/net_main.cpp


diff --git a/engines/scumm/he/moonbase/net_main.cpp b/engines/scumm/he/moonbase/net_main.cpp
index 7095912..ffbdd16 100644
--- a/engines/scumm/he/moonbase/net_main.cpp
+++ b/engines/scumm/he/moonbase/net_main.cpp
@@ -118,8 +118,8 @@ int Net::removeUser() {
 }
 
 int Net::whoSentThis() {
-	warning("STUB: Net::whoSentThis()"); // PN_WhoSentThis
-	return 0;
+	debug(1, "Net::whoSentThis()"); // PN_WhoSentThis
+	return _packetdata->child("from")->asIntegerNumber();
 }
 
 int Net::whoAmI() {


Commit: a3c65b1a15d6c588c011799264c74aa8da7a44c4
    https://github.com/scummvm/scummvm/commit/a3c65b1a15d6c588c011799264c74aa8da7a44c4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-30T10:19:58+01:00

Commit Message:
SCUMM HE: MBC: Fix unpackageArray() parameters

Changed paths:
    engines/scumm/he/moonbase/net_main.cpp


diff --git a/engines/scumm/he/moonbase/net_main.cpp b/engines/scumm/he/moonbase/net_main.cpp
index ffbdd16..8cef3d7 100644
--- a/engines/scumm/he/moonbase/net_main.cpp
+++ b/engines/scumm/he/moonbase/net_main.cpp
@@ -533,7 +533,7 @@ bool Net::remoteReceiveData() {
 			// and unpack it into an scumm array :-)
 
 			newArray = _vm->findFreeArrayId();
-			unpackageArray(newArray, _packbuffer + DATA_HEADER_SIZE, datalen);
+			unpackageArray(newArray, _packbuffer, datalen);
 			memset(_tmpbuffer, 0, 25 * 4);
 			WRITE_UINT32(_tmpbuffer, newArray);