Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-23 11:15:34 +08:00
Code Issues 1 Projects Releases Wiki Activity

more logging

Browse Source
This commit is contained in:
otavepto 2024-03-19 22:07:43 +02:00
parent a74f986b97
commit 166e7db122
6 changed files with 78 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dll/dll/steam_friends.h
View File

@ -381,6 +381,7 @@ const char *GetFriendPersonaName( CSteamID steamIDFriend )
if (f) name = f->name().c_str(); if (f) name = f->name().c_str();
} }
PRINT_DEBUG("Steam_Friends::GetFriendPersonaName returned '%s'\n", name);
return name; return name;
} }
@ -388,31 +389,31 @@ const char *GetFriendPersonaName( CSteamID steamIDFriend )
// returns true if the friend is actually in a game, and fills in pFriendGameInfo with an extra details // returns true if the friend is actually in a game, and fills in pFriendGameInfo with an extra details
bool GetFriendGamePlayed( CSteamID steamIDFriend, STEAM_OUT_STRUCT() FriendGameInfo_t *pFriendGameInfo ) bool GetFriendGamePlayed( CSteamID steamIDFriend, STEAM_OUT_STRUCT() FriendGameInfo_t *pFriendGameInfo )
{ {
PRINT_DEBUG("Steam_Friends::GetFriendGamePlayed %llu\n", steamIDFriend.ConvertToUint64()); PRINT_DEBUG("Steam_Friends::GetFriendGamePlayed %llu %p\n", steamIDFriend.ConvertToUint64(), pFriendGameInfo);
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
bool ret = false; bool ret = false;
if (steamIDFriend == settings->get_local_steam_id()) { if (steamIDFriend == settings->get_local_steam_id()) {
PRINT_DEBUG("Steam_Friends::GetFriendGamePlayed found myself! %llu %llu\n", settings->get_local_game_id().ToUint64(), settings->get_lobby().ConvertToUint64());
if (pFriendGameInfo) { if (pFriendGameInfo) {
pFriendGameInfo->m_gameID = settings->get_local_game_id(); pFriendGameInfo->m_gameID = settings->get_local_game_id();
pFriendGameInfo->m_unGameIP = 0; pFriendGameInfo->m_unGameIP = 0;
pFriendGameInfo->m_usGamePort = 0; pFriendGameInfo->m_usGamePort = 0;
pFriendGameInfo->m_usQueryPort = 0; pFriendGameInfo->m_usQueryPort = 0;
pFriendGameInfo->m_steamIDLobby = settings->get_lobby(); pFriendGameInfo->m_steamIDLobby = settings->get_lobby();
PRINT_DEBUG("self %llu %llu\n", settings->get_local_game_id().ToUint64(), settings->get_lobby().ConvertToUint64());
} }
ret = true; ret = true;
} else { } else {
Friend *f = find_friend(steamIDFriend); Friend *f = find_friend(steamIDFriend);
if (f) { if (f) {
PRINT_DEBUG("Steam_Friends::GetFriendGamePlayed found someone %u " "%" PRIu64 "\n", f->appid(), f->lobby_id());
if (pFriendGameInfo) { if (pFriendGameInfo) {
pFriendGameInfo->m_gameID = CGameID(f->appid()); pFriendGameInfo->m_gameID = CGameID(f->appid());
pFriendGameInfo->m_unGameIP = 0; pFriendGameInfo->m_unGameIP = 0;
pFriendGameInfo->m_usGamePort = 0; pFriendGameInfo->m_usGamePort = 0;
pFriendGameInfo->m_usQueryPort = 0; pFriendGameInfo->m_usQueryPort = 0;
pFriendGameInfo->m_steamIDLobby = CSteamID((uint64)f->lobby_id()); pFriendGameInfo->m_steamIDLobby = CSteamID((uint64)f->lobby_id());
PRINT_DEBUG("%u " "%" PRIu64 "\n", f->appid(), f->lobby_id());
} }
ret = true; ret = true;
@ -847,7 +848,7 @@ void ClearRichPresence()
const char *GetFriendRichPresence( CSteamID steamIDFriend, const char *pchKey ) const char *GetFriendRichPresence( CSteamID steamIDFriend, const char *pchKey )
{ {
PRINT_DEBUG("Steam_Friends::GetFriendRichPresence %llu %s\n", steamIDFriend.ConvertToUint64(), pchKey); PRINT_DEBUG("Steam_Friends::GetFriendRichPresence %llu '%s'\n", steamIDFriend.ConvertToUint64(), pchKey);
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
const char *value = ""; const char *value = "";
@ -863,6 +864,7 @@ const char *GetFriendRichPresence( CSteamID steamIDFriend, const char *pchKey )
if (result != f->rich_presence().end()) value = result->second.c_str(); if (result != f->rich_presence().end()) value = result->second.c_str();
} }
PRINT_DEBUG("Steam_Friends::GetFriendRichPresence returned '%s'\n", value);
return value; return value;
} }

85
dll/dll/steam_matchmaking.h
View File

@ -23,6 +23,9 @@
#define REQUEST_LOBBY_DATA_TIMEOUT 6.0 #define REQUEST_LOBBY_DATA_TIMEOUT 6.0
#define LOBBY_DELETED_TIMEOUT 2 #define LOBBY_DELETED_TIMEOUT 2
#define LOBBY_CREATE_DELAY 0.07 //artificial delay for lobby creation
struct Pending_Joins { struct Pending_Joins {
SteamAPICall_t api_id; SteamAPICall_t api_id;
CSteamID lobby_id; CSteamID lobby_id;
@ -138,8 +141,8 @@ void send_lobby_data()
void trigger_lobby_dataupdate(CSteamID lobby, CSteamID member, bool success, double cb_timeout=0.005, bool send_changed_lobby=true) void trigger_lobby_dataupdate(CSteamID lobby, CSteamID member, bool success, double cb_timeout=0.005, bool send_changed_lobby=true)
{ {
PRINT_DEBUG("Steam_MatchMaking::Lobby dataupdate %llu %llu\n", lobby.ConvertToUint64(), member.ConvertToUint64()); PRINT_DEBUG("Steam_MatchMaking::trigger_lobby_dataupdate %llu %llu\n", lobby.ConvertToUint64(), member.ConvertToUint64());
LobbyDataUpdate_t data; LobbyDataUpdate_t data{};
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
data.m_ulSteamIDLobby = lobby.ConvertToUint64(); data.m_ulSteamIDLobby = lobby.ConvertToUint64();
@ -156,6 +159,7 @@ void trigger_lobby_dataupdate(CSteamID lobby, CSteamID member, bool success, dou
Lobby *l = get_lobby(lobby); Lobby *l = get_lobby(lobby);
if (l && l->owner() == settings->get_local_steam_id().ConvertToUint64()) { if (l && l->owner() == settings->get_local_steam_id().ConvertToUint64()) {
if (send_changed_lobby) { if (send_changed_lobby) {
PRINT_DEBUG("Steam_MatchMaking::trigger_lobby_dataupdate resending new data\n");
Common_Message msg = Common_Message(); Common_Message msg = Common_Message();
msg.set_source_id(settings->get_local_steam_id().ConvertToUint64()); msg.set_source_id(settings->get_local_steam_id().ConvertToUint64());
msg.set_allocated_lobby(new Lobby(*l)); msg.set_allocated_lobby(new Lobby(*l));
@ -166,7 +170,7 @@ void trigger_lobby_dataupdate(CSteamID lobby, CSteamID member, bool success, dou
void trigger_lobby_member_join_leave(CSteamID lobby, CSteamID member, bool leaving, bool success, double cb_timeout=0.0) void trigger_lobby_member_join_leave(CSteamID lobby, CSteamID member, bool leaving, bool success, double cb_timeout=0.0)
{ {
LobbyChatUpdate_t data; LobbyChatUpdate_t data{};
data.m_ulSteamIDLobby = lobby.ConvertToUint64(); data.m_ulSteamIDLobby = lobby.ConvertToUint64();
data.m_ulSteamIDUserChanged = member.ConvertToUint64(); data.m_ulSteamIDUserChanged = member.ConvertToUint64();
data.m_ulSteamIDMakingChange = member.ConvertToUint64(); data.m_ulSteamIDMakingChange = member.ConvertToUint64();
@ -181,7 +185,7 @@ void trigger_lobby_member_join_leave(CSteamID lobby, CSteamID member, bool leavi
data.m_rgfChatMemberStateChange = member_state_change; data.m_rgfChatMemberStateChange = member_state_change;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), cb_timeout); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), cb_timeout);
//trigger_lobby_dataupdate(lobby, member, success, cb_timeout); // trigger_lobby_dataupdate(lobby, member, success, cb_timeout);
trigger_lobby_dataupdate(lobby, lobby, success, cb_timeout); trigger_lobby_dataupdate(lobby, lobby, success, cb_timeout);
} }
@ -532,6 +536,7 @@ SteamAPICall_t RequestLobbyList()
{ {
PRINT_DEBUG("Steam_MatchMaking::RequestLobbyList\n"); PRINT_DEBUG("Steam_MatchMaking::RequestLobbyList\n");
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
filtered_lobbies.clear(); filtered_lobbies.clear();
lobby_last_search = std::chrono::high_resolution_clock::now(); lobby_last_search = std::chrono::high_resolution_clock::now();
filter_values_copy = filter_values; filter_values_copy = filter_values;
@ -558,7 +563,7 @@ void RequestLobbyList_OLD()
// these are cleared on each call to RequestLobbyList() // these are cleared on each call to RequestLobbyList()
void AddRequestLobbyListStringFilter( const char *pchKeyToMatch, const char *pchValueToMatch, ELobbyComparison eComparisonType ) void AddRequestLobbyListStringFilter( const char *pchKeyToMatch, const char *pchValueToMatch, ELobbyComparison eComparisonType )
{ {
PRINT_DEBUG("Steam_MatchMaking::AddRequestLobbyListStringFilter %s %s %i\n", pchKeyToMatch, pchValueToMatch, eComparisonType); PRINT_DEBUG("Steam_MatchMaking::AddRequestLobbyListStringFilter '%s'=='%s' %i\n", pchKeyToMatch, pchValueToMatch, eComparisonType);
if (!pchValueToMatch) return; if (!pchValueToMatch) return;
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
@ -574,7 +579,7 @@ void AddRequestLobbyListStringFilter( const char *pchKeyToMatch, const char *pch
// numerical comparison // numerical comparison
void AddRequestLobbyListNumericalFilter( const char *pchKeyToMatch, int nValueToMatch, ELobbyComparison eComparisonType ) void AddRequestLobbyListNumericalFilter( const char *pchKeyToMatch, int nValueToMatch, ELobbyComparison eComparisonType )
{ {
PRINT_DEBUG("Steam_MatchMaking::AddRequestLobbyListNumericalFilter %s %i %i\n", pchKeyToMatch, nValueToMatch, eComparisonType); PRINT_DEBUG("Steam_MatchMaking::AddRequestLobbyListNumericalFilter '%s'==%i %i\n", pchKeyToMatch, nValueToMatch, eComparisonType);
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
struct Filter_Values fv; struct Filter_Values fv;
fv.key = std::string(pchKeyToMatch); fv.key = std::string(pchKeyToMatch);
@ -588,7 +593,7 @@ void AddRequestLobbyListNumericalFilter( const char *pchKeyToMatch, int nValueTo
// returns results closest to the specified value. Multiple near filters can be added, with early filters taking precedence // returns results closest to the specified value. Multiple near filters can be added, with early filters taking precedence
void AddRequestLobbyListNearValueFilter( const char *pchKeyToMatch, int nValueToBeCloseTo ) void AddRequestLobbyListNearValueFilter( const char *pchKeyToMatch, int nValueToBeCloseTo )
{ {
PRINT_DEBUG("Steam_MatchMaking::AddRequestLobbyListNearValueFilter %s %u\n", pchKeyToMatch, nValueToBeCloseTo); PRINT_DEBUG("Steam_MatchMaking::AddRequestLobbyListNearValueFilter '%s'==%u\n", pchKeyToMatch, nValueToBeCloseTo);
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
@ -642,6 +647,8 @@ void AddRequestLobbyListNumericalFilter( const char *pchKeyToMatch, int nValueTo
void AddRequestLobbyListSlotsAvailableFilter() void AddRequestLobbyListSlotsAvailableFilter()
{ {
PRINT_DEBUG("TODO Steam_MatchMaking::AddRequestLobbyListSlotsAvailableFilter\n");
std::lock_guard<std::recursive_mutex> lock(global_mutex);
} }
@ -655,16 +662,17 @@ CSteamID GetLobbyByIndex( int iLobby )
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
CSteamID id = k_steamIDNil; CSteamID id = k_steamIDNil;
if (0 <= iLobby && iLobby < filtered_lobbies.size()) id = filtered_lobbies[iLobby]; if (0 <= iLobby && iLobby < filtered_lobbies.size()) id = filtered_lobbies[iLobby];
PRINT_DEBUG(" Lobby %llu\n", id.ConvertToUint64()); PRINT_DEBUG("Steam_MatchMaking::GetLobbyByIndex found lobby %llu\n", id.ConvertToUint64());
return id; return id;
} }
static bool enter_lobby(Lobby *lobby, CSteamID id) static bool enter_lobby(Lobby *lobby, CSteamID id)
{ {
if (get_lobby_member(lobby, id)) return false; if (get_lobby_member(lobby, id)) return false; // player already exists
Lobby_Member *member = lobby->add_members(); Lobby_Member *member = lobby->add_members();
member->set_id(id.ConvertToUint64()); member->set_id(id.ConvertToUint64());
PRINT_DEBUG("Steam_MatchMaking added player %llu to lobby\n", (uint64)id.ConvertToUint64());
return true; return true;
} }
@ -680,8 +688,6 @@ static bool leave_lobby(Lobby *lobby, CSteamID id)
} }
#define LOBBY_CREATE_DELAY 0.07 //artificial delay for lobby creation
void Create_pending_lobbies() void Create_pending_lobbies()
{ {
auto p_c = std::begin(pending_creates); auto p_c = std::begin(pending_creates);
@ -780,9 +786,12 @@ SteamAPICall_t JoinLobby( CSteamID steamIDLobby )
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
auto pj = std::find_if(pending_joins.begin(), pending_joins.end(), [&steamIDLobby](Pending_Joins const& item) {return item.lobby_id == steamIDLobby;}); auto pj = std::find_if(pending_joins.begin(), pending_joins.end(), [&steamIDLobby](Pending_Joins const& item) {return item.lobby_id == steamIDLobby;});
if (pj != pending_joins.end()) return pj->api_id; if (pj != pending_joins.end()) {
PRINT_DEBUG("Steam_MatchMaking::JoinLobby already found in pending joins list\n");
return pj->api_id;
}
Pending_Joins pending_join; Pending_Joins pending_join{};
pending_join.api_id = callback_results->reserveCallResult(); pending_join.api_id = callback_results->reserveCallResult();
pending_join.lobby_id = steamIDLobby; pending_join.lobby_id = steamIDLobby;
pending_join.joined = std::chrono::high_resolution_clock::now(); pending_join.joined = std::chrono::high_resolution_clock::now();
@ -792,6 +801,7 @@ SteamAPICall_t JoinLobby( CSteamID steamIDLobby )
message->set_type(Lobby_Messages::JOIN); message->set_type(Lobby_Messages::JOIN);
pending_join.message_sent = send_owner_packet(steamIDLobby, message); pending_join.message_sent = send_owner_packet(steamIDLobby, message);
PRINT_DEBUG("Steam_MatchMaking::JoinLobby added new entry to pending joins\n");
return pending_join.api_id; return pending_join.api_id;
} }
@ -879,7 +889,7 @@ int GetNumLobbyMembers( CSteamID steamIDLobby )
int ret = 0; int ret = 0;
if (lobby) ret = lobby->members().size(); if (lobby) ret = lobby->members().size();
PRINT_DEBUG("Steam_MatchMaking::GetNumLobbyMembers Number: %i\n", ret); PRINT_DEBUG("Steam_MatchMaking::GetNumLobbyMembers count=%i\n", ret);
return ret; return ret;
} }
@ -893,7 +903,7 @@ CSteamID GetLobbyMemberByIndex( CSteamID steamIDLobby, int iMember )
Lobby *lobby = get_lobby(steamIDLobby); Lobby *lobby = get_lobby(steamIDLobby);
CSteamID id = k_steamIDNil; CSteamID id = k_steamIDNil;
if (lobby && !lobby->deleted() && lobby->members().size() > iMember && iMember >= 0) id = (uint64)lobby->members(iMember).id(); if (lobby && !lobby->deleted() && lobby->members().size() > iMember && iMember >= 0) id = (uint64)lobby->members(iMember).id();
PRINT_DEBUG("Steam_MatchMaking::GetLobbyMemberByIndex Member: %llu\n", id.ConvertToUint64()); PRINT_DEBUG("Steam_MatchMaking::GetLobbyMemberByIndex found member: %llu\n", id.ConvertToUint64());
return id; return id;
} }
@ -903,9 +913,10 @@ CSteamID GetLobbyMemberByIndex( CSteamID steamIDLobby, int iMember )
// "" will be returned if no value is set, or if steamIDLobby is invalid // "" will be returned if no value is set, or if steamIDLobby is invalid
const char *GetLobbyData( CSteamID steamIDLobby, const char *pchKey ) const char *GetLobbyData( CSteamID steamIDLobby, const char *pchKey )
{ {
PRINT_DEBUG("Steam_MatchMaking::GetLobbyData %llu %s\n", steamIDLobby.ConvertToUint64(), pchKey); PRINT_DEBUG("Steam_MatchMaking::GetLobbyData %llu '%s'\n", steamIDLobby.ConvertToUint64(), pchKey);
if (!pchKey) return "";
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
if (!pchKey) return "";
Lobby *lobby = get_lobby(steamIDLobby); Lobby *lobby = get_lobby(steamIDLobby);
const char *ret = ""; const char *ret = "";
if (lobby) { if (lobby) {
@ -1368,7 +1379,7 @@ void RunCallbacks()
bool use = l.joinable() && (l.type() == k_ELobbyTypePublic || l.type() == k_ELobbyTypeInvisible || l.type() == k_ELobbyTypeFriendsOnly) && !l.deleted(); bool use = l.joinable() && (l.type() == k_ELobbyTypePublic || l.type() == k_ELobbyTypeInvisible || l.type() == k_ELobbyTypeFriendsOnly) && !l.deleted();
PRINT_DEBUG("Steam_MatchMaking use lobby: %u, filters: %zu, joinable: %u, type: %u, deleted: %u\n", use, filter_values_copy.size(), l.joinable(), l.type(), l.deleted()); PRINT_DEBUG("Steam_MatchMaking use lobby: %u, filters: %zu, joinable: %u, type: %u, deleted: %u\n", use, filter_values_copy.size(), l.joinable(), l.type(), l.deleted());
for (auto & f : filter_values_copy) { for (auto & f : filter_values_copy) {
PRINT_DEBUG("Steam_MatchMaking %s:%s/%i %u %i\n", f.key.c_str(), f.value_string.c_str(), f.value_int, f.is_int, f.eComparisonType); PRINT_DEBUG("Steam_MatchMaking '%s':'%s'/%i %u %i\n", f.key.c_str(), f.value_string.c_str(), f.value_int, f.is_int, f.eComparisonType);
auto value = caseinsensitive_find(l.values(), f.key); auto value = caseinsensitive_find(l.values(), f.key);
if (value != l.values().end()) { if (value != l.values().end()) {
//TODO: eComparisonType //TODO: eComparisonType
@ -1376,12 +1387,14 @@ void RunCallbacks()
PRINT_DEBUG("Steam_MatchMaking Compare Values %s %s\n", value->second.c_str(), f.value_string.c_str()); PRINT_DEBUG("Steam_MatchMaking Compare Values %s %s\n", value->second.c_str(), f.value_string.c_str());
if (f.eComparisonType == k_ELobbyComparisonEqual) { if (f.eComparisonType == k_ELobbyComparisonEqual) {
if (value->second == f.value_string) { if (value->second == f.value_string) {
PRINT_DEBUG("Steam_MatchMaking Equal\n"); PRINT_DEBUG("Steam_MatchMaking Equal (non-int)\n");
//use = use; //use = use;
} else { } else {
PRINT_DEBUG("Steam_MatchMaking Not Equal\n"); PRINT_DEBUG("Steam_MatchMaking Not Equal (non-int)\n");
use = false; use = false;
} }
} else {
PRINT_DEBUG("TODO Steam_MatchMaking UNSUPPORTED compare type (non-int) %i\n", (int)f.eComparisonType);
} }
} else { } else {
try { try {
@ -1394,12 +1407,14 @@ void RunCallbacks()
PRINT_DEBUG("Steam_MatchMaking Compare Values %i %i\n", compare_to, f.value_int); PRINT_DEBUG("Steam_MatchMaking Compare Values %i %i\n", compare_to, f.value_int);
if (f.eComparisonType == k_ELobbyComparisonEqual) { if (f.eComparisonType == k_ELobbyComparisonEqual) {
if (compare_to == f.value_int) { if (compare_to == f.value_int) {
PRINT_DEBUG("Steam_MatchMaking Equal\n"); PRINT_DEBUG("Steam_MatchMaking Equal (int)\n");
//use = use; //use = use;
} else { } else {
PRINT_DEBUG("Steam_MatchMaking Not Equal\n"); PRINT_DEBUG("Steam_MatchMaking Not Equal (int)\n");
use = false; use = false;
} }
} else {
PRINT_DEBUG("TODO Steam_MatchMaking UNSUPPORTED compare type (int) %i\n", (int)f.eComparisonType);
} }
} catch (...) { } catch (...) {
//Same case as if the key is not in the lobby? //Same case as if the key is not in the lobby?
@ -1442,7 +1457,7 @@ void RunCallbacks()
auto g = std::begin(pending_joins); auto g = std::begin(pending_joins);
while (g != std::end(pending_joins)) { while (g != std::end(pending_joins)) {
if (!g->message_sent) { if (!g->message_sent) {
PRINT_DEBUG("Steam_MatchMaking Resend join lobby\n"); PRINT_DEBUG("Steam_MatchMaking resending join lobby\n");
Lobby_Messages *message = new Lobby_Messages(); Lobby_Messages *message = new Lobby_Messages();
message->set_type(Lobby_Messages::JOIN); message->set_type(Lobby_Messages::JOIN);
g->message_sent = send_owner_packet(g->lobby_id, message); g->message_sent = send_owner_packet(g->lobby_id, message);
@ -1450,7 +1465,8 @@ void RunCallbacks()
Lobby *lobby = get_lobby(g->lobby_id); Lobby *lobby = get_lobby(g->lobby_id);
if (lobby && lobby->deleted()) { if (lobby && lobby->deleted()) {
LobbyEnter_t data; PRINT_DEBUG("Steam_MatchMaking lobby deleted %llu\n", g->lobby_id.ConvertToUint64());
LobbyEnter_t data{};
data.m_ulSteamIDLobby = lobby->room_id(); data.m_ulSteamIDLobby = lobby->room_id();
data.m_rgfChatPermissions = 0; //Unused - Always 0 data.m_rgfChatPermissions = 0; //Unused - Always 0
data.m_bLocked = false; data.m_bLocked = false;
@ -1458,10 +1474,9 @@ void RunCallbacks()
callback_results->addCallResult(g->api_id, data.k_iCallback, &data, sizeof(data)); callback_results->addCallResult(g->api_id, data.k_iCallback, &data, sizeof(data));
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data));
g = pending_joins.erase(g); g = pending_joins.erase(g);
} else } else if (get_lobby_member(lobby, settings->get_local_steam_id())) {
PRINT_DEBUG("Steam_MatchMaking lobby joined %llu\n", g->lobby_id.ConvertToUint64());
if (get_lobby_member(lobby, settings->get_local_steam_id())) { LobbyEnter_t data{};
LobbyEnter_t data;
data.m_ulSteamIDLobby = lobby->room_id(); data.m_ulSteamIDLobby = lobby->room_id();
data.m_rgfChatPermissions = 0; //Unused - Always 0 data.m_rgfChatPermissions = 0; //Unused - Always 0
data.m_bLocked = false; data.m_bLocked = false;
@ -1470,10 +1485,9 @@ void RunCallbacks()
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data));
g = pending_joins.erase(g); g = pending_joins.erase(g);
trigger_lobby_dataupdate((uint64)lobby->room_id(), (uint64)lobby->room_id(), true); trigger_lobby_dataupdate((uint64)lobby->room_id(), (uint64)lobby->room_id(), true);
} else } else if (check_timedout(g->joined, PENDING_JOIN_TIMEOUT)) {
PRINT_DEBUG("Steam_MatchMaking pending join timeout %llu\n", g->lobby_id.ConvertToUint64());
if (check_timedout(g->joined, PENDING_JOIN_TIMEOUT)) { LobbyEnter_t data{};
LobbyEnter_t data;
data.m_ulSteamIDLobby = g->lobby_id.ConvertToUint64(); data.m_ulSteamIDLobby = g->lobby_id.ConvertToUint64();
data.m_rgfChatPermissions = 0; //Unused - Always 0 data.m_rgfChatPermissions = 0; //Unused - Always 0
data.m_bLocked = false; data.m_bLocked = false;
@ -1481,7 +1495,6 @@ void RunCallbacks()
callback_results->addCallResult(g->api_id, data.k_iCallback, &data, sizeof(data)); callback_results->addCallResult(g->api_id, data.k_iCallback, &data, sizeof(data));
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data));
g = pending_joins.erase(g); g = pending_joins.erase(g);
PRINT_DEBUG("Steam_MatchMaking PENDING_JOIN_TIMEOUT\n");
} else { } else {
++g; ++g;
} }
@ -1511,7 +1524,7 @@ void RunCallbacks()
void Callback(Common_Message *msg) void Callback(Common_Message *msg)
{ {
if (msg->has_lobby()) { if (msg->has_lobby()) {
PRINT_DEBUG("Steam_MatchMaking GOT A LOBBY appid: %u\n", msg->lobby().appid()); PRINT_DEBUG("Steam_MatchMaking GOT A LOBBY appid: %u " "%" PRIu64 "\n", msg->lobby().appid(), msg->lobby().owner());
if (msg->lobby().owner() != settings->get_local_steam_id().ConvertToUint64() && msg->lobby().appid() == settings->get_local_game_id().AppID()) { if (msg->lobby().owner() != settings->get_local_steam_id().ConvertToUint64() && msg->lobby().appid() == settings->get_local_game_id().AppID()) {
Lobby *lobby = get_lobby((uint64)msg->lobby().room_id()); Lobby *lobby = get_lobby((uint64)msg->lobby().room_id());
if (!lobby) { if (!lobby) {
@ -1604,7 +1617,7 @@ void Callback(Common_Message *msg)
bool we_are_in_lobby = !!get_lobby_member(lobby, settings->get_local_steam_id()); bool we_are_in_lobby = !!get_lobby_member(lobby, settings->get_local_steam_id());
if (lobby->owner() == settings->get_local_steam_id().ConvertToUint64()) { if (lobby->owner() == settings->get_local_steam_id().ConvertToUint64()) {
if (msg->lobby_messages().type() == Lobby_Messages::JOIN) { if (msg->lobby_messages().type() == Lobby_Messages::JOIN) {
PRINT_DEBUG("Steam_MatchMaking LOBBY MESSAGE: JOIN\n"); PRINT_DEBUG("Steam_MatchMaking LOBBY MESSAGE: JOIN, lobby=%llu from=%llu\n", (uint64)lobby->room_id(), (uint64)msg->source_id());
if (enter_lobby(lobby, (uint64)msg->source_id())) { if (enter_lobby(lobby, (uint64)msg->source_id())) {
trigger_lobby_member_join_leave((uint64)lobby->room_id(), (uint64)msg->source_id(), false, true, 0.01); trigger_lobby_member_join_leave((uint64)lobby->room_id(), (uint64)msg->source_id(), false, true, 0.01);
} }
@ -1644,7 +1657,7 @@ void Callback(Common_Message *msg)
if (msg->lobby_messages().type() == Lobby_Messages::CHAT_MESSAGE) { if (msg->lobby_messages().type() == Lobby_Messages::CHAT_MESSAGE) {
PRINT_DEBUG("Steam_MatchMaking LOBBY MESSAGE: CHAT MESSAGE\n"); PRINT_DEBUG("Steam_MatchMaking LOBBY MESSAGE: CHAT MESSAGE\n");
if (we_are_in_lobby) { if (we_are_in_lobby) {
struct Chat_Entry entry; struct Chat_Entry entry{};
entry.type = k_EChatEntryTypeChatMsg; entry.type = k_EChatEntryTypeChatMsg;
entry.message = msg->lobby_messages().bdata(); entry.message = msg->lobby_messages().bdata();
entry.lobby_id = CSteamID((uint64)msg->lobby_messages().id()); entry.lobby_id = CSteamID((uint64)msg->lobby_messages().id());

2
dll/steam_client.cpp
View File

@ -1910,7 +1910,7 @@ void Steam_Client::RunCallbacks(bool runClientCB, bool runGameserverCB, bool run
callbacks_client->runCallBacks(); callbacks_client->runCallBacks();
last_cb_run = std::chrono::duration_cast<std::chrono::duration<unsigned long long>>(std::chrono::system_clock::now().time_since_epoch()).count(); last_cb_run = std::chrono::duration_cast<std::chrono::duration<unsigned long long>>(std::chrono::system_clock::now().time_since_epoch()).count();
// PRINT_DEBUG("Steam_Client::RunCallbacks done ------------------------------------------------------\n"); PRINT_DEBUG("Steam_Client::RunCallbacks done ------------------------------------------------------\n");
} }
void Steam_Client::DestroyAllInterfaces() void Steam_Client::DestroyAllInterfaces()

2
dll/steam_gameserverstats.cpp
View File

@ -36,7 +36,7 @@ SteamAPICall_t Steam_GameServerStats::RequestUserStats( CSteamID steamIDUser )
PRINT_DEBUG("Steam_GameServerStats::RequestUserStats\n"); PRINT_DEBUG("Steam_GameServerStats::RequestUserStats\n");
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
GSStatsReceived_t data; GSStatsReceived_t data{};
data.m_eResult = k_EResultFail;//k_EResultOK; data.m_eResult = k_EResultFail;//k_EResultOK;
data.m_steamIDUser = steamIDUser; data.m_steamIDUser = steamIDUser;
return callback_results->addCallResult(data.k_iCallback, &data, sizeof(data)); return callback_results->addCallResult(data.k_iCallback, &data, sizeof(data));

1
overlay_experimental/overlay/steam_overlay.h
View File

@ -217,6 +217,7 @@ class Steam_Overlay
bool try_load_ach_gray_icon(Overlay_Achievement &ach); bool try_load_ach_gray_icon(Overlay_Achievement &ach);
void overlay_render_proc(); void overlay_render_proc();
void render_main_window();
void networking_msg_received(Common_Message* msg); void networking_msg_received(Common_Message* msg);
void steam_run_callback(); void steam_run_callback();

27
overlay_experimental/steam_overlay.cpp
View File

@ -674,14 +674,19 @@ bool Steam_Overlay::is_friend_joinable(std::pair<const Friend, friend_window_sta
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
Steam_Friends* steamFriends = get_steam_client()->steam_friends; Steam_Friends* steamFriends = get_steam_client()->steam_friends;
if( std::string(steamFriends->GetFriendRichPresence((uint64)f.first.id(), "connect")).length() > 0 ) if (std::string(steamFriends->GetFriendRichPresence((uint64)f.first.id(), "connect")).length() > 0 ) {
PRINT_DEBUG("Steam_Overlay::is_friend_joinable " "%" PRIu64 " true (connect string)\n", f.first.id());
return true; return true;
}
FriendGameInfo_t friend_game_info{}; FriendGameInfo_t friend_game_info{};
steamFriends->GetFriendGamePlayed((uint64)f.first.id(), &friend_game_info); steamFriends->GetFriendGamePlayed((uint64)f.first.id(), &friend_game_info);
if (friend_game_info.m_steamIDLobby.IsValid() && (f.second.window_state & window_state_lobby_invite)) if (friend_game_info.m_steamIDLobby.IsValid() && (f.second.window_state & window_state_lobby_invite)) {
PRINT_DEBUG("Steam_Overlay::is_friend_joinable " "%" PRIu64 " true (friend in a game)\n", f.first.id());
return true; return true;
}
PRINT_DEBUG("Steam_Overlay::is_friend_joinable " "%" PRIu64 " false\n", f.first.id());
return false; return false;
} }
@ -1153,6 +1158,7 @@ bool Steam_Overlay::try_load_ach_gray_icon(Overlay_Achievement &ach)
void Steam_Overlay::overlay_render_proc() void Steam_Overlay::overlay_render_proc()
{ {
initial_load_achievements_icons(); initial_load_achievements_icons();
std::lock_guard<std::recursive_mutex> lock(overlay_mutex); std::lock_guard<std::recursive_mutex> lock(overlay_mutex);
if (!Ready()) return; if (!Ready()) return;
@ -1166,18 +1172,21 @@ void Steam_Overlay::overlay_render_proc()
ImGui::SetNextWindowBgAlpha(0.55f); ImGui::SetNextWindowBgAlpha(0.55f);
} }
if (show_overlay) {
render_main_window();
}
if (notifications.size()) { if (notifications.size()) {
ImGui::PushFont(font_notif); ImGui::PushFont(font_notif);
build_notifications(io.DisplaySize.x, io.DisplaySize.y); build_notifications(io.DisplaySize.x, io.DisplaySize.y);
ImGui::PopFont(); ImGui::PopFont();
} }
// ******************** exit early if we shouldn't show the overlay }
if (!show_overlay) {
return;
}
// ********************
// Try to make this function as short as possible or it might affect game's fps.
void Steam_Overlay::render_main_window()
{
//ImGui::SetNextWindowFocus(); //ImGui::SetNextWindowFocus();
ImGui::PushFont(font_default); ImGui::PushFont(font_default);
bool show = true; bool show = true;
@ -1478,8 +1487,8 @@ void Steam_Overlay::overlay_render_proc()
ImGui::PopFont(); ImGui::PopFont();
if (!show) if (!show) ShowOverlay(false);
ShowOverlay(false);
} }
void Steam_Overlay::networking_msg_received(Common_Message *msg) void Steam_Overlay::networking_msg_received(Common_Message *msg)