Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into tim/metaserver

Browse source
This commit is contained in:
Tim Felgentreff 2016-11-14 13:37:37 +01:00
commit 8cd26ee2b9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/stratagus/script.cpp
View file

@ -218,7 +218,8 @@ int LuaLoadFile(const std::string &file, const std::string &strArg)
return -1; return -1;
} }
if (file.rfind("stratagus.lua") != -1 && file.find("scripts/") != -1) { if (file.rfind("stratagus.lua") != -1 && file.find("scripts/") != -1) {
// First, remove '\r' characters from the input. These are added, for example, by Windows Git, and should be ignored // First, remove '\r' characters from the input. These are
// added, for example, by Windows Git, and should be ignored
content.erase(std::remove(content.begin(), content.end(), '\r'), content.end()); content.erase(std::remove(content.begin(), content.end(), '\r'), content.end());
FileChecksums ^= fletcher32(content); FileChecksums ^= fletcher32(content);
} }