diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 06b20b23..de62489e 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -3110,7 +3110,7 @@ void runTilesetValidationReport(int argc, char** argv) { double purgedMegaBytes=0; bool showDuplicateFiles = true; - //std::vector filteredFactionList; + bool tilesetFound = false; vector tilesetPaths = config.getPathListForType(ptTilesets); for(int idx = 0; idx < tilesetPaths.size(); idx++) { @@ -3122,6 +3122,7 @@ void runTilesetValidationReport(int argc, char** argv) { for(int idx2 = 0; idx2 < tilesetList.size(); idx2++) { string &tilesetName = tilesetList[idx2]; if(tilesetName == validateTilesetName) { + tilesetFound = true; runTilesetValidationForPath(tilesetPath, tilesetName, world, purgeUnusedFiles, showDuplicateFiles, false, false, purgedMegaBytes); @@ -3129,6 +3130,9 @@ void runTilesetValidationReport(int argc, char** argv) { } } + if(tilesetFound == false) { + printf("*ERROR The specified tileset [%s] was NOT FOUND!\n",validateTilesetName.c_str()); + } printf("\n====== Finished Validation ======\n"); } return; diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 7a0a497c..4413ba5b 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -97,9 +97,9 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM lastCheckedCRCTilesetName = ""; lastCheckedCRCTechtreeName = ""; lastCheckedCRCMapName = ""; - lastCheckedCRCTilesetValue = -1; - lastCheckedCRCTechtreeValue = -1; - lastCheckedCRCMapValue = -1; + lastCheckedCRCTilesetValue = 0; + lastCheckedCRCTechtreeValue = 0; + lastCheckedCRCMapValue = 0; mapPreviewTexture=NULL; currentFactionLogo = ""; diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index 598f530d..35aad38e 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -110,9 +110,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, last_Forced_CheckedCRCTechtreeName = ""; last_Forced_CheckedCRCMapName = ""; - lastCheckedCRCTilesetValue = -1; - lastCheckedCRCTechtreeValue = -1; - lastCheckedCRCMapValue = -1; + lastCheckedCRCTilesetValue = 0; + lastCheckedCRCTechtreeValue = 0; + lastCheckedCRCMapValue = 0; publishToMasterserverThread = NULL; publishToClientsThread = NULL; diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp index cbcb6ad9..68232423 100644 --- a/source/glest_game/menu/menu_state_mods.cpp +++ b/source/glest_game/menu/menu_state_mods.cpp @@ -843,14 +843,6 @@ void MenuStateMods::getTechsLocalList() { string path = config.getPathListForType(ptTechs)[1]; endPathWithSlash(path); findDirs(path, techTreeFilesUserData, false, false); - - //for(unsigned int i = 0; i < techTreeFilesUserData.size(); ++i) { - //string itemPath = config.getPathListForType(ptTechs,"")[1] + "/" + techTreeFilesUserData[i] + string("/*"); - //bool forceRefresh = (mapCRCUpdateList.find(itemPath) == mapCRCUpdateList.end()); - //mapCRCUpdateList[itemPath] = getFolderTreeContentsCheckSumRecursively(itemPath, "", NULL,forceRefresh); - //mapCRCUpdateList[itemPath] = getFolderTreeContentsCheckSumRecursively(itemPath, "", NULL,false); - //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d] local CRC for techtree [%s] is [%d]\n",__FILE__,__FUNCTION__,__LINE__,itemPath.c_str(),mapCRCUpdateList[itemPath]); - //} } } diff --git a/source/glest_game/menu/menu_state_mods.h b/source/glest_game/menu/menu_state_mods.h index b161b266..b9b84ae2 100644 --- a/source/glest_game/menu/menu_state_mods.h +++ b/source/glest_game/menu/menu_state_mods.h @@ -177,7 +177,7 @@ private: void loadMapPreview(string name); void showRemoteDesription(ModInfo *modInfo); - std::map mapCRCUpdateList; + std::map mapCRCUpdateList; public: MenuStateMods(Program *program, MainMenu *mainMenu);