Skip to content

Add new format string function for non-constant string #4403

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add new format string function for non-constant string #4403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ac91fb
Update
Aug 30, 2025
18a1273
Update 2
Aug 30, 2025
b43eaa5
constexpr
Aug 30, 2025
c60a2b9
inline
Aug 30, 2025
9848e0b
Recommended changes
Aug 30, 2025
808b61c
Merge branch 'master' into new-format-mtasa
G-Moris Aug 30, 2025
c0f8d3a
Merge branch 'master' into new-format-mtasa
G-Moris Aug 30, 2025
b133a2b
Merge branch 'master' into new-format-mtasa
G-Moris Aug 31, 2025
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
11 changes: 7 additions & 4 deletions Client/core/CConnectManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,14 @@ bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const c
OpenServerFirewall(m_Address, CServerBrowser::GetSingletonPtr()->FindServerHttpPort(m_strHost, m_usPort), true);

// Display the status box
SString strBuffer(_("Connecting to %s:%u ..."), m_strHost.c_str(), m_usPort);
std::string message;
if (m_bReconnect)
strBuffer = SString(_("Reconnecting to %s:%u ..."), m_strHost.c_str(), m_usPort);
CCore::GetSingleton().ShowMessageBox(_("CONNECTING"), strBuffer, MB_BUTTON_CANCEL | MB_ICON_INFO, m_pOnCancelClick);
WriteDebugEvent(SString("Connecting to %s:%u ...", m_strHost.c_str(), m_usPort));
message = mtasa::format(_("Reconnecting to {0}:{1} ..."), m_strHost, m_usPort);
else
message = mtasa::format(_("Connecting to {0}:{1} ..."), m_strHost, m_usPort);

CCore::GetSingleton().ShowMessageBox(_("CONNECTING"), message.c_str(), MB_BUTTON_CANCEL | MB_ICON_INFO, m_pOnCancelClick);
WriteDebugEvent(std::format("Connecting to {}:{} ...", m_strHost, m_usPort));

return true;
}
Expand Down
18 changes: 18 additions & 0 deletions Shared/sdk/SharedUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,21 @@
#define strnicmp strncasecmp
#endif
#endif

// Ensure that the C++ version is at least C++20
#if __cplusplus >= 202002L

/*
The function prevents a compilation error caused by using non-constant format strings and
correctly forwards the arguments to std::format for formatting
*/
namespace mtasa
{
template <class... _Types>
inline std::string format(const std::string_view fmt, _Types&&... _Args)
{
return std::vformat(fmt, std::make_format_args(_Args...));
}
}

#endif