mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-03 02:41:50 +02:00
Code Issues Projects Releases Wiki Activity

changed network CRC settings to FALSE by default and do NO network CRC checking unless explicity enabled:

Browse Source 
For Verbose logging: EnableNetworkGameSynchChecks
For Default Logging: EnableNetworkGameSynchMonitor
This commit is contained in:
Mark Vejvoda
2013-10-29 01:56:57 +00:00
parent c66db8ce49
commit dda2f99e01
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/glest_game/game/game.cpp
View File

@@ -1700,8 +1700,15 @@ 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;
}
if(calculateNetworkCRC == true) {
NetworkManager &networkManager = NetworkManager::getInstance(); NetworkManager &networkManager = NetworkManager::getInstance();
NetworkRole role = networkManager.getNetworkRole(); NetworkRole role = networkManager.getNetworkRole();
@@ -1727,6 +1734,8 @@ void Game::processNetworkSynchChecksIfRequired() {
} }
} }
} }
}
}
//update //update
void Game::update() { void Game::update() {

2
source/glest_game/global/core_data.cpp
View File

@@ -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;

2
source/glest_game/menu/menu_state_custom_game.cpp
View File

@@ -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;