Skip to content

Change max fpslimit to 500 #2682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2022
Merged

Change max fpslimit to 500 #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
719a63c
Change max fpslimit to 500
Merlin Jul 25, 2022
bf5ce11
Merge branch 'multitheftauto:master' into fpslimit
Merlin Aug 12, 2022
f0554f4
Change max fps limit to 32767
Merlin Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Client/core/CClientVariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, std::numeric_limits<short>::max());
ClampValue("chat_font", 0, 3);
ClampValue("chat_lines", 3, 62);
ClampValue("chat_color", CColor(0, 0, 0, 0), CColor(255, 255, 255, 255));
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <= std::numeric_limits<short>::max()))
{
g_pCore->SetClientScriptFrameRateLimit(iLimit);
return true;
Expand Down
4 changes: 2 additions & 2 deletions Server/mods/deathmatch/logic/CMainConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, std::numeric_limits<short>::max());
if (iResult == IS_SUCCESS)
{
if (iFPSTemp == 0 || iFPSTemp >= 25)
Expand Down Expand Up @@ -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 <= std::numeric_limits<short>::max()))
{
m_usFPSLimit = usFPS;
if (bSave)
Expand Down