From 719a63c075b7c47fee69685db78e92ed7acc9434 Mon Sep 17 00:00:00 2001 From: Merlin Date: Mon, 25 Jul 2022 22:04:18 +0200 Subject: [PATCH 1/2] Change max fpslimit to 500 Default values are unchanged --- Client/core/CClientVariables.cpp | 2 +- Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp | 2 +- Server/mods/deathmatch/logic/CMainConfig.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Client/core/CClientVariables.cpp b/Client/core/CClientVariables.cpp index d7327b47f7d..235c52d0c7d 100644 --- a/Client/core/CClientVariables.cpp +++ b/Client/core/CClientVariables.cpp @@ -234,7 +234,7 @@ void CClientVariables::ValidateValues() ClampValue("console_pos", CVector2D(0, 0), CVector2D(uiViewportWidth - 32, uiViewportHeight - 32)); ClampValue("console_size", CVector2D(50, 50), CVector2D(uiViewportWidth - 32, uiViewportHeight - 32)); - ClampValue("fps_limit", 0, 100); + ClampValue("fps_limit", 0, 500); ClampValue("chat_font", 0, 3); ClampValue("chat_lines", 3, 62); ClampValue("chat_color", CColor(0, 0, 0, 0), CColor(255, 255, 255, 255)); diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index 4355970c37e..70c8358fa00 100644 --- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -6817,7 +6817,7 @@ bool CStaticFunctionDefinitions::SetMoonSize(int iSize) bool CStaticFunctionDefinitions::SetFPSLimit(int iLimit) { - if (iLimit == 0 || (iLimit >= 25 && iLimit <= 100)) + if (iLimit == 0 || (iLimit >= 25 && iLimit <= 500)) { g_pCore->SetClientScriptFrameRateLimit(iLimit); return true; diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp index d0b31fb6e07..c04f4a1b4d8 100644 --- a/Server/mods/deathmatch/logic/CMainConfig.cpp +++ b/Server/mods/deathmatch/logic/CMainConfig.cpp @@ -349,7 +349,7 @@ bool CMainConfig::Load() // Grab the server fps limit int iFPSTemp = 0; - iResult = GetInteger(m_pRootNode, "fpslimit", iFPSTemp, 0, 100); + iResult = GetInteger(m_pRootNode, "fpslimit", iFPSTemp, 0, 500); if (iResult == IS_SUCCESS) { if (iFPSTemp == 0 || iFPSTemp >= 25) @@ -929,7 +929,7 @@ bool CMainConfig::SetPassword(const char* szPassword, bool bSave) bool CMainConfig::SetFPSLimit(unsigned short usFPS, bool bSave) { - if (usFPS == 0 || (usFPS >= 25 && usFPS <= 100)) + if (usFPS == 0 || (usFPS >= 25 && usFPS <= 500)) { m_usFPSLimit = usFPS; if (bSave) From f0554f4b4f7f0e15c2ee8f2989795e23cdb3ddf6 Mon Sep 17 00:00:00 2001 From: Merlin Date: Fri, 12 Aug 2022 16:16:51 +0200 Subject: [PATCH 2/2] Change max fps limit to 32767 --- Client/core/CClientVariables.cpp | 2 +- Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp | 2 +- Server/mods/deathmatch/logic/CMainConfig.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Client/core/CClientVariables.cpp b/Client/core/CClientVariables.cpp index 235c52d0c7d..29077fc505b 100644 --- a/Client/core/CClientVariables.cpp +++ b/Client/core/CClientVariables.cpp @@ -234,7 +234,7 @@ void CClientVariables::ValidateValues() ClampValue("console_pos", CVector2D(0, 0), CVector2D(uiViewportWidth - 32, uiViewportHeight - 32)); ClampValue("console_size", CVector2D(50, 50), CVector2D(uiViewportWidth - 32, uiViewportHeight - 32)); - ClampValue("fps_limit", 0, 500); + ClampValue("fps_limit", 0, std::numeric_limits::max()); ClampValue("chat_font", 0, 3); ClampValue("chat_lines", 3, 62); ClampValue("chat_color", CColor(0, 0, 0, 0), CColor(255, 255, 255, 255)); diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index 70c8358fa00..6123140f757 100644 --- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -6817,7 +6817,7 @@ bool CStaticFunctionDefinitions::SetMoonSize(int iSize) bool CStaticFunctionDefinitions::SetFPSLimit(int iLimit) { - if (iLimit == 0 || (iLimit >= 25 && iLimit <= 500)) + if (iLimit == 0 || (iLimit >= 25 && iLimit <= std::numeric_limits::max())) { g_pCore->SetClientScriptFrameRateLimit(iLimit); return true; diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp index c04f4a1b4d8..401292209e8 100644 --- a/Server/mods/deathmatch/logic/CMainConfig.cpp +++ b/Server/mods/deathmatch/logic/CMainConfig.cpp @@ -349,7 +349,7 @@ bool CMainConfig::Load() // Grab the server fps limit int iFPSTemp = 0; - iResult = GetInteger(m_pRootNode, "fpslimit", iFPSTemp, 0, 500); + iResult = GetInteger(m_pRootNode, "fpslimit", iFPSTemp, 0, std::numeric_limits::max()); if (iResult == IS_SUCCESS) { if (iFPSTemp == 0 || iFPSTemp >= 25) @@ -929,7 +929,7 @@ bool CMainConfig::SetPassword(const char* szPassword, bool bSave) bool CMainConfig::SetFPSLimit(unsigned short usFPS, bool bSave) { - if (usFPS == 0 || (usFPS >= 25 && usFPS <= 500)) + if (usFPS == 0 || (usFPS >= 25 && usFPS <= std::numeric_limits::max())) { m_usFPSLimit = usFPS; if (bSave)