fix(network): correctly map PlayerIndex to SlotIndex in CRC validation

Core/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp

@@ -2393,15 +2393,8 @@ bool GameLogic::onLogicCrc(MAYBE_UNUSED GameMessage *msg)
 	Player *msgPlayer = getMessagePlayer(msg);
 	if (TheNetwork)
 	{
-		Int slotIndex = -1;
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			if (msgPlayer->getPlayerType() == PLAYER_HUMAN && TheNetwork->getPlayerName(i) == msgPlayer->getPlayerDisplayName())
-			{
-				slotIndex = i;
-				break;
-			}
-		}
+		// GeneralsX @bugfix felipebraz 05/07/2026 Use pre-computed slot index to avoid string comparisons
+		Int slotIndex = ThePlayerList->getSlotIndex(msgPlayer->getPlayerIndex());
 
 		if (slotIndex < 0 || !TheNetwork->isPlayerConnected(slotIndex))
 			return false;

Generals/Code/GameEngine/Include/Common/PlayerList.h

@@ -156,6 +156,8 @@ class PlayerList : public SubsystemInterface,
 	*/
 	PlayerMaskType getPlayersWithRelationship( Int srcPlayerIndex, UnsignedInt allowedRelationships );
 
+	Byte getSlotIndex(Int playerIndex) const;
+
 protected:
 
 	// snapshot methods
@@ -164,10 +166,13 @@ class PlayerList : public SubsystemInterface,
 	virtual void loadPostProcess() override;
 
 private:
+	void resolveSlotIndices();
+	void setSlotIndex(Int playerIndex, Byte slotIndex);
 
 	Player				*m_local;
 	Int						m_playerCount;
 	Player				*m_players[MAX_PLAYER_COUNT];
+	Byte					m_slotIndices[MAX_PLAYER_COUNT];
 
 };
 

Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp

@@ -59,7 +59,8 @@
 #endif
 #include "GameLogic/SidesList.h"
 #include "GameNetwork/NetworkDefs.h"
-
+#include "GameNetwork/GameInfo.h"
+#include <algorithm>
 
 //-----------------------------------------------------------------------------
 /*extern*/ PlayerList *ThePlayerList = nullptr;
@@ -69,9 +70,10 @@ PlayerList::PlayerList() :
 	m_local(nullptr),
 	m_playerCount(0)
 {
-	// we only allocate a few of these, so don't bother pooling 'em
 	for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+	{
 		m_players[ i ] = NEW Player( i );
+	}
 	init();
 }
 
@@ -239,6 +241,8 @@ void PlayerList::newGame()
 		p->setDefaultTeam();
 	}
 
+	// GeneralsX @bugfix felipebraz 05/07/2026 Pre-compute the network slot to player mapping
+	resolveSlotIndices();
 }
 
 //-----------------------------------------------------------------------------
@@ -250,6 +254,8 @@ void PlayerList::init()
 	for (int i = 1; i < MAX_PLAYER_COUNT; i++)
 		m_players[i]->init(nullptr);
 
+	std::fill(m_slotIndices, m_slotIndices + MAX_PLAYER_COUNT, -1);
+
 	// call setLocalPlayer so that becomingLocalPlayer() gets called appropriately
 	setLocalPlayer(m_players[0]);
 
@@ -495,3 +501,46 @@ void PlayerList::loadPostProcess()
 
 }
 
+//-----------------------------------------------------------------------------
+void PlayerList::setSlotIndex(Int playerIndex, Byte slotIndex)
+{
+	if (playerIndex >= 0 && playerIndex < ARRAY_SIZE(m_slotIndices))
+	{
+		m_slotIndices[playerIndex] = slotIndex;
+	}
+}
+
+//-----------------------------------------------------------------------------
+Byte PlayerList::getSlotIndex(Int playerIndex) const
+{
+	if (playerIndex >= 0 && playerIndex < ARRAY_SIZE(m_slotIndices))
+	{
+		return m_slotIndices[playerIndex];
+	}
+
+	return -1;
+}
+
+//-----------------------------------------------------------------------------
+void PlayerList::resolveSlotIndices()
+{
+	if (!TheGameInfo)
+		return;
+
+	AsciiString playerName;
+
+	for (Int i = 0; i < MAX_SLOTS; ++i)
+	{
+		const GameSlot* slot = TheGameInfo->getSlot(i);
+		if (!slot || !slot->isOccupied())
+			continue;
+
+		playerName.format("player%d", i);
+
+		Player* player = findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(playerName));
+		if (player)
+		{
+			setSlotIndex(player->getPlayerIndex(), i);
+		}
+	}
+}

Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -2379,9 +2379,10 @@ void GameLogic::processCommandList( CommandList *list )
 				{
 					// TheSuperHackers @bugfix Caball009 14/06/2026 Check if player is still connected,
 					// to avoid spurious mismatches at low CRC intervals, e.g. every frame.
-					if (!TheNetwork->isPlayerConnected(it->first))
+					// GeneralsX @bugfix felipebraz 05/07/2026 Use pre-computed slot index.
+					const Int slotIndex = ThePlayerList->getSlotIndex(it->first);
+					if (slotIndex >= 0 && !TheNetwork->isPlayerConnected(slotIndex))
 						continue;
-
 					const UnsignedInt crc = it->second;
 
 					if (!hasReferenceCRC)

GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h

@@ -156,6 +156,8 @@ class PlayerList : public SubsystemInterface,
 	*/
 	PlayerMaskType getPlayersWithRelationship( Int srcPlayerIndex, UnsignedInt allowedRelationships );
 
+	Byte getSlotIndex(Int playerIndex) const;
+
 protected:
 
 	// snapshot methods
@@ -164,10 +166,13 @@ class PlayerList : public SubsystemInterface,
 	virtual void loadPostProcess() override;
 
 private:
+	void resolveSlotIndices();
+	void setSlotIndex(Int playerIndex, Byte slotIndex);
 
 	Player				*m_local;
 	Int						m_playerCount;
 	Player				*m_players[MAX_PLAYER_COUNT];
+	Byte					m_slotIndices[MAX_PLAYER_COUNT];
 
 };
 

GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp

@@ -59,7 +59,8 @@
 #endif
 #include "GameLogic/SidesList.h"
 #include "GameNetwork/NetworkDefs.h"
-
+#include "GameNetwork/GameInfo.h"
+#include <algorithm>
 
 //-----------------------------------------------------------------------------
 /*extern*/ PlayerList *ThePlayerList = nullptr;
@@ -69,9 +70,10 @@ PlayerList::PlayerList() :
 	m_local(nullptr),
 	m_playerCount(0)
 {
-	// we only allocate a few of these, so don't bother pooling 'em
 	for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+	{
 		m_players[ i ] = NEW Player( i );
+	}
 	init();
 }
 
@@ -241,6 +243,8 @@ void PlayerList::newGame()
 		p->setDefaultTeam();
 	}
 
+	// GeneralsX @bugfix felipebraz 05/07/2026 Pre-compute the network slot to player mapping
+	resolveSlotIndices();
 }
 
 //-----------------------------------------------------------------------------
@@ -252,6 +256,8 @@ void PlayerList::init()
 	for (int i = 1; i < MAX_PLAYER_COUNT; i++)
 		m_players[i]->init(nullptr);
 
+	std::fill(m_slotIndices, m_slotIndices + MAX_PLAYER_COUNT, -1);
+
 	// call setLocalPlayer so that becomingLocalPlayer() gets called appropriately
 	setLocalPlayer(m_players[0]);
 
@@ -494,6 +500,50 @@ void PlayerList::xfer( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void PlayerList::loadPostProcess()
 {
+    std::fill(m_slotIndices, m_slotIndices + ARRAY_SIZE(m_slotIndices), 255);
+}
 
+//-----------------------------------------------------------------------------
+void PlayerList::setSlotIndex(Int playerIndex, Byte slotIndex)
+{
+	if (playerIndex >= 0 && playerIndex < ARRAY_SIZE(m_slotIndices))
+	{
+		m_slotIndices[playerIndex] = slotIndex;
+	}
+}
+
+//-----------------------------------------------------------------------------
+Byte PlayerList::getSlotIndex(Int playerIndex) const
+{
+	if (playerIndex >= 0 && playerIndex < ARRAY_SIZE(m_slotIndices))
+	{
+		return m_slotIndices[playerIndex];
+	}
+
+	return -1;
+}
+
+//-----------------------------------------------------------------------------
+void PlayerList::resolveSlotIndices()
+{
+	if (!TheGameInfo)
+		return;
+
+	AsciiString playerName;
+
+	for (Int i = 0; i < MAX_SLOTS; ++i)
+	{
+		const GameSlot* slot = TheGameInfo->getSlot(i);
+		if (!slot || !slot->isOccupied())
+			continue;
+
+		playerName.format("player%d", i);
+
+		Player* player = findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(playerName));
+		if (player)
+		{
+			setSlotIndex(player->getPlayerIndex(), i);
+		}
+	}
 }
 

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -2730,9 +2730,10 @@ void GameLogic::processCommandList( CommandList *list )
 				{
 					// TheSuperHackers @bugfix Caball009 14/06/2026 Check if player is still connected,
 					// to avoid spurious mismatches at low CRC intervals, e.g. every frame.
-					if (!TheNetwork->isPlayerConnected(it->first))
+					// GeneralsX @bugfix felipebraz 05/07/2026 Use pre-computed slot index.
+					const Int slotIndex = ThePlayerList->getSlotIndex(it->first);
+					if (slotIndex >= 0 && !TheNetwork->isPlayerConnected(slotIndex))
 						continue;
-
 					const UnsignedInt crc = it->second;
 
 					if (!hasReferenceCRC)