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

Major design change in network protocol: Player information is now requested by clients whenever it is needed. The server only sends player ids. The client has a cache with player information.

Browse Source
This commit is contained in:
lotodore
2007-08-26 22:41:37 +00:00
parent ba17f1d08e
commit 56b24e09eb
19 changed files with 755 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+30 -4
View File
@@ -31,6 +31,8 @@
#include <game.h>
#include <playerinterface.h>
#include <sstream>
using namespace std;
#define CLIENT_WAIT_TIMEOUT_MSEC 50
@@ -378,7 +380,13 @@ AbstractClientStateReceiving::Process(ClientThread &client)
if (tmpPacket.get())
{
if (tmpPacket->ToNetPacketError())
if (tmpPacket->ToNetPacketPlayerInfo())
{
NetPacketPlayerInfo::Data infoData;
tmpPacket->ToNetPacketPlayerInfo()->GetData(infoData);
client.SetPlayerInfo(infoData.playerId, infoData.playerInfo);
}
else if (tmpPacket->ToNetPacketError())
{
// Server reported an error.
NetPacketError::Data errorData;
@@ -564,9 +572,27 @@ ClientStateWaitGame::InternalProcess(ClientThread &client, boost::shared_ptr<Net
NetPacketPlayerJoined::Data netPlayerData;
packet->ToNetPacketPlayerJoined()->GetData(netPlayerData);
boost::shared_ptr<PlayerData> playerData(
new PlayerData(netPlayerData.playerId, 0, netPlayerData.ptype, netPlayerData.prights));
playerData->SetName(netPlayerData.playerName);
boost::shared_ptr<PlayerData> playerData;
try
{
PlayerInfo info = client.GetCachedPlayerInfo(netPlayerData.playerId);
playerData.reset(
new PlayerData(netPlayerData.playerId, 0, info.ptype, netPlayerData.prights));
playerData->SetName(info.playerName);
} catch (const NetException &)
{
ostringstream name;
name << "#" << netPlayerData.playerId;
// Request player info.
PlayerInfo info;
info.playerName = name.str();
client.RequestPlayerInfo(netPlayerData.playerId, info);
// Use temporary data until the PlayerInfo request is completed.
playerData.reset(
new PlayerData(netPlayerData.playerId, 0, info.ptype, netPlayerData.prights));
playerData->SetName(info.playerName);
}
client.AddPlayerData(playerData);
}