diff --git a/include/Common.h b/include/Common.h index cebbfcb..9944fc7 100644 --- a/include/Common.h +++ b/include/Common.h @@ -162,13 +162,13 @@ void RegisterThread(const std::string& str); #else #define _function_name std::string(__func__) #endif - + #ifndef NDEBUG #define DEBUG #endif - + #if defined(DEBUG) - + // if this is defined, we will show the full function signature infront of // each info/debug/warn... call instead of the 'filename:line' format. #if defined(BMP_FULL_FUNCTION_NAMES) @@ -178,7 +178,7 @@ void RegisterThread(const std::string& str); #endif #endif // defined(DEBUG) - + #define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x)) #define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x)) #define beammp_error(x) \ @@ -221,7 +221,7 @@ void RegisterThread(const std::string& str); #else #define beammp_trace(x) #endif // defined(DEBUG) - + #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__)) #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__)) #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__)) diff --git a/src/TNetwork.cpp b/src/TNetwork.cpp index bf3812e..a5fc7c2 100644 --- a/src/TNetwork.cpp +++ b/src/TNetwork.cpp @@ -297,7 +297,7 @@ std::shared_ptr TNetwork::Authentication(TConnection&& RawConnection) { if (Application::IsOutdated(ClientVersion, MinClientVersion)) { beammp_errorf("Client tried to connect with version '{}', but only versions >= {} are allowed", ClientVersion.AsString(), Application::ClientMinimumVersion().AsString()); - ClientKick(*Client, "Outdated Version!"); + ClientKick(*Client, fmt::format("Outdated version, launcher version >={} required to join!", MinClientVersion.AsString())); return nullptr; } } else {