Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 17:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only leave lobby if you were invited

Browse source
This commit is contained in:
Atlante45 2016-07-29 13:55:39 -07:00
parent 7ec2f98cf2
commit 2af32ca60e
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libraries/steamworks-wrapper/src/steamworks-wrapper/SteamClient.cpp
View file

@ -188,19 +188,17 @@ void SteamCallbackManager::onGameRichPresenceJoinRequested(GameRichPresenceJoinR
void SteamCallbackManager::onLobbyCreated(LobbyCreated_t* pCallback) { void SteamCallbackManager::onLobbyCreated(LobbyCreated_t* pCallback) {
qDebug() << pCallback->m_eResult << pCallback->m_ulSteamIDLobby;
if (pCallback->m_eResult == k_EResultOK) { if (pCallback->m_eResult == k_EResultOK) {
qDebug() << "Inviting steam friends"; qDebug() << "Inviting steam friends" << pCallback->m_ulSteamIDLobby;
auto url = SteamFriends()->GetFriendRichPresence(SteamUser()->GetSteamID(), "connect"); auto url = SteamFriends()->GetFriendRichPresence(SteamUser()->GetSteamID(), "connect");
SteamMatchmaking()->SetLobbyData(pCallback->m_ulSteamIDLobby, "connect", url); SteamMatchmaking()->SetLobbyData(pCallback->m_ulSteamIDLobby, "connect", url);
SteamMatchmaking()->SetLobbyMemberData(pCallback->m_ulSteamIDLobby, "creator", "true");
SteamFriends()->ActivateGameOverlayInviteDialog(pCallback->m_ulSteamIDLobby); SteamFriends()->ActivateGameOverlayInviteDialog(pCallback->m_ulSteamIDLobby);
} }
} }
void SteamCallbackManager::onGameLobbyJoinRequested(GameLobbyJoinRequested_t* pCallback) { void SteamCallbackManager::onGameLobbyJoinRequested(GameLobbyJoinRequested_t* pCallback) {
qDebug() << "Joining Steam lobby"; qDebug() << "Joining Steam lobby" << pCallback->m_steamIDLobby.ConvertToUint64();
SteamMatchmaking()->JoinLobby(pCallback->m_steamIDLobby); SteamMatchmaking()->JoinLobby(pCallback->m_steamIDLobby);
} }
@ -210,14 +208,14 @@ void SteamCallbackManager::onLobbyEnter(LobbyEnter_t* pCallback) {
return; return;
} }
auto creator = SteamMatchmaking()->GetLobbyMemberData(pCallback->m_ulSteamIDLobby, qDebug() << "Entered Steam lobby" << pCallback->m_ulSteamIDLobby;
SteamUser()->GetSteamID(), "creator");
if (strcmp(creator, "true") != 0) {
auto url = SteamMatchmaking()->GetLobbyData(pCallback->m_ulSteamIDLobby, "connect");
parseUrlAndGo(url);
}
if (SteamMatchmaking()->GetLobbyOwner(pCallback->m_ulSteamIDLobby) != SteamUser()->GetSteamID()) {
auto url = SteamMatchmaking()->GetLobbyData(pCallback->m_ulSteamIDLobby, "connect");
qDebug() << "Jumping to" << url;
parseUrlAndGo(url);
SteamMatchmaking()->LeaveLobby(pCallback->m_ulSteamIDLobby); SteamMatchmaking()->LeaveLobby(pCallback->m_ulSteamIDLobby);
}
} }
@ -293,13 +291,23 @@ void SteamClient::openInviteOverlay() {
return; return;
} }
qDebug() << "Creating steam lobby"; qDebug() << "Creating Steam lobby";
static const int MAX_LOBBY_SIZE = 20; static const int MAX_LOBBY_SIZE = 20;
SteamMatchmaking()->CreateLobby(k_ELobbyTypePrivate, MAX_LOBBY_SIZE); SteamMatchmaking()->CreateLobby(k_ELobbyTypePrivate, MAX_LOBBY_SIZE);
} }
void SteamClient::joinLobby(QString lobbyIdStr) { void SteamClient::joinLobby(QString lobbyIdStr) {
if (!initialized) {
if (SteamAPI_IsSteamRunning()) {
init();
}
else {
qWarning() << "Steam is not running";
return;
}
}
qDebug() << "Trying to join Steam lobby:" << lobbyIdStr; qDebug() << "Trying to join Steam lobby:" << lobbyIdStr;
CSteamID lobbyId(lobbyIdStr.toULongLong()); CSteamID lobbyId(lobbyIdStr.toULongLong());
SteamMatchmaking()->JoinLobby(lobbyId); SteamMatchmaking()->JoinLobby(lobbyId);