Skip to content

Commit ed6b0e4

Browse files
committed
tweak(communicator): Show friend requests above friends list
1 parent 6d3f224 commit ed6b0e4

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,30 @@ void updateBuddyInfo( void )
583583
}
584584
}
585585

586-
// FRIENDS
587-
int i = 0;
586+
// REQUESTS
587+
for (auto& kvPair : pSocialInterface->GetCachedRequestsList())
588+
{
589+
FriendsEntry friendsEntry = kvPair.second;
590+
int64_t profileID = friendsEntry.user_id;
591+
AsciiString strName = AsciiString(friendsEntry.display_name.c_str());
592+
593+
// insert name into box
594+
UnicodeString formatStr;
595+
formatStr.translate(strName.str());
596+
int index = GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], -1, -1);
597+
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(profileID), index, 0);
598+
599+
// insert status into box
600+
formatStr = TheGameText->fetch("GUI:BuddyAddReq");
601+
GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], index, 1);
602+
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(ITEM_REQUEST), index, 1);
603+
604+
if (profileID == selectedProfile)
605+
selected = index;
606+
}
607+
608+
// FRIENDS
609+
int i = 0;
588610
auto friendsMap = pSocialInterface->GetCachedFriendsList();
589611
std::vector<std::pair<int64_t, FriendsEntry>> sortedFriends(friendsMap.begin(), friendsMap.end());
590612
std::stable_sort(sortedFriends.begin(), sortedFriends.end(),
@@ -654,28 +676,6 @@ void updateBuddyInfo( void )
654676
selected = index;
655677
}
656678

657-
// REQUESTS
658-
for (auto& kvPair : pSocialInterface->GetCachedRequestsList())
659-
{
660-
FriendsEntry friendsEntry = kvPair.second;
661-
int64_t profileID = friendsEntry.user_id;
662-
AsciiString strName = AsciiString(friendsEntry.display_name.c_str());
663-
664-
// insert name into box
665-
UnicodeString formatStr;
666-
formatStr.translate(strName.str());
667-
int index = GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], -1, -1);
668-
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(profileID), index, 0);
669-
670-
// insert status into box
671-
formatStr = TheGameText->fetch("GUI:BuddyAddReq");
672-
GadgetListBoxAddEntryText(buddyControls.listboxBuddies, formatStr, GameSpyColor[GSCOLOR_DEFAULT], index, 1);
673-
GadgetListBoxSetItemData(buddyControls.listboxBuddies, (void*)(ITEM_REQUEST), index, 1);
674-
675-
if (profileID == selectedProfile)
676-
selected = index;
677-
}
678-
679679
// select the same guy
680680
if (selected >= 0)
681681
{

0 commit comments

Comments
 (0)