changed network CRC settings to FALSE by default and do NO network CRC checking unless explicity enabled:
For Verbose logging: EnableNetworkGameSynchChecks For Default Logging: EnableNetworkGameSynchMonitor
This commit is contained in:
parent
c66db8ce49
commit
dda2f99e01
|
@ -1700,30 +1700,39 @@ void Game::processNetworkSynchChecksIfRequired() {
|
||||||
bool isNetworkGame = this->gameSettings.isNetworkGame();
|
bool isNetworkGame = this->gameSettings.isNetworkGame();
|
||||||
if (isNetworkGame == true && NetworkManager::getInstance().getGameNetworkInterface() != NULL) {
|
if (isNetworkGame == true && NetworkManager::getInstance().getGameNetworkInterface() != NULL) {
|
||||||
GameSettings *settings = world.getGameSettingsPtr();
|
GameSettings *settings = world.getGameSettingsPtr();
|
||||||
|
if(settings != NULL) {
|
||||||
|
bool calculateNetworkCRC = false;
|
||||||
|
|
||||||
|
if(isFlagType1BitEnabled(settings->getFlagTypes1(),ft1_network_synch_checks) == true ||
|
||||||
|
isFlagType1BitEnabled(settings->getFlagTypes1(),ft1_network_synch_checks_verbose) == true) {
|
||||||
|
calculateNetworkCRC = true;
|
||||||
|
}
|
||||||
|
|
||||||
NetworkManager &networkManager = NetworkManager::getInstance();
|
if(calculateNetworkCRC == true) {
|
||||||
NetworkRole role = networkManager.getNetworkRole();
|
NetworkManager &networkManager = NetworkManager::getInstance();
|
||||||
|
NetworkRole role = networkManager.getNetworkRole();
|
||||||
|
|
||||||
NetworkInterface *netIntf = networkManager.getGameNetworkInterface();
|
NetworkInterface *netIntf = networkManager.getGameNetworkInterface();
|
||||||
for(int index = 0; index < GameConstants::maxPlayers; ++index) {
|
for(int index = 0; index < GameConstants::maxPlayers; ++index) {
|
||||||
if(index < world.getFactionCount()) {
|
if(index < world.getFactionCount()) {
|
||||||
Faction *faction = world.getFaction(index);
|
Faction *faction = world.getFaction(index);
|
||||||
netIntf->setNetworkPlayerFactionCRC(index,faction->getCRC().getSum());
|
netIntf->setNetworkPlayerFactionCRC(index,faction->getCRC().getSum());
|
||||||
|
|
||||||
if(settings != NULL) {
|
if(settings != NULL) {
|
||||||
if(isFlagType1BitEnabled(settings->getFlagTypes1(),ft1_network_synch_checks_verbose) == true) {
|
if(isFlagType1BitEnabled(settings->getFlagTypes1(),ft1_network_synch_checks_verbose) == true) {
|
||||||
faction->addCRC_DetailsForWorldFrame(world.getFrameCount(),role == nrServer);
|
faction->addCRC_DetailsForWorldFrame(world.getFrameCount(),role == nrServer);
|
||||||
|
}
|
||||||
|
else if(isFlagType1BitEnabled(settings->getFlagTypes1(),ft1_network_synch_checks) == true &&
|
||||||
|
world.getFrameCount() % 20 == 0) {
|
||||||
|
faction->addCRC_DetailsForWorldFrame(world.getFrameCount(),role == nrServer);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if(isFlagType1BitEnabled(settings->getFlagTypes1(),ft1_network_synch_checks) == true &&
|
else {
|
||||||
world.getFrameCount() % 20 == 0) {
|
netIntf->setNetworkPlayerFactionCRC(index,0);
|
||||||
faction->addCRC_DetailsForWorldFrame(world.getFrameCount(),role == nrServer);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
netIntf->setNetworkPlayerFactionCRC(index,0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1085,7 +1085,7 @@ bool CoreData::loadGameSettingsFromFile(std::string fileName, GameSettings *game
|
||||||
gameSettings->setFlagTypes1(valueFlags1);
|
gameSettings->setFlagTypes1(valueFlags1);
|
||||||
|
|
||||||
}
|
}
|
||||||
if(Config::getInstance().getBool("EnableNetworkGameSynchMonitor","true") == true) {
|
if(Config::getInstance().getBool("EnableNetworkGameSynchMonitor","false") == true) {
|
||||||
//printf("*WARNING* - EnableNetworkGameSynchChecks is enabled\n");
|
//printf("*WARNING* - EnableNetworkGameSynchChecks is enabled\n");
|
||||||
|
|
||||||
valueFlags1 |= ft1_network_synch_checks;
|
valueFlags1 |= ft1_network_synch_checks;
|
||||||
|
|
|
@ -3202,7 +3202,7 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings,bool force
|
||||||
gameSettings->setFlagTypes1(valueFlags1);
|
gameSettings->setFlagTypes1(valueFlags1);
|
||||||
|
|
||||||
}
|
}
|
||||||
if(Config::getInstance().getBool("EnableNetworkGameSynchMonitor","true") == true) {
|
if(Config::getInstance().getBool("EnableNetworkGameSynchMonitor","false") == true) {
|
||||||
//printf("*WARNING* - EnableNetworkGameSynchChecks is enabled\n");
|
//printf("*WARNING* - EnableNetworkGameSynchChecks is enabled\n");
|
||||||
|
|
||||||
valueFlags1 |= ft1_network_synch_checks;
|
valueFlags1 |= ft1_network_synch_checks;
|
||||||
|
|
Loading…
Reference in New Issue