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

Avoid implicit construction of object wrappers.

This commit is contained in:
Sandu Liviu Catalin
2020-04-30 21:03:15 +03:00
parent 4500eb0a2c
commit ae2b1dc778
3 changed files with 12 additions and 12 deletions

View File

@ -21,7 +21,7 @@ static LightObj SqLeftStr(SQChar f, Uint32 w, StackStrF & s)
// Is the specified width valid?
if (!w)
{
return _SC(""); // Default to an empty string!
return LightObj(_SC(""), 0); // Default to an empty string!
}
// Allocate a buffer with the requested width
Buffer b(w + 1); // + null terminator
@ -51,7 +51,7 @@ static LightObj SqLeftOffsetStr(SQChar f, Uint32 w, Uint32 o, StackStrF & s)
// Is the specified width valid?
if (!w)
{
return _SC(""); // Default to an empty string!
return LightObj(_SC(""), 0); // Default to an empty string!
}
// Is the specified offset within width range?
else if (o > w)
@ -95,7 +95,7 @@ static LightObj SqRightStr(SQChar f, Uint32 w, StackStrF & s)
// Is the specified width valid?
if (!w)
{
return _SC(""); // Default to an empty string!
return LightObj(_SC(""), 0); // Default to an empty string!
}
// Allocate a buffer with the requested width
Buffer b(w + 1); // + null terminator
@ -134,7 +134,7 @@ static LightObj SqRightOffsetStr(SQChar f, Uint32 w, Uint32 o, StackStrF & s)
// Is the specified width valid?
if (!w)
{
return _SC(""); // Default to an empty string!
return LightObj(_SC(""), 0); // Default to an empty string!
}
// Is the specified offset within width range?
else if (o > w)
@ -178,7 +178,7 @@ static LightObj SqCenterStr(SQChar f, Uint32 w, StackStrF & s)
// Is the specified width valid?
if (!w)
{
return _SC(""); // Default to an empty string!
return LightObj(_SC(""), 0); // Default to an empty string!
}
// Allocate a buffer with the requested width
Buffer b(w + 1); // + null terminator

View File

@ -1545,7 +1545,7 @@ LightObj Signal::Create(StackStrF & name)
{
if (e.first == hash)
{
return e.second.second.mObj; // Found a match so let's return it
return LightObj{e.second.second.mObj}; // Found a match so let's return it
}
}
// Remember the current stack size
@ -1561,7 +1561,7 @@ LightObj Signal::Create(StackStrF & name)
// Grab a reference to the instance created on the stack
s_Signals.emplace_back(hash, SignalPair(ptr, Var< LightObj >(SqVM(), -1).value));
// Return the created signal
return s_Signals.back().second.second.mObj;
return LightObj{s_Signals.back().second.second.mObj};
}
// ------------------------------------------------------------------------------------------------