bitwise operator saga begins

Author: jhh8

src/game/client/swarm/c_asw_player.h

@@ -146,7 +146,7 @@ class C_ASW_Player : public C_BasePlayer, public IASWPlayerAnimStateHelpers
 	CInterpolatedVar< QAngle >	m_iv_angEyeAngles;
 	CNetworkHandle( C_ASW_Inhabitable_NPC, m_hInhabiting ); // our currently controlled marine
 	CNetworkHandle( C_ASW_Inhabitable_NPC, m_hSpectating ); // the marine we're spectating when dead
-	CNetworkVar( int, m_iSpectatorIndexes );
+	CNetworkVar( unsigned int, m_iSpectatorIndexes );
 	const Vector& GetCrosshairTracePos() { return m_vecCrosshairTracePos; }
 	void SetCrosshairTracePos( const Vector &vecPos ) { m_vecCrosshairTracePos = vecPos; }
 	Vector m_vecCrosshairTracePos;			// the world location directly beneath the player's crosshair

src/game/client/vgui_fpspanel.cpp

@@ -537,19 +537,18 @@ void CFPSPanel::Paint()
 			i += 3;
 
 			int nSpecCount = 0;
-			for ( int id = 1; id < 31; id += 1 )
+			for ( int id = 1; id <= 32; id += 1 )
 			{
 				if ( !g_PR->IsConnected( id ) )
 					continue;
 
 				if ( g_PR->IsFakePlayer( id ) )
 					continue;
 
-				if ( !( pPlayer->m_iSpectatorIndexes.Get() & static_cast<int>( pow( 2, id ) ) ) )
+				if ( !( pPlayer->m_iSpectatorIndexes.Get() & ( 1u << id ) ) )
 					continue;
 
 				nSpecCount++;
-
 				i++;
 
 				char szSpecName[k_cchPersonaNameMax] = { 0 };
@@ -560,7 +559,10 @@ void CFPSPanel::Paint()
 			}
 
 			if ( nSpecCount == 0 )
+			{
+				i -= 3;
 				break;
+			}
 
 			char szName[k_cchPersonaNameMax] = { 0 };
 			Q_strncpy( szName, pPlayer->GetPlayerName(), sizeof( szName ) );

src/game/server/swarm/asw_player.cpp

@@ -2218,11 +2218,11 @@ void CASW_Player::SpectateNextMarine()
 
 void CASW_Player::SetSpectatingNPC( CASW_Inhabitable_NPC *pSpectating )
 {
-	int nOwnIndex = pow( 2, GetClientIndex() + 1 );
+	unsigned int nOwnIndex = 1u << ( GetClientIndex() + 1 );
 	CASW_Inhabitable_NPC *pSpectatingPrevious = GetSpectatingNPC();
 	if ( pSpectatingPrevious && pSpectatingPrevious->GetCommander() )
 	{
-		pSpectatingPrevious->GetCommander()->m_iSpectatorIndexes -= nOwnIndex;
+		pSpectatingPrevious->GetCommander()->m_iSpectatorIndexes &=~ nOwnIndex;
 	}
 
 	m_hSpectating = pSpectating;
@@ -2234,7 +2234,7 @@ void CASW_Player::SetSpectatingNPC( CASW_Inhabitable_NPC *pSpectating )
 	if ( !pPlayer )
 		return;
 
-	pPlayer->m_iSpectatorIndexes += nOwnIndex;
+	pPlayer->m_iSpectatorIndexes |= nOwnIndex;
 }
 
 CASW_Inhabitable_NPC *CASW_Player::GetSpectatingNPC() const

src/game/server/swarm/asw_player.h

@@ -91,7 +91,7 @@ class CASW_Player : public CBaseMultiplayerPlayer, public IASWPlayerAnimStateHel
 	CASW_Inhabitable_NPC *GetSpectatingNPC() const;
 	HSCRIPT ScriptGetSpectatingNPC() const;
 	CNetworkHandle( CASW_Inhabitable_NPC, m_hSpectating );
-	CNetworkVar( int, m_iSpectatorIndexes );
+	CNetworkVar( unsigned int, m_iSpectatorIndexes );
 	bool m_bLastAttackButton;	// used to detect left clicks for cycling through marines
 	bool m_bLastAttack2Button;	// used to detect right clicks for cycling through marines
 	bool m_bRequestedSpectator;	// this player requested to be a spectator since the start of a match (won't be considered for leader, campaign votes, etc.)