diff options
| author | oy <tom_adams@web.de> | 2018-11-12 21:15:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 21:15:57 +0100 |
| commit | a2b55e822f5b4105dc7fd78bcfe09105ab371d5c (patch) | |
| tree | 9e328490f14198a8343fa9369bea85e46249b2e4 | |
| parent | 8abab6853199e5fd1e2cfc56eafc99558c70a27c (diff) | |
| parent | e67facba0a28df09b76a120849aff080f39af9d6 (diff) | |
Merge pull request #1666 from heinrich5991/pr_6_fix_nethash_2
Don't hash protocol header twice in bam.lua
| -rw-r--r-- | bam.lua | 2 | ||||
| -rw-r--r-- | scripts/cmd5.py | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -112,7 +112,7 @@ AddDependency(network_source, network_header) AddDependency(client_content_source, client_content_header) AddDependency(server_content_source, server_content_header) -nethash = CHash("src/game/generated/nethash.cpp", "src/engine/shared/protocol.h", "src/game/generated/protocol.h", "src/game/tuning.h", "src/game/gamecore.cpp", network_header) +nethash = CHash("src/game/generated/nethash.cpp", "src/engine/shared/protocol.h", "src/game/generated/protocol.h", "src/game/tuning.h", "src/game/gamecore.cpp") client_link_other = {} client_depends = {} diff --git a/scripts/cmd5.py b/scripts/cmd5.py index 68881d0bb..84b14f17f 100644 --- a/scripts/cmd5.py +++ b/scripts/cmd5.py @@ -30,6 +30,6 @@ for filename in sys.argv[1:]: hash = hashlib.md5(f).hexdigest().lower()[16:] #TODO 0.7: improve nethash creation -if hash == "e42d81cd67b8c7bc": +if hash == "fc9dffd45c6d100a": hash = "626fce9a778df4d4" print('#define GAME_NETVERSION_HASH "%s"' % hash) |