From 036e0bbb4774944509fd54df8f34f50ae1e87175 Mon Sep 17 00:00:00 2001 From: mimooh <mimoohowy@gmail.com> Date: Thu, 17 Nov 2016 22:40:58 +0100 Subject: [PATCH 1/2] Disable lua checksum for now. s/uint16_t/uint32_t/ doesn't fix the issue as I hoped. --- src/stratagus/script.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/stratagus/script.cpp b/src/stratagus/script.cpp index 9cddcb0b3..b4aa95edb 100644 --- a/src/stratagus/script.cpp +++ b/src/stratagus/script.cpp @@ -221,7 +221,9 @@ int LuaLoadFile(const std::string &file, const std::string &strArg) // 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()); - FileChecksums ^= fletcher32(content); + // FileChecksums ^= fletcher32(content); + // https://github.com/Wargus/stratagus/issues/196, disable for now. + FileChecksums ^= 0; } const int status = luaL_loadbuffer(Lua, content.c_str(), content.size(), file.c_str()); From 75700100c4a60b9fa35c01c9ff85dc7923a8d419 Mon Sep 17 00:00:00 2001 From: mimooh <mimoohowy@gmail.com> Date: Thu, 17 Nov 2016 22:44:24 +0100 Subject: [PATCH 2/2] I checked and it worked for me with = operator, unsure about ^= --- src/stratagus/script.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stratagus/script.cpp b/src/stratagus/script.cpp index b4aa95edb..bb6a02956 100644 --- a/src/stratagus/script.cpp +++ b/src/stratagus/script.cpp @@ -223,7 +223,7 @@ int LuaLoadFile(const std::string &file, const std::string &strArg) content.erase(std::remove(content.begin(), content.end(), '\r'), content.end()); // FileChecksums ^= fletcher32(content); // https://github.com/Wargus/stratagus/issues/196, disable for now. - FileChecksums ^= 0; + FileChecksums = 0; } const int status = luaL_loadbuffer(Lua, content.c_str(), content.size(), file.c_str());