Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for tileset crc calc (was cached and did not always update the cached value)

Browse Source
This commit is contained in:
Mark Vejvoda 2011-03-31 23:26:32 +00:00
parent 623dfe7aa5
commit acbb11b327
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -968,7 +968,7 @@ void MenuStateConnectedGame::update() {
if(lastCheckedCRCTilesetName != gameSettings->getTileset() && if(lastCheckedCRCTilesetName != gameSettings->getTileset() &&
gameSettings->getTileset() != "") { gameSettings->getTileset() != "") {
//console.addLine("Checking tileset CRC [" + gameSettings->getTileset() + "]"); //console.addLine("Checking tileset CRC [" + gameSettings->getTileset() + "]");
tilesetCRC = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTilesets,""), string("/") + gameSettings->getTileset() + string("/*"), ".xml", NULL); tilesetCRC = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTilesets,""), string("/") + gameSettings->getTileset() + string("/*"), ".xml", NULL, true);
// Test data synch // Test data synch
//tilesetCRC++; //tilesetCRC++;
lastCheckedCRCTilesetValue = tilesetCRC; lastCheckedCRCTilesetValue = tilesetCRC;
@ -2148,7 +2148,7 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName,
// Refresh CRC // Refresh CRC
Config &config = Config::getInstance(); Config &config = Config::getInstance();
lastCheckedCRCTilesetValue = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTilesets,""), string("/") + itemName + string("/*"), ".xml", NULL); lastCheckedCRCTilesetValue = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTilesets,""), string("/") + itemName + string("/*"), ".xml", NULL, true);
safeMutexFTPProgress.ReleaseLock(); safeMutexFTPProgress.ReleaseLock();
// END // END
@ -2207,7 +2207,7 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName,
// Refresh CRC // Refresh CRC
Config &config = Config::getInstance(); Config &config = Config::getInstance();
lastCheckedCRCTechtreeValue = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTechs,""), string("/") + itemName + string("/*"), ".xml", NULL); lastCheckedCRCTechtreeValue = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTechs,""), string("/") + itemName + string("/*"), ".xml", NULL, true);
safeMutexFTPProgress.ReleaseLock(); safeMutexFTPProgress.ReleaseLock();
// END // END

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

@ -2223,7 +2223,7 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
if( gameSettings->getTileset() != "") { if( gameSettings->getTileset() != "") {
if(lastCheckedCRCTilesetName != gameSettings->getTileset()) { if(lastCheckedCRCTilesetName != gameSettings->getTileset()) {
//console.addLine("Checking tileset CRC [" + gameSettings->getTileset() + "]"); //console.addLine("Checking tileset CRC [" + gameSettings->getTileset() + "]");
lastCheckedCRCTilesetValue = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTilesets,""), string("/") + gameSettings->getTileset() + string("/*"), ".xml", NULL); lastCheckedCRCTilesetValue = getFolderTreeContentsCheckSumRecursively(config.getPathListForType(ptTilesets,""), string("/") + gameSettings->getTileset() + string("/*"), ".xml", NULL, true);
lastCheckedCRCTilesetName = gameSettings->getTileset(); lastCheckedCRCTilesetName = gameSettings->getTileset();
} }
gameSettings->setTilesetCRC(lastCheckedCRCTilesetValue); gameSettings->setTilesetCRC(lastCheckedCRCTilesetValue);