[Scummvm-git-logs] scummvm master -> 17e6fa82c7fb3b533d35400e23d3dd0a8669352a

[sev-]

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

Summary:
c17bf778e2 SCUMM HE: MBC: Store generated player key
17e6fa82c7 SCUMM HE: MBC: Implement Net::removeUser()


Commit: c17bf778e2ee9e7462244f030b7e7dedac47c471
    https://github.com/scummvm/scummvm/commit/c17bf778e2ee9e7462244f030b7e7dedac47c471
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-07T14:43:37+01:00

Commit Message:
SCUMM HE: MBC: Store generated player key

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


diff --git a/engines/scumm/he/moonbase/net_main.cpp b/engines/scumm/he/moonbase/net_main.cpp
index 5a8323e..8219db9 100644
--- a/engines/scumm/he/moonbase/net_main.cpp
+++ b/engines/scumm/he/moonbase/net_main.cpp
@@ -36,6 +36,7 @@ Net::Net(ScummEngine_v100he *vm) : _latencyTime(1), _fakeLatency(false), _vm(vm)
 	_tmpbuffer = (byte *)malloc(MAX_PACKET_SIZE);
 
 	_myUserId = -1;
+	_myPlayerKey = -1;
 	_lastResult = 0;
 
 	_sessionsBeingQueried = false;
@@ -109,6 +110,7 @@ void Net::addUserCallback(Common::JSONValue *response) {
 
 	if (info.contains("userid")) {
 		_myUserId = info["userid"]->asIntegerNumber();
+		_myPlayerKey = info["playerkey"]->asIntegerNumber();
 	}
 	debug(1, "addUserCallback: got: '%s' as %d", response->stringify().c_str(), _myUserId);
 }
diff --git a/engines/scumm/he/moonbase/net_main.h b/engines/scumm/he/moonbase/net_main.h
index 093cd0f..6a3ac94 100644
--- a/engines/scumm/he/moonbase/net_main.h
+++ b/engines/scumm/he/moonbase/net_main.h
@@ -116,6 +116,7 @@ public:
 	byte *_tmpbuffer;
 
 	int _myUserId;
+	int _myPlayerKey;
 
 	int _lastResult;
 


Commit: 17e6fa82c7fb3b533d35400e23d3dd0a8669352a
    https://github.com/scummvm/scummvm/commit/17e6fa82c7fb3b533d35400e23d3dd0a8669352a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-07T16:02:15+01:00

Commit Message:
SCUMM HE: MBC: Implement Net::removeUser()

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 8219db9..8c8d0f8 100644
--- a/engines/scumm/he/moonbase/net_main.cpp
+++ b/engines/scumm/he/moonbase/net_main.cpp
@@ -120,8 +120,12 @@ void Net::addUserErrorCallback(Networking::ErrorResponse error) {
 }
 
 int Net::removeUser() {
-	warning("STUB: Net::removeUser()"); // PN_RemoveUser
-	return 0;
+	debug(1, "Net::removeUser()"); // PN_RemoveUser
+
+	if (_myUserId != -1)
+		destroyPlayer(_myUserId);
+
+	return 1;
 }
 
 int Net::whoSentThis() {