mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-11 02:43:57 +02:00
Code Issues Projects Releases Wiki Activity

Renamed ZetaGlest to Glest

Browse Source
This commit is contained in:
mathusummut
2019-01-31 02:40:31 +01:00
parent 94493ab109
commit d5775734d7
536 changed files with 2372 additions and 2411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/shared_lib/sources/map/map_preview.cpp
View File

@@ -1,8 +1,8 @@
// This file is part of ZetaGlest <https://github.com/ZetaGlest>
// This file is part of Glest <https://github.com/Glest>
//
// Copyright (C) 2018 The ZetaGlest team
// Copyright (C) 2018 The Glest team
//
// ZetaGlest is a fork of MegaGlest <https://megaglest.org>
// Glest is a fork of MegaGlest <https://megaglest.org/>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -1115,17 +1115,13 @@ namespace Shared {
endPathWithSlash(map_path);
const string original = map_path + mapName;
const string zeta = map_path + mapName + ".zgm";
const string mega = map_path + mapName + ".mgm";
const string glest = map_path + mapName + ".gbm";
if (( EndsWith(original, ".zgm") == true ||
EndsWith(original, ".mgm") == true ||
if ((EndsWith(original, ".mgm") == true ||
EndsWith(original, ".gbm") == true) &&
fileExists(original)) {
return original;
} else if (fileExists(zeta)) {
return zeta;
} else if (fileExists(mega)) {
return mega;
} else if (fileExists(glest)) {
@@ -1155,10 +1151,6 @@ namespace Shared {
findAll(path + "*.gbm", results2, cutExtension, false);
copy(results2.begin(), results2.end(), std::inserter(allMaps2, allMaps2.begin()));
results2.clear();
findAll(path + "*.zgm", results2, cutExtension, false);
copy(results2.begin(), results2.end(), std::inserter(allMaps2, allMaps2.begin()));
results2.clear();
findAll(path + "*.mgm", results2, cutExtension, false);
copy(results2.begin(), results2.end(), std::inserter(allMaps2, allMaps2.begin()));
@@ -1173,10 +1165,6 @@ namespace Shared {
findAll(pathList, "*.gbm", results, cutExtension, false);
copy(results.begin(), results.end(), std::inserter(allMaps, allMaps.begin()));
results.clear();
findAll(pathList, "*.zgm", results, cutExtension, false);
copy(results.begin(), results.end(), std::inserter(allMaps, allMaps.begin()));
results.clear();
findAll(pathList, "*.mgm", results, cutExtension, false);
copy(results.begin(), results.end(), std::inserter(allMaps, allMaps.begin()));