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

bugfix for loading setups with unknown maps

This commit is contained in:
titiger 2019-10-18 01:47:37 +02:00
parent 476c398c0c
commit b3267394d5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5455,17 +5455,17 @@ bool MenuStateConnectedGame::loadGameSettings(const std::string &fileName) {
copyToGameSettings(&gameSettings); copyToGameSettings(&gameSettings);
} }
vector<string> mapsV=formattedPlayerSortedMaps[0]; vector<string> mapsV=playerSortedMaps[0];
if(std::find(mapsV.begin(), mapsV.end(), gameSettings.getMap()) == mapsV.end()) { if(std::find(mapsV.begin(), mapsV.end(), gameSettings.getMap()) == mapsV.end()) {
console.addLine("Cannot load '"+fileName+"', map unknown ("+gameSettings.getMap()+")"); console.addLine("Cannot load '"+fileName+"', map unknown ('"+gameSettings.getMap()+"')");
return false;// map unknown return false;// map unknown
} }
if(std::find(tilesetFiles.begin(), tilesetFiles.end(), gameSettings.getTileset()) == tilesetFiles.end()) { if(std::find(tilesetFiles.begin(), tilesetFiles.end(), gameSettings.getTileset()) == tilesetFiles.end()) {
console.addLine("Cannot load '"+fileName+"', tileset unknown ("+gameSettings.getTileset()+")"); console.addLine("Cannot load '"+fileName+"', tileset unknown ('"+gameSettings.getTileset()+"')");
return false;// tileset unknown return false;// tileset unknown
} }
if(std::find(techTreeFiles.begin(), techTreeFiles.end(), gameSettings.getTech()) == techTreeFiles.end()) { if(std::find(techTreeFiles.begin(), techTreeFiles.end(), gameSettings.getTech()) == techTreeFiles.end()) {
console.addLine("Cannot load '"+fileName+"', techtree unknown ("+gameSettings.getTech()+")"); console.addLine("Cannot load '"+fileName+"', techtree unknown ('"+gameSettings.getTech()+"')");
return false;// techtree unknown return false;// techtree unknown
} }

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

@ -4137,17 +4137,17 @@ bool MenuStateCustomGame::loadGameSettingsFromFile(GameSettings *gameSettings,st
} }
} }
vector<string> mapsV=formattedPlayerSortedMaps[0]; vector<string> mapsV=playerSortedMaps[0];
if(std::find(mapsV.begin(), mapsV.end(), gameSettings->getMap()) == mapsV.end()) { if(std::find(mapsV.begin(), mapsV.end(), gameSettings->getMap()) == mapsV.end()) {
console.addLine("Cannot load '"+fileName+"', map unknown ("+gameSettings->getMap()+")"); console.addLine("Cannot load '"+fileName+"', map unknown ('"+gameSettings->getMap()+"')");
return false;// map unknown return false;// map unknown
} }
if(std::find(tilesetFiles.begin(), tilesetFiles.end(), gameSettings->getTileset()) == tilesetFiles.end()) { if(std::find(tilesetFiles.begin(), tilesetFiles.end(), gameSettings->getTileset()) == tilesetFiles.end()) {
console.addLine("Cannot load '"+fileName+"', tileset unknown ("+gameSettings->getTileset()+")"); console.addLine("Cannot load '"+fileName+"', tileset unknown ('"+gameSettings->getTileset()+"')");
return false;// tileset unknown return false;// tileset unknown
} }
if(std::find(techTreeFiles.begin(), techTreeFiles.end(), gameSettings->getTech()) == techTreeFiles.end()) { if(std::find(techTreeFiles.begin(), techTreeFiles.end(), gameSettings->getTech()) == techTreeFiles.end()) {
console.addLine("Cannot load '"+fileName+"', techtree unknown ("+gameSettings->getTech()+")"); console.addLine("Cannot load '"+fileName+"', techtree unknown ('"+gameSettings->getTech()+"')");
return false;// techtree unknown return false;// techtree unknown
} }