Skip to content

Commit dc0dec7

Browse files
committed
fix sort
1 parent 5095dbc commit dc0dec7

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/game/server/swarm/asw_player.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
#include "missionchooser/iasw_mission_chooser_source.h"
5858
#include "rd_vgui_vscript_shared.h"
5959
#include "rd_crafting_defs.h"
60+
#include <algorithm>
6061

6162
// memdbgon must be the last include file in a .cpp file!!!
6263
#include "tier0/memdbgon.h"
@@ -2195,7 +2196,7 @@ void CASW_Player::SetSpectatingOrder( const int* iProfiles, int nProfiles )
21952196
m_bSpectatingInOrder = true;
21962197
}
21972198

2198-
bool _CompareMarinesSpectatingPriority( CASW_Marine* pM1, CASW_Marine* pM2 )
2199+
bool CASW_Player::CompareMarinesSpectatingPriority( CASW_Marine* pM1, CASW_Marine* pM2 ) const
21992200
{
22002201
// Assign worst priority if no marine or no profile index
22012202
const int iProfile1 = pM1 ? pM1->GetMarineProfile()->m_ProfileIndex : INT_MAX;
@@ -2228,7 +2229,11 @@ void CASW_Player::SpectateNextMarineInOrder()
22282229
}
22292230
}
22302231

2231-
qsort( pMarinesSorted, iSortedCount, sizeof(CASW_Marine*), _CompareMarinesSpectatingPriority );
2232+
std::sort(
2233+
pMarinesSorted,
2234+
pMarinesSorted + iSortedCount,
2235+
[this](CASW_Marine* a, CASW_Marine* b) { return CompareMarinesSpectatingPriority(a, b); }
2236+
);
22322237

22332238
//Msg("CASW_Player::SpectateNextMarineInOrder\n");
22342239

src/game/server/swarm/asw_player.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ class CASW_Player : public CBaseMultiplayerPlayer, public IASWPlayerAnimStateHel
8989
private:
9090
bool m_bSpectatingInOrder = false;
9191
int m_iSpectatingMapping[ASW_NUM_MARINE_PROFILES];
92+
bool CompareMarinesSpectatingPriority( CASW_Marine* pM1, CASW_Marine* pM2 ) const;
9293
void SpectateNextMarineInOrder();
9394
public:
9495
void UnsetSpectatingOrder() { m_bSpectatingInOrder = false; }

0 commit comments

Comments
 (0)