Skip to content

bugfix(lan): Always allow players to join a LAN room if there is an open slot #1637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2025
Merged

bugfix(lan): Always allow players to join a LAN room if there is an open slot #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d135a5
bugfix: Always allow players to join a LAN room if there is an open slot
Stubbjax Sep 26, 2025
7f487c4
docs: Add comments
Stubbjax Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 24 additions & 44 deletions Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,55 +307,35 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
}
}

// See if there's room
// First get the number of players currently in the room.
Int numPlayers = 0;
for (player = 0; player < MAX_SLOTS; ++player)
// TheSuperHackers @bugfix Stubbjax 26/09/2025 Players can now join open slots regardless of starting spots on the map.
for (player = 0; canJoin && player<MAX_SLOTS; ++player)
{
if (m_currentGame->getLANSlot(player)->isOccupied()
&& !(m_currentGame->getLANSlot(player)->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER))
if (m_currentGame->getLANSlot(player)->isOpen())
{
++numPlayers;
}
}
// OK, add him in.
reply.LANMessageType = LANMessage::MSG_JOIN_ACCEPT;
wcsncpy(reply.GameJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
reply.GameJoined.gameName[g_lanGameNameLength] = 0;
reply.GameJoined.slotPosition = player;
reply.GameJoined.gameIP = m_localIP;
reply.GameJoined.playerIP = senderIP;

LANGameSlot newSlot;
newSlot.setState(SLOT_PLAYER, UnicodeString(msg->name));
newSlot.setIP(senderIP);
newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
newSlot.setLastHeard(timeGetTime());
newSlot.setSerial(msg->GameToJoin.serial);
m_currentGame->setSlot(player,newSlot);
DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game", msg->name, senderIP));

OnPlayerJoin(player, UnicodeString(msg->name));
responseIP = 0;

// now get the number of starting spots on the map.
Int numStartingSpots = MAX_SLOTS;
const MapMetaData *md = TheMapCache->findMap(m_currentGame->getMap());
if (md != NULL)
{
numStartingSpots = md->m_numPlayers;
}

if (numPlayers < numStartingSpots) {
for (player = 0; canJoin && player<MAX_SLOTS; ++player)
{
if (m_currentGame->getLANSlot(player)->isOpen())
{
// OK, add him in.
reply.LANMessageType = LANMessage::MSG_JOIN_ACCEPT;
wcsncpy(reply.GameJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
reply.GameJoined.gameName[g_lanGameNameLength] = 0;
reply.GameJoined.slotPosition = player;
reply.GameJoined.gameIP = m_localIP;
reply.GameJoined.playerIP = senderIP;

LANGameSlot newSlot;
newSlot.setState(SLOT_PLAYER, UnicodeString(msg->name));
newSlot.setIP(senderIP);
newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
newSlot.setLastHeard(timeGetTime());
newSlot.setSerial(msg->GameToJoin.serial);
m_currentGame->setSlot(player,newSlot);
DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game", msg->name, senderIP));

OnPlayerJoin(player, UnicodeString(msg->name));
responseIP = 0;

break;
}
break;
}
}

if (canJoin && player == MAX_SLOTS)
{
reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
Expand Down
68 changes: 24 additions & 44 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,55 +308,35 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
}
}

// See if there's room
// First get the number of players currently in the room.
Int numPlayers = 0;
for (player = 0; player < MAX_SLOTS; ++player)
// TheSuperHackers @bugfix Stubbjax 26/09/2025 Players can now join open slots regardless of starting spots on the map.
for (player = 0; canJoin && player<MAX_SLOTS; ++player)
{
if (m_currentGame->getLANSlot(player)->isOccupied()
&& !(m_currentGame->getLANSlot(player)->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER))
if (m_currentGame->getLANSlot(player)->isOpen())
{
++numPlayers;
}
}
// OK, add him in.
reply.LANMessageType = LANMessage::MSG_JOIN_ACCEPT;
wcsncpy(reply.GameJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
reply.GameJoined.gameName[g_lanGameNameLength] = 0;
reply.GameJoined.slotPosition = player;
reply.GameJoined.gameIP = m_localIP;
reply.GameJoined.playerIP = senderIP;

LANGameSlot newSlot;
newSlot.setState(SLOT_PLAYER, UnicodeString(msg->name));
newSlot.setIP(senderIP);
newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
newSlot.setLastHeard(timeGetTime());
newSlot.setSerial(msg->GameToJoin.serial);
m_currentGame->setSlot(player,newSlot);
DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game", msg->name, senderIP));

OnPlayerJoin(player, UnicodeString(msg->name));
responseIP = 0;

// now get the number of starting spots on the map.
Int numStartingSpots = MAX_SLOTS;
const MapMetaData *md = TheMapCache->findMap(m_currentGame->getMap());
if (md != NULL)
{
numStartingSpots = md->m_numPlayers;
}

if (numPlayers < numStartingSpots) {
for (player = 0; canJoin && player<MAX_SLOTS; ++player)
{
if (m_currentGame->getLANSlot(player)->isOpen())
{
// OK, add him in.
reply.LANMessageType = LANMessage::MSG_JOIN_ACCEPT;
wcsncpy(reply.GameJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
reply.GameJoined.gameName[g_lanGameNameLength] = 0;
reply.GameJoined.slotPosition = player;
reply.GameJoined.gameIP = m_localIP;
reply.GameJoined.playerIP = senderIP;

LANGameSlot newSlot;
newSlot.setState(SLOT_PLAYER, UnicodeString(msg->name));
newSlot.setIP(senderIP);
newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
newSlot.setLastHeard(timeGetTime());
newSlot.setSerial(msg->GameToJoin.serial);
m_currentGame->setSlot(player,newSlot);
DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game", msg->name, senderIP));

OnPlayerJoin(player, UnicodeString(msg->name));
responseIP = 0;

break;
}
break;
}
}

if (canJoin && player == MAX_SLOTS)
{
reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
Expand Down
Loading