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

Show avatars in network games. User defined avatars are not transfered yet, but this is already prepared for integration.

Browse Source
This commit is contained in:
lotodore
2007-09-09 00:00:19 +00:00
parent b71ae4ac17
commit e8eddd3b1b
10 changed files with 129 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/session.cpp
+9 -6
View File
@@ -119,14 +119,15 @@ void Session::startInternetClient()
assert(false);
return;
}
myNetClient = new ClientThread(*myGui);
myNetClient = new ClientThread(*myGui, *myAvatarManager);
myNetClient->Init(
myConfig->readConfigString("InternetServerAddress"),
myConfig->readConfigInt("InternetServerPort"),
myConfig->readConfigInt("InternetServerUseIpv6") == 1,
myConfig->readConfigInt("InternetServerUseSctp") == 1,
myConfig->readConfigString("InternetServerPassword"),
myConfig->readConfigString("MyName"));
myConfig->readConfigString("MyName"),
myConfig->readConfigString("MyAvatar"));
myNetClient->Run();
}
@@ -137,14 +138,15 @@ void Session::startNetworkClient(const string &serverAddress, unsigned serverPor
assert(false);
return;
}
myNetClient = new ClientThread(*myGui);
myNetClient = new ClientThread(*myGui, *myAvatarManager);
myNetClient->Init(
serverAddress,
serverPort,
ipv6,
sctp,
pwd,
myConfig->readConfigString("MyName"));
myConfig->readConfigString("MyName"),
myConfig->readConfigString("MyAvatar"));
myNetClient->Run();
myNetClient->SendJoinFirstGame("");
}
@@ -156,7 +158,7 @@ void Session::startNetworkClientForLocalServer(const GameData &gameData)
assert(false);
return;
}
myNetClient = new ClientThread(*myGui);
myNetClient = new ClientThread(*myGui, *myAvatarManager);
bool useIpv6 = myConfig->readConfigInt("ServerUseIpv6") == 1;
const char *loopbackAddr = useIpv6 ? "::1" : "127.0.0.1";
myNetClient->Init(
@@ -165,7 +167,8 @@ void Session::startNetworkClientForLocalServer(const GameData &gameData)
useIpv6,
myConfig->readConfigInt("ServerUseSctp") == 1,
myConfig->readConfigString("ServerPassword"),
myConfig->readConfigString("MyName"));
myConfig->readConfigString("MyName"),
myConfig->readConfigString("MyAvatar"));
myNetClient->Run();
myNetClient->SendCreateGame(gameData, NET_DEFAULT_GAME, "");
}