diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/serialization.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/serialization.h')
| -rw-r--r-- | src/serialization.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/serialization.h b/src/serialization.h index f399983c4..b53564c78 100644 --- a/src/serialization.h +++ b/src/serialization.h @@ -77,7 +77,8 @@ with this program; if not, write to the Free Software Foundation, Inc., // in memory; conversion just won't work in this direction. #define SER_FMT_VER_LOWEST_WRITE 24 -inline bool ser_ver_supported(s32 v) { +inline bool ser_ver_supported(s32 v) +{ return v >= SER_FMT_VER_LOWEST_READ && v <= SER_FMT_VER_HIGHEST_READ; } @@ -91,5 +92,5 @@ void decompressZlib(std::istream &is, std::ostream &os, size_t limit = 0); // These choose between zlib and a self-made one according to version void compress(const SharedBuffer<u8> &data, std::ostream &os, u8 version); -//void compress(const std::string &data, std::ostream &os, u8 version); +// void compress(const std::string &data, std::ostream &os, u8 version); void decompress(std::istream &is, std::ostream &os, u8 version); |