diff options
| author | oy <tom_adams@web.de> | 2018-11-12 20:51:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 20:51:55 +0100 |
| commit | 57d48ae7622dca32f11c8fa0b1c4cf8146de7c8d (patch) | |
| tree | acf3d70fd40a0dc1546c03596e05aed400969b73 | |
| parent | 679e6af62f17f234f809c5533be7634c09208cef (diff) | |
| parent | f7881d06a47ccbe6ec80760f2265109bd3bcfce3 (diff) | |
Merge pull request #1651 from axblk/0.6
Fix 0.6 nethash
| -rw-r--r-- | scripts/cmd5.py | 2 | ||||
| -rw-r--r-- | src/engine/shared/network_server.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmd5.py b/scripts/cmd5.py index 84b14f17f..68881d0bb 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 == "fc9dffd45c6d100a": +if hash == "e42d81cd67b8c7bc": hash = "626fce9a778df4d4" print('#define GAME_NETVERSION_HASH "%s"' % hash) diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp index 577e8802d..8a4f8ef9a 100644 --- a/src/engine/shared/network_server.cpp +++ b/src/engine/shared/network_server.cpp @@ -347,7 +347,7 @@ int CNetServer::Recv(CNetChunk *pChunk) } else { - dbg_msg("netserver", "dropping packet with invalid token, token=%08x", (int)UseToken, Token); + dbg_msg("netserver", "dropping packet with invalid token, token=%08x", Token); } } continue; |