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

Yessss. Dedicated server is working, with some effort you can now create and join a game (start console server on local pc, start clients and use menu item "internet game"). Make sure to use different player names, there are no error messages yet.

Browse Source 
More than one game cannot be created yet, but this is only due to no name input. Lots of issues still, don't expect this to be stable.
This commit is contained in:
lotodore
2007-08-21 13:18:18 +00:00
parent 7210d1b1b4
commit 3e4b134faa
7 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+7 -10
View File
@@ -433,7 +433,6 @@ int
ClientStateWaitSession::InternalProcess(ClientThread &client, boost::shared_ptr<NetPacket> packet)
{
int retVal = MSG_SOCK_INTERNAL_PENDING;
ClientContext &context = client.GetContext();
if (packet->ToNetPacketInitAck())
{
@@ -442,12 +441,6 @@ ClientStateWaitSession::InternalProcess(ClientThread &client, boost::shared_ptr<
packet->ToNetPacketInitAck()->GetData(initAckData);
client.SetGuiPlayerId(initAckData.playerId);
// Player number is 0 on init. Will be set when the game starts.
boost::shared_ptr<PlayerData> playerData(
new PlayerData(initAckData.playerId, 0, PLAYER_TYPE_HUMAN, PLAYER_RIGHTS_NORMAL));
playerData->SetName(context.GetPlayerName());
client.AddPlayerData(playerData);
client.SetState(ClientStateWaitJoin::Instance());
retVal = MSG_SOCK_SESSION_DONE;
}
@@ -476,6 +469,7 @@ int
ClientStateWaitJoin::InternalProcess(ClientThread &client, boost::shared_ptr<NetPacket> packet)
{
int retVal = MSG_SOCK_INTERNAL_PENDING;
ClientContext &context = client.GetContext();
if (packet->ToNetPacketGameListNew())
{
@@ -490,9 +484,12 @@ ClientStateWaitJoin::InternalProcess(ClientThread &client, boost::shared_ptr<Net
NetPacketJoinGameAck::Data joinGameAckData;
packet->ToNetPacketJoinGameAck()->GetData(joinGameAckData);
client.SetGameData(joinGameAckData.gameData);
boost::shared_ptr<PlayerData> tmpPlayer = client.GetPlayerDataByUniqueId(client.GetGuiPlayerId());
assert(tmpPlayer.get());
tmpPlayer->SetRights(joinGameAckData.prights);
// Player number is 0 on init. Will be set when the game starts.
boost::shared_ptr<PlayerData> playerData(
new PlayerData(client.GetGuiPlayerId(), 0, PLAYER_TYPE_HUMAN, joinGameAckData.prights));
playerData->SetName(context.GetPlayerName());
client.AddPlayerData(playerData);
client.SetState(ClientStateWaitGame::Instance());
retVal = MSG_NET_GAME_CLIENT_JOIN;