thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-06-16 07:07:13 +02:00
Code Releases Activity

Move away from C format to cpp::fmt.

Browse Source
This commit is contained in:
Sandu Liviu Catalin
2021-02-03 17:50:39 +02:00
parent 09a1767ffe
commit 0de21ae5a0
39 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/Misc/Algo.cpp
View File

@ -116,7 +116,7 @@ static const LightObj & Blip_FindBySprID(int32_t spr_id)
// Perform a range check on the specified identifier
if (spr_id < 0)
{
STHROWF("The specified sprite identifier is invalid: %d", spr_id);
STHROWF("The specified sprite identifier is invalid: {}", spr_id);
}
// Obtain the ends of the entity pool
auto itr = Core::Get().GetBlips().cbegin();

4
module/Misc/Algo.hpp
View File

@ -911,7 +911,7 @@ template < typename T > struct AppendElemFunc
// Append the object at the back of the array
if (SQ_FAILED(sq_arrayappend(mVM, mIdx)))
{
STHROWF("Unable to append %s instance to the list", InstSpec< T >::LcName);
STHROWF("Unable to append {} instance to the list", InstSpec< T >::LcName);
}
}
};
@ -1187,7 +1187,7 @@ public:
// Perform a range check on the specified identifier
if (INVALID_ENTITYEX(id, Inst::Max))
{
STHROWF("The specified %s identifier is invalid: %d", Inst::LcName, id);
STHROWF("The specified {} identifier is invalid: {}", Inst::LcName, id);
}
// Obtain the ends of the entity pool
typename Inst::Instances::const_iterator itr = Inst::CBegin();

14
module/Misc/Functions.cpp
View File

@ -146,7 +146,7 @@ Table GetPluginInfo(int32_t plugin_id)
// Attempt to update the plug-in info structure
if (_Func->GetPluginInfo(plugin_id, &g_PluginInfo) == vcmpErrorNoSuchEntity)
{
STHROWF("Unknown plug-in identifier: %d", plugin_id);
STHROWF("Unknown plug-in identifier: {}", plugin_id);
}
// Allocate a script table
Table tbl;
@ -260,7 +260,7 @@ const SQChar * GetServerName()
// Populate the buffer
//if (_Func->GetServerName(g_SvNameBuff, SQMOD_SVNAMELENGTH) == vcmpErrorBufferTooSmall)
//{
// STHROWF("Server name was too big for the available buffer: %u", sizeof(g_SvNameBuff));
// STHROWF("Server name was too big for the available buffer: {}", sizeof(g_SvNameBuff));
//}
// TEMPORARY WROKAROUND
@ -287,7 +287,7 @@ const SQChar * GetServerPassword()
// Populate the buffer
//if (_Func->GetServerPassword(g_PasswdBuff, SQMOD_PASSWDLENGTH) == vcmpErrorBufferTooSmall)
//{
// STHROWF("Server password was too big for the available buffer: %u", sizeof(g_PasswdBuff));
// STHROWF("Server password was too big for the available buffer: {}", sizeof(g_PasswdBuff));
//}
// TEMPORARY WROKAROUND
@ -314,7 +314,7 @@ const SQChar * GetGameModeText()
// Populate the buffer
//if (_Func->GetGameModeText(g_GmNameBuff, SQMOD_GMNAMELENGTH) == vcmpErrorBufferTooSmall)
//{
// STHROWF("Game-mode text was too big for the available buffer: %u", sizeof(g_GmNameBuff));
// STHROWF("Game-mode text was too big for the available buffer: {}", sizeof(g_GmNameBuff));
//}
// TEMPORARY WROKAROUND
@ -369,7 +369,7 @@ bool GetServerOption(int32_t option_id)
// Check for errors
if (_Func->GetLastError() == vcmpErrorArgumentOutOfBounds)
{
STHROWF("Unknown option identifier: %d", option_id);
STHROWF("Unknown option identifier: {}", option_id);
}
// Return the obtained value
return value;
@ -381,7 +381,7 @@ void SetServerOption(int32_t option_id, bool toggle)
if (_Func->SetServerOption(static_cast< vcmpServerOption >(option_id),
static_cast< uint8_t >(toggle)) == vcmpErrorArgumentOutOfBounds)
{
STHROWF("Unknown option identifier: %d", option_id);
STHROWF("Unknown option identifier: {}", option_id);
}
else
{
@ -395,7 +395,7 @@ void SetServerOptionEx(int32_t option_id, bool toggle, int32_t header, LightObj
if (_Func->SetServerOption(static_cast< vcmpServerOption >(option_id),
static_cast< uint8_t >(toggle)) == vcmpErrorArgumentOutOfBounds)
{
STHROWF("Unknown option identifier: %d", option_id);
STHROWF("Unknown option identifier: {}", option_id);
}
else
{

4
module/Misc/Vehicle.cpp
View File

@ -94,7 +94,7 @@ String GetAutomobileName(uint32_t id)
}
else
{
STHROWF("Vehicle identifier breaks these demands (%u > 129 and %u < 237) or (%u > 6399 and %u < 6500)", id, id, id, id);
STHROWF("Vehicle identifier breaks these demands ({} > 129 and {} < 237) or ({} > 6399 and {} < 6500)", id, id, id, id);
}
// Should never reach this point
return NullString();
@ -113,7 +113,7 @@ void SetAutomobileName(uint32_t id, StackStrF & name)
}
else
{
STHROWF("Vehicle identifier breaks these demands (%u > 129 and %u < 237) or (%u > 6399 and %u < 6500)", id, id, id, id);
STHROWF("Vehicle identifier breaks these demands ({} > 129 and {} < 237) or ({} > 6399 and {} < 6500)", id, id, id, id);
}
}