diff --git a/CMakeLists.txt b/CMakeLists.txt index 501380453..5784ad3a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -403,7 +403,6 @@ if(NOT NONET) Source/dvlnet/tcp_client.cpp Source/dvlnet/tcp_server.cpp Source/dvlnet/protocol_zt.cpp - Source/dvlnet/base_protocol.cpp Source/dvlnet/zerotier_native.cpp Source/dvlnet/zerotier_lwip.cpp) endif() diff --git a/Source/dvlnet/base_protocol.cpp b/Source/dvlnet/base_protocol.cpp deleted file mode 100644 index 4d69930e6..000000000 --- a/Source/dvlnet/base_protocol.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "dvlnet/base_protocol.h" - -#include -#include - -#ifdef USE_SDL1 -#include "utils/sdl2_to_1_2_backports.h" -#endif diff --git a/Source/dvlnet/base_protocol.h b/Source/dvlnet/base_protocol.h index 4db28ed7f..1b0df6d2f 100644 --- a/Source/dvlnet/base_protocol.h +++ b/Source/dvlnet/base_protocol.h @@ -190,6 +190,7 @@ void base_protocol

::recv() for (plr_t i = 0; i < MAX_PLRS; ++i) { if (peers[i] == sender) { disconnect_net(i); + break; } } } diff --git a/Source/dvlnet/protocol_zt.h b/Source/dvlnet/protocol_zt.h index f18170c6c..ab3d6f204 100644 --- a/Source/dvlnet/protocol_zt.h +++ b/Source/dvlnet/protocol_zt.h @@ -39,6 +39,11 @@ public: return addr == rhs.addr; } + bool operator!=(const endpoint &rhs) const + { + return !(*this == rhs); + } + bool operator<(const endpoint &rhs) const { return addr < rhs.addr;