Skip to content

tweak(communicator): Show friend requests above friends list #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tweak(communicator): Show friend requests above friends list #451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,30 @@ void updateBuddyInfo( void )
}
}

// FRIENDS
int i = 0;
// REQUESTS
for (auto& kvPair : pSocialInterface->GetCachedRequestsList())
{
FriendsEntry friendsEntry = kvPair.second;
int64_t profileID = friendsEntry.user_id;
AsciiString strName = AsciiString(friendsEntry.display_name.c_str());

// insert name into box
UnicodeString formatStr;
formatStr.translate(strName.str());
int index = GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], -1, -1);
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(profileID), index, 0);

// insert status into box
formatStr = TheGameText->fetch("GUI:BuddyAddReq");
GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], index, 1);
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(ITEM_REQUEST), index, 1);

if (profileID == selectedProfile)
selected = index;
}

// FRIENDS
int i = 0;
auto friendsMap = pSocialInterface->GetCachedFriendsList();
std::vector<std::pair<int64_t, FriendsEntry>> sortedFriends(friendsMap.begin(), friendsMap.end());
std::stable_sort(sortedFriends.begin(), sortedFriends.end(),
Expand Down Expand Up @@ -654,28 +676,6 @@ void updateBuddyInfo( void )
selected = index;
}

// REQUESTS
for (auto& kvPair : pSocialInterface->GetCachedRequestsList())
{
FriendsEntry friendsEntry = kvPair.second;
int64_t profileID = friendsEntry.user_id;
AsciiString strName = AsciiString(friendsEntry.display_name.c_str());

// insert name into box
UnicodeString formatStr;
formatStr.translate(strName.str());
int index = GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], -1, -1);
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(profileID), index, 0);

// insert status into box
formatStr = TheGameText->fetch("GUI:BuddyAddReq");
GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], index, 1);
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(ITEM_REQUEST), index, 1);

if (profileID == selectedProfile)
selected = index;
}

// select the same guy
if (selected >= 0)
{
Expand Down
Loading