Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow joining of the same amount of players a map is intended for (rather than one less); patch #976 by Buginator, slightly trimmed by me 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3764 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-02-12 18:14:18 +00:00
parent 4c3a85762b
commit 6de67c3fc7
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/multiint.c
View File

@ -559,11 +559,12 @@ void runGameFind(void )
if( ( NetPlay.games[gameNumber].desc.dwCurrentPlayers < NetPlay.games[gameNumber].desc.dwMaxPlayers)
&& !(NetPlay.games[gameNumber].desc.dwFlags & SESSION_JOINDISABLED) ) // if still joinable
{
// TODO: Check whether this code is used at all in skirmish games, if not, remove it.
// if skirmish, check it wont take the last slot
if( NETgetGameFlagsUnjoined(gameNumber,1) == SKIRMISH
&& (NetPlay.games[gameNumber].desc.dwCurrentPlayers >= NetPlay.games[gameNumber].desc.dwMaxPlayers -1)
)
if (bMultiPlayer
&& !NetPlay.bComms
&& NETgetGameFlagsUnjoined(gameNumber,1) == SKIRMISH
&& (NetPlay.games[gameNumber].desc.dwCurrentPlayers >= NetPlay.games[gameNumber].desc.dwMaxPlayers - 1))
{
goto FAIL;
}
@ -2384,15 +2385,13 @@ void displayRemoteGame(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGH
iV_DrawText(NetPlay.games[i].name, x + 100, y + 24); // name
// get game info.
if( (NetPlay.games[i].desc.dwFlags & SESSION_JOINDISABLED)
|| (NetPlay.games[i].desc.dwCurrentPlayers >= NetPlay.games[i].desc.dwMaxPlayers) // if not joinable
||( (NETgetGameFlagsUnjoined(gameNumber,1)== SKIRMISH) // the LAST bug...
&&(NetPlay.games[gameNumber].desc.dwCurrentPlayers >= NetPlay.games[gameNumber].desc.dwMaxPlayers -1)
)
)
// TODO: Check whether this code is used at all in skirmish games, if not, remove it.
if ((NetPlay.games[i].desc.dwFlags & SESSION_JOINDISABLED)
|| NetPlay.games[i].desc.dwCurrentPlayers >= NetPlay.games[i].desc.dwMaxPlayers // if not joinable
|| (NETgetGameFlagsUnjoined(gameNumber,1) == SKIRMISH // the LAST bug...
&& NetPlay.games[gameNumber].desc.dwCurrentPlayers >= NetPlay.games[gameNumber].desc.dwMaxPlayers - 1))
{
// FIXME: We should really use another way to indicate that the game is full than our current big fat cross.
// need some sort of closed thing here!
iV_DrawImage(FrontImages,IMAGE_NOJOIN,x+18,y+11);
}