From ed6b0e41ef805df7e39d41e9603ce2e971a5f8ae Mon Sep 17 00:00:00 2001 From: MrS-ibra Date: Sat, 4 Apr 2026 04:23:42 +0300 Subject: [PATCH] tweak(communicator): Show friend requests above friends list --- .../GUICallbacks/Menus/WOLBuddyOverlay.cpp | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp index 1a0d20f5e7..8ecadc7c41 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp @@ -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> sortedFriends(friendsMap.begin(), friendsMap.end()); std::stable_sort(sortedFriends.begin(), sortedFriends.end(), @@ -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) {