Skip to content

Commit bb8b7ef

Browse files
authored
Merge pull request #1960 from TheMasterCreed/send-game-version-with-slave-despawn
Send game version with slave despawn payload
2 parents 159ea11 + e807283 commit bb8b7ef

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

menue/gamemenue.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,6 +1414,11 @@ bool GameMenue::doDespawnSlave()
14141414
mods.insert(JsonKeys::JSONKEY_MOD + QString::number(i), activeMods[i]);
14151415
}
14161416
data.insert(JsonKeys::JSONKEY_USEDMODS, mods);
1417+
GameVersion gameVersion;
1418+
data.insert(JsonKeys::JSONKEY_VERSION_MAJOR, gameVersion.getMajor());
1419+
data.insert(JsonKeys::JSONKEY_VERSION_MINOR, gameVersion.getMinor());
1420+
data.insert(JsonKeys::JSONKEY_VERSION_REVISION, gameVersion.getRevision());
1421+
data.insert(JsonKeys::JSONKEY_VERSION_SUFIX, gameVersion.getSufix());
14171422
QJsonArray usernames;
14181423
qint32 count = m_pMap->getPlayerCount();
14191424
for (qint32 i = 0; i < count; ++i)

multiplayer/multiplayermenu.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,11 @@ QJsonDocument Multiplayermenu::doSaveLobbyState(const QString & saveFile, const
241241
mods.insert(JsonKeys::JSONKEY_MOD + QString::number(i), activeMods[i]);
242242
}
243243
data.insert(JsonKeys::JSONKEY_USEDMODS, mods);
244+
GameVersion gameVersion;
245+
data.insert(JsonKeys::JSONKEY_VERSION_MAJOR, gameVersion.getMajor());
246+
data.insert(JsonKeys::JSONKEY_VERSION_MINOR, gameVersion.getMinor());
247+
data.insert(JsonKeys::JSONKEY_VERSION_REVISION, gameVersion.getRevision());
248+
data.insert(JsonKeys::JSONKEY_VERSION_SUFIX, gameVersion.getSufix());
244249
data.insert(JsonKeys::JSONKEY_USERNAMES, m_pPlayerSelection->getUserNames());
245250
return QJsonDocument(data);
246251
}

0 commit comments

Comments
 (0)