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

- added new commandline param --validate-techtrees which will be used to check for known problems in the techtrees for an installation

Browse Source
This commit is contained in:
Mark Vejvoda
2010-07-30 07:51:39 +00:00
parent 2605e1c4d7
commit 4336ae3e37
12 changed files with 409 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
source/glest_game/main/main.cpp
View File

@@ -30,6 +30,7 @@
#include "font.h"
#include <curl/curl.h>
#include "menu_state_masterserver.h"
#include "checksum.h"
#include "leak_dumper.h"
@@ -415,7 +416,8 @@ int glestMain(int argc, char** argv){
bool haveSpecialOutputCommandLineOption = false;
if( hasCommandArgument(argc, argv,"--opengl-info") == true ||
hasCommandArgument(argc, argv,"--version") == true) {
hasCommandArgument(argc, argv,"--version") == true ||
hasCommandArgument(argc, argv,"--validate-techtrees") == true) {
haveSpecialOutputCommandLineOption = true;
}
@@ -430,7 +432,8 @@ int glestMain(int argc, char** argv){
}
if( hasCommandArgument(argc, argv,"--version") == true &&
hasCommandArgument(argc, argv,"--opengl-info") == false) {
hasCommandArgument(argc, argv,"--opengl-info") == false &&
hasCommandArgument(argc, argv,"validate-factions") == false) {
return -1;
}
@@ -582,6 +585,79 @@ int glestMain(int argc, char** argv){
return -1;
}
if(hasCommandArgument(argc, argv,"--validate-techtrees") == true) {
Config &config = Config::getInstance();
vector<string> results;
findDirs(config.getPathListForType(ptTechs), results);
vector<string> techTreeFiles = results;
World world;
vector<string> techPaths = config.getPathListForType(ptTechs);
for(int idx = 0; idx < techPaths.size(); idx++) {
string &techPath = techPaths[idx];
for(int idx2 = 0; idx2 < techTreeFiles.size(); idx2++) {
string &techName = techTreeFiles[idx2];
vector<string> factionsList;
findAll(techPath + "/" + techName + "/factions/*.", factionsList, false, false);
if(factionsList.size() > 0) {
Checksum checksum;
set<string> factions;
for(int j = 0; j < factionsList.size(); ++j) {
factions.insert(factionsList[j]);
}
printf("\nChecking techPath [%s] techName [%s] factionsList.size() = %d\n",techPath.c_str(), techName.c_str(),factionsList.size());
for(int j = 0; j < factionsList.size(); ++j) {
printf("Found faction [%s]\n",factionsList[j].c_str());
}
world.loadTech(config.getPathListForType(ptTechs,""), techName, factions, &checksum);
// Validate the faction setup to ensure we don't have any bad associations
std::vector<std::string> resultErrors = world.validateFactionTypes();
if(resultErrors.size() > 0) {
// Display the validation errors
string errorText = "\nErrors were detected:\n=====================\n";
for(int i = 0; i < resultErrors.size(); ++i) {
if(i > 0) {
errorText += "\n";
}
errorText += resultErrors[i];
}
errorText += "\n=====================\n";
//throw runtime_error(errorText);
printf("%s",errorText.c_str());
}
// Validate the faction resource setup to ensure we don't have any bad associations
printf("\nChecking resources, count = %d\n",world.getTechTree()->getResourceTypeCount());
for(int i = 0; i < world.getTechTree()->getResourceTypeCount(); ++i) {
printf("Found techtree resource [%s]\n",world.getTechTree()->getResourceType(i)->getName().c_str());
}
resultErrors = world.validateResourceTypes();
if(resultErrors.size() > 0) {
// Display the validation errors
string errorText = "\nErrors were detected:\n=====================\n";
for(int i = 0; i < resultErrors.size(); ++i) {
if(i > 0) {
errorText += "\n";
}
errorText += resultErrors[i];
}
errorText += "\n=====================\n";
//throw runtime_error(errorText);
printf("%s",errorText.c_str());
}
}
}
}
return -1;
}
if(config.getBool("AllowGameDataSynchCheck","false") == true) {
vector<string> techDataPaths = config.getPathListForType(ptTechs);