diff --git a/NorthstarDLL/NorthstarDLL.vcxproj b/NorthstarDLL/NorthstarDLL.vcxproj index 562adc503..9904f0143 100644 --- a/NorthstarDLL/NorthstarDLL.vcxproj +++ b/NorthstarDLL/NorthstarDLL.vcxproj @@ -120,10 +120,13 @@ stdcpplatest $(ProjectDir);$(SolutionDir)include;%(AdditionalIncludeDirectories) MultiThreadedDLL - MaxSpeed + Custom pch.h true stdc17 + Default + true + Size Windows diff --git a/NorthstarDLL/ns_version.h b/NorthstarDLL/ns_version.h index 494c19879..94fdf1676 100644 --- a/NorthstarDLL/ns_version.h +++ b/NorthstarDLL/ns_version.h @@ -2,7 +2,7 @@ #ifndef NORTHSTAR_VERSION // Turning off clang-format here so it doesn't mess with style as it needs to be this way for regex-ing with CI // clang-format off -#define NORTHSTAR_VERSION 1,16,0,0 -#define NORTHSTAR_FILE_VERSION "v1.16.0\0" +#define NORTHSTAR_VERSION 1,16,3,0 +#define NORTHSTAR_FILE_VERSION "v1.16.3\0" // clang-format on #endif diff --git a/NorthstarDLL/server/serverchathooks.cpp b/NorthstarDLL/server/serverchathooks.cpp index 6c6b3d7d6..cdbeb7d61 100644 --- a/NorthstarDLL/server/serverchathooks.cpp +++ b/NorthstarDLL/server/serverchathooks.cpp @@ -54,8 +54,7 @@ void, __fastcall, (CServerGameDLL* self, unsigned int senderPlayerId, const char // check chat ratelimits if (!g_pServerLimits->CheckChatLimits(&R2::g_pClientArray[senderPlayerId - 1])) return; - spdlog::info("PLAYER INDEX:{}", senderPlayerId); - spdlog::info("SENT INDEX:{}", (static_cast(senderPlayerId) - 1)); + SQRESULT result = g_pSquirrel->Call( "CServerGameDLL_ProcessMessageStartThread", static_cast(senderPlayerId - 1), text, isTeam); diff --git a/NorthstarDLL/shared/kcpintegration.cpp b/NorthstarDLL/shared/kcpintegration.cpp index c8fd482e8..7ef81319c 100644 --- a/NorthstarDLL/shared/kcpintegration.cpp +++ b/NorthstarDLL/shared/kcpintegration.cpp @@ -130,7 +130,7 @@ ON_DLL_LOAD_RELIESON("engine.dll", WSAHOOKS, ConVar, (CModule module)) Cvar_kcp_select_timeout = new ConVar("kcp_select_timeout", "5", FCVAR_NONE, "miliseconds select has to wait, lower is better but consumes more CPU."); - Cvar_kcp_conn_timeout = new ConVar("kcp_conn_timeout", "5000", FCVAR_NONE, "miliseconds before a connection is dropped."); + Cvar_kcp_conn_timeout = new ConVar("kcp_conn_timeout", "7000", FCVAR_NONE, "miliseconds before a connection is dropped."); Cvar_kcp_fec = new ConVar("kcp_fec", "1", FCVAR_NONE, "whether to enable FEC or not."); diff --git a/NorthstarDLL/shared/kcpintegration.h b/NorthstarDLL/shared/kcpintegration.h index 2f360b396..5a1067aca 100644 --- a/NorthstarDLL/shared/kcpintegration.h +++ b/NorthstarDLL/shared/kcpintegration.h @@ -275,7 +275,6 @@ class NetManager }; const size_t NET_UDP_MAX_MESSAGE_SIZE = 65535; -const int NET_HOOK_NOT_ALTERED = -114; class GameSink : public NetSink { diff --git a/NorthstarDLL/squirrel/squirrel.h b/NorthstarDLL/squirrel/squirrel.h index 6a596f2ad..b2f0284bf 100644 --- a/NorthstarDLL/squirrel/squirrel.h +++ b/NorthstarDLL/squirrel/squirrel.h @@ -437,7 +437,7 @@ inline VoidFunction SQMessageBufferPushArg(Vector3& arg) { template inline VoidFunction SQMessageBufferPushArg(SQObject* arg) { return [arg]{ g_pSquirrel->pushSQObject(g_pSquirrel->m_pSQVM->sqvm, arg); }; -} +} // Ints template requires std::convertible_to && (!std::is_floating_point_v)