Skip to content
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

Fix CVector optional arguments - Follow-up #3896

Merged
merged 15 commits into from
Dec 23, 2024
Merged

Fix CVector optional arguments - Follow-up #3896

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0adfaeb
Update CVector.h
TracerDS Oct 8, 2024
e917272
Update CPedSync.cpp
TracerDS Oct 8, 2024
64f1724
Updated according to reviews
TracerDS Oct 12, 2024
ffe1f14
Merge branch 'master' into 081024_CVector
TracerDS Oct 12, 2024
fba3201
Update CVector.h
TracerDS Oct 12, 2024
313ccb6
Update CVector.h
TracerDS Oct 13, 2024
a40e7b0
Merge branch '081024_CVector' of github.com:TracerDS/mtasa-blue into …
TracerDS Oct 13, 2024
1eb4687
Fixed build issues
TracerDS Oct 13, 2024
8977267
Merge branch 'master' into 081024_CVector
TracerDS Oct 13, 2024
479fa23
Merge branch 'master' into 081024_CVector
TracerDS Oct 15, 2024
d39c630
Merge branch 'master' into 081024_CVector
TracerDS Nov 13, 2024
c7f0e41
Merge branch 'master' into 081024_CVector
Dutchman101 Dec 21, 2024
ac9af8e
Fixed ordering issue
TracerDS Dec 22, 2024
fd74826
Merge branch 'master' into 081024_CVector
TracerDS Dec 22, 2024
2dd295b
Merge branch 'master' into 081024_CVector
Dutchman101 Dec 23, 2024
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
29 changes: 25 additions & 4 deletions Shared/mods/deathmatch/logic/lua/CLuaFunctionParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,11 @@ struct CLuaFunctionParserBase
else if constexpr (std::is_same_v<T, CVector2D>)
{
if (lua_isnumber(L, index))
return {PopUnsafe<float>(L, index), PopUnsafe<float>(L, index)};
Dutchman101 marked this conversation as resolved.
Show resolved Hide resolved
{
auto x = PopUnsafe<float>(L, index);
auto y = PopUnsafe<float>(L, index);
return CVector2D(x, y);
}

int iType = lua_type(L, index);
bool isLightUserData = iType == LUA_TLIGHTUSERDATA;
Expand All @@ -561,7 +565,12 @@ struct CLuaFunctionParserBase
else if constexpr (std::is_same_v<T, CVector>)
{
if (lua_isnumber(L, index))
return CVector(PopUnsafe<float>(L, index), PopUnsafe<float>(L, index), PopUnsafe<float>(L, index));
{
auto x = PopUnsafe<float>(L, index);
auto y = PopUnsafe<float>(L, index);
auto z = PopUnsafe<float>(L, index);
return CVector(x, y, z);
}

int iType = lua_type(L, index);
bool isLightUserData = iType == LUA_TLIGHTUSERDATA;
Expand All @@ -584,7 +593,13 @@ struct CLuaFunctionParserBase
else if constexpr (std::is_same_v<T, CVector4D>)
{
if (lua_isnumber(L, index))
return {PopUnsafe<float>(L, index), PopUnsafe<float>(L, index), PopUnsafe<float>(L, index), PopUnsafe<float>(L, index)};
{
auto x = PopUnsafe<float>(L, index);
auto y = PopUnsafe<float>(L, index);
auto z = PopUnsafe<float>(L, index);
auto w = PopUnsafe<float>(L, index);
return CVector4D(x, y, z, w);
}

int iType = lua_type(L, index);
bool isLightUserData = iType == LUA_TLIGHTUSERDATA;
Expand All @@ -606,7 +621,13 @@ struct CLuaFunctionParserBase
{
if (lua_isnumber(L, index))
{
const auto ReadVector = [&] { return CVector(PopUnsafe<float>(L, index), PopUnsafe<float>(L, index), PopUnsafe<float>(L, index)); };
const auto ReadVector = [&]
{
auto x = PopUnsafe<float>(L, index);
auto y = PopUnsafe<float>(L, index);
auto z = PopUnsafe<float>(L, index);
return CVector(x, y, z);
};

CMatrix matrix;

Expand Down
Loading