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

LittleToonCat noreply at scummvm.org
Mon Oct 16 21:43:26 UTC 2023


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:
bde3a46cf4 HE SCUMM: Initalize _inGame.


Commit: bde3a46cf4cde0e0d59f2b195cebf127987d1831
    https://github.com/scummvm/scummvm/commit/bde3a46cf4cde0e0d59f2b195cebf127987d1831
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2023-10-16T18:43:17-03:00

Commit Message:
HE SCUMM: Initalize _inGame.

This fixes a bug in an optimized build where the players list won't
update.

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


diff --git a/engines/scumm/he/net/net_lobby.cpp b/engines/scumm/he/net/net_lobby.cpp
index 5119943d74f..b494f582027 100644
--- a/engines/scumm/he/net/net_lobby.cpp
+++ b/engines/scumm/he/net/net_lobby.cpp
@@ -37,6 +37,8 @@ Lobby::Lobby(ScummEngine_v90he *vm) : _vm(vm) {
 	_userName = "";
 
 	_sessionId = 0;
+
+	_inGame = false;
 }
 
 Lobby::~Lobby() {
@@ -695,8 +697,6 @@ void Lobby::getPlayersList(int start, int end) {
 bool Lobby::_checkPlayersLists(Common::JSONArray other) {
 	// Check if the two players lists are different.
 	// This exists because (_playersList != other) doesn't work.
-	debugC(DEBUG_NETWORK, "LOBBY: _playerList.size() = %d", _playersList.size());
-	debugC(DEBUG_NETWORK, "LOBBY: other.size() = %d", other.size());
 	if (_playersList.size() != other.size())
 		return true;
 	for (uint i = 0; i < _playersList.size(); i++) {
@@ -704,11 +704,9 @@ bool Lobby::_checkPlayersLists(Common::JSONArray other) {
 		Common::JSONArray otherInfo = other[i]->asArray();
 
 		// Check if names are different.
-		debugC(DEBUG_NETWORK, "LOBBY: %s != %s", playerInfo[0]->asString().c_str(), otherInfo[0]->asString().c_str());
 		if (playerInfo[0]->asString() != otherInfo[0]->asString())
 			return true;
 		for (uint o = 1; o < 7; o++) {
-			debugC(DEBUG_NETWORK, "LOBBY: %lld != %lld", playerInfo[o]->asIntegerNumber(), otherInfo[o]->asIntegerNumber());
 			if (playerInfo[o]->asIntegerNumber() != otherInfo[o]->asIntegerNumber())
 				return true;
 		}




More information about the Scummvm-git-logs mailing list