16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 18:19:19 +02:00

network improvements and fixes

This commit is contained in:
milek7
2019-02-06 00:03:48 +01:00
parent 5a0bb610db
commit 6962e25042
15 changed files with 152 additions and 62 deletions

View File

@@ -715,6 +715,11 @@ global_settings::ConfigParse(cParser &Parser) {
Parser >> fpslimit;
minframetime = std::chrono::duration<float>(1.0f / fpslimit);
}
else if (token == "randomseed")
{
Parser.getTokens(1);
Parser >> Global.random_seed;
}
else if (token == "gfx.envmap.enabled")
{
Parser.getTokens(1);
@@ -805,23 +810,21 @@ global_settings::ConfigParse(cParser &Parser) {
}
else if (token == "network.server")
{
Parser.getTokens(1);
Parser >> network_conf.is_server;
if (network_conf.is_server) {
Parser.getTokens(2);
Parser >> network_conf.server_host;
Parser >> network_conf.server_port;
}
Parser.getTokens(2);
std::string backend;
std::string conf;
Parser >> backend >> conf;
network_servers.push_back(std::make_pair(backend, conf));
}
else if (token == "network.client")
{
Parser.getTokens(1);
Parser >> network_conf.is_client;
if (network_conf.is_client) {
Parser.getTokens(2);
Parser >> network_conf.client_host;
Parser >> network_conf.client_port;
}
Parser.getTokens(2);
network_client.emplace();
Parser >> network_client->first;
Parser >> network_client->second;
}
} while ((token != "") && (token != "endconfig")); //(!Parser->EndOfFile)
// na koniec trochę zależności