sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Finishing server side invitation system.

Browse Source
This commit is contained in:
lotodore
2010-03-30 17:10:37 +00:00
parent 1eadf21051
commit 5239f496f3
6 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergamestate.cpp
+9 -3
View File
@@ -316,12 +316,13 @@ ServerGameStateInit::NotifyGameAdminChanged(boost::shared_ptr<ServerGame> server
void
ServerGameStateInit::HandleNewSession(boost::shared_ptr<ServerGame> server, SessionWrapper session)
{
if (session.sessionData.get() && session.playerData.get())
if (session.sessionData && session.playerData)
{
size_t curNumPlayers = server->GetCurNumberOfPlayers();
const GameData &tmpGameData = server->GetGameData();
// Check the number of players.
if (curNumPlayers >= (size_t)server->GetGameData().maxNumberOfPlayers)
if (curNumPlayers >= (size_t)tmpGameData.maxNumberOfPlayers)
{
server->MoveSessionToLobby(session, NTF_NET_REMOVED_GAME_FULL);
}
@@ -477,7 +478,12 @@ ServerGameStateInit::InternalProcessPacket(boost::shared_ptr<ServerGame> server,
bool requestSent = server->GetLobbyThread().SendToLobbyPlayer(netInvite->playerId, packet);
server->SendToAllPlayers(packet, SessionData::Game);
if (!requestSent)
if (requestSent)
{
// This player has been invited.
server->AddPlayerInvitation(netInvite->playerId);
}
else
{
// Player is not in lobby - send reject message.
boost::shared_ptr<NetPacket> p2(new NetPacket(NetPacket::Alloc));