mirrors/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2024-11-14 10:50:13 +01:00
Code Issues Activity

Add infos on friend game

Browse source 
Add friend appid and check if the game is compatible.
This commit is contained in:
Nemirtingas 2019-10-14 16:35:36 +02:00
parent bce574dc43
commit c006555b01
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
overlay_experimental/steam_overlay.cpp
View file

@ -268,6 +268,7 @@ void Steam_Overlay::FriendConnect(Friend _friend)
if (id != 0) if (id != 0)
{ {
auto& item = friends[_friend]; auto& item = friends[_friend];
item.window_title = std::move(_friend.name() + " playing " + std::to_string(_friend.appid()));
item.window_state = window_state_none; item.window_state = window_state_none;
item.id = id; item.id = id;
memset(item.chat_input, 0, max_chat_len); memset(item.chat_input, 0, max_chat_len);
@ -337,6 +338,9 @@ void Steam_Overlay::BuildContextMenu(Friend const& frd, friend_window_state& sta
state.window_state |= window_state_show; state.window_state |= window_state_show;
close_popup = true; close_popup = true;
} }
// If we have the same appid, activate the invite/join buttons
if (settings->get_local_game_id().AppID() == frd.appid())
{
if (IHaveLobby() && ImGui::Button("Invite")) if (IHaveLobby() && ImGui::Button("Invite"))
{ {
state.window_state |= window_state_invite; state.window_state |= window_state_invite;
@ -349,7 +353,7 @@ void Steam_Overlay::BuildContextMenu(Friend const& frd, friend_window_state& sta
has_friend_action.push(frd); has_friend_action.push(frd);
close_popup = true; close_popup = true;
} }
}
if( close_popup) if( close_popup)
{ {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
@ -377,7 +381,8 @@ void Steam_Overlay::BuildFriendWindow(Friend const& frd, friend_window_state& st
ImVec2{ std::numeric_limits<float>::max() , std::numeric_limits<float>::max() }); ImVec2{ std::numeric_limits<float>::max() , std::numeric_limits<float>::max() });
// Window id is after the ###, the window title is the friend name // Window id is after the ###, the window title is the friend name
if (ImGui::Begin((frd.name()+"###"+std::to_string(state.id)).c_str(), &show)) std::string friend_window_id = std::move("###" + std::to_string(state.id));
if (ImGui::Begin((state.window_title + friend_window_id).c_str(), &show))
{ {
if (state.window_state & window_state_need_attention && ImGui::IsWindowFocused()) if (state.window_state & window_state_need_attention && ImGui::IsWindowFocused())
{ {
@ -575,7 +580,7 @@ void Steam_Overlay::OverlayProc()
{ {
ImGui::PushID(i.second.id-base_friend_window_id+base_friend_item_id); ImGui::PushID(i.second.id-base_friend_window_id+base_friend_item_id);
ImGui::Selectable(i.first.name().c_str(), false, ImGuiSelectableFlags_AllowDoubleClick); ImGui::Selectable(i.second.window_title.c_str(), false, ImGuiSelectableFlags_AllowDoubleClick);
BuildContextMenu(i.first, i.second); BuildContextMenu(i.first, i.second);
if (ImGui::IsItemClicked() && ImGui::IsMouseDoubleClicked(0)) if (ImGui::IsItemClicked() && ImGui::IsMouseDoubleClicked(0))
{ {

1
overlay_experimental/steam_overlay.h
View file

@ -23,6 +23,7 @@ struct friend_window_state
{ {
int id; int id;
uint8 window_state; uint8 window_state;
std::string window_title;
union // The invitation (if any) union // The invitation (if any)
{ {
uint64 lobbyId; uint64 lobbyId;