Skip to content

Commit c7e9ded

Browse files
committed
increment bitStream version
1 parent b7a5ec8 commit c7e9ded

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

Client/mods/deathmatch/logic/CPacketHandler.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3904,7 +3904,8 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)
39043904
}
39053905

39063906
bool bShallow;
3907-
bitStream.ReadBit(bShallow);
3907+
if (bitStream.Version() >= 0x06C)
3908+
bitStream.ReadBit(bShallow);
39083909

39093910
CClientWater* pWater = NULL;
39103911
if (ucNumVertices == 3)

Client/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#define _NETCODE_VERSION_BRANCH_ID 0x4 // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
7575
#define _CLIENT_NET_MODULE_VERSION 0x0A8 // (0x000 - 0xfff) Lvl9 wizards only
7676
#define _NETCODE_VERSION 0x1DA // (0x000 - 0xfff) Increment when net messages change (pre-release)
77-
#define MTA_DM_BITSTREAM_VERSION 0x06B // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
77+
#define MTA_DM_BITSTREAM_VERSION 0x06C // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
7878

7979
// To avoid user confusion, make sure the ASE version matches only if communication is possible
8080
#if defined(MTA_DM_CONNECT_TO_PUBLIC)

Server/mods/deathmatch/logic/packets/CEntityAddPacket.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,8 @@ bool CEntityAddPacket::Write(NetBitStreamInterface& BitStream) const
10501050
BitStream.Write((short)vecVertex.fY);
10511051
BitStream.Write(vecVertex.fZ);
10521052
}
1053-
BitStream.WriteBit(pWater->IsWaterShallow());
1053+
if (BitStream.Version() >= 0x06C)
1054+
BitStream.WriteBit(pWater->IsWaterShallow());
10541055
break;
10551056
}
10561057

Server/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#define _NETCODE_VERSION_BRANCH_ID 0x4 // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
7878
#define _SERVER_NET_MODULE_VERSION 0x0A8 // (0x000 - 0xfff) Lvl9 wizards only
7979
#define _NETCODE_VERSION 0x1DA // (0x000 - 0xfff) Increment when net messages change (pre-release)
80-
#define MTA_DM_BITSTREAM_VERSION 0x06B // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
80+
#define MTA_DM_BITSTREAM_VERSION 0x06C // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
8181

8282
// To avoid user confusion, make sure the ASE version matches only if communication is possible
8383
#if defined(MTA_DM_CONNECT_FROM_PUBLIC)

0 commit comments

Comments
 (0)