diff options
| author | est31 <MTest31@outlook.com> | 2015-09-14 06:02:41 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-09-14 07:02:15 +0200 |
| commit | 283bf97a1cc5435179533fac5428a382f9af3934 (patch) | |
| tree | 0fc66ac4f02d7b9ac4ef0618621b0b0173af8970 /src/network | |
| parent | 915807f8db1f3721ad9ffc00a4863ad940010c45 (diff) | |
| download | minetest-283bf97a1cc5435179533fac5428a382f9af3934.tar.gz minetest-283bf97a1cc5435179533fac5428a382f9af3934.tar.bz2 minetest-283bf97a1cc5435179533fac5428a382f9af3934.zip | |
Serialisation: documentation fixes, clarifying renames and whitespace fixes
1. Do two renames:
* SER_FMT_CLIENT_VER_LOWEST -> SER_FMT_VER_LOWEST_WRITE
* SER_FMT_VER_LOWEST -> SER_FMT_VER_LOWEST_READ
Now the two define values are consistently named with the _WRITE defines
SER_FMT_VER_{HIGHEST,LOWEST}_WRITE, and to better point out what the two
serialisation versions actually are for.
2. wrap some lines in doc/worldformat.txt, and point out that the node
timers are serialized at a later point, as this can cause confusion about
what now happens (if one doesn't strictly read the if block's conditions).
3. some whitespace fixes in NodeTimerList::serialize, and one new comment.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/serverpackethandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index f756d80ef..d89e30c8d 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -103,7 +103,7 @@ void Server::handleCommand_Init(NetworkPacket* pkt) // Use the highest version supported by both u8 depl_serial_v = std::min(client_max, our_max); // If it's lower than the lowest supported, give up. - if (depl_serial_v < SER_FMT_VER_LOWEST) + if (depl_serial_v < SER_FMT_VER_LOWEST_READ) depl_serial_v = SER_FMT_VER_INVALID; if (depl_serial_v == SER_FMT_VER_INVALID) { @@ -347,7 +347,7 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt) // Use the highest version supported by both int deployed = std::min(client_max, our_max); // If it's lower than the lowest supported, give up. - if (deployed < SER_FMT_VER_LOWEST) + if (deployed < SER_FMT_VER_LOWEST_READ) deployed = SER_FMT_VER_INVALID; if (deployed == SER_FMT_VER_INVALID) { |