Move static LuaScriptInterface methods to namespace #4675
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
ranisalt
force-pushed
the
luascript-namespace
branch
from
540530d
to
79ff9ca
Compare
| @@ -505,20 +505,20 @@ int32_t Weapon::getHealthCost(const Player* player) const | |||
| bool Weapon::executeUseWeapon(Player* player, const LuaVariant& var) const | |||
| { | |||
| // onUseWeapon(player, var) | |||
| if (!scriptInterface->reserveScriptEnv()) { | |||
| if (!tfs::lua::reserveScriptEnv()) { | |||
There was a problem hiding this comment.
Is there a particular reason for naming it tfs::lua instead of simply lua
There was a problem hiding this comment.
@ramon-bernardo avoiding possible clashes with other libs. If at some point we use a dependency that defines a namespace lua (say a C++ wrapper for Lua) then it may clash with our functions.
This happened with OpenSSL already (it defines a global RSA struct). Ideally, we will wrap the entire code in namespace tfs so we can drop tfs:: and it will be just lua::
There was a problem hiding this comment.
@ranisalt thanks for clarifying, that's what I imagined. We could do a lot like tfs::x, right?
I've been looking at game events, I thought something like...
tfs::game::events::x
tfs::game::map::tows::x
79ff9ca
to
25a7a8e
Compare
| void pushUserdata(lua_State* L, T* value) | ||
| { | ||
| T** userdata = static_cast<T**>(lua_newuserdata(L, sizeof(T*))); | ||
| *userdata = value; |
Check warning
Code scanning / CodeQL
Local variable address stored in non-local memory
ranisalt
force-pushed
the
luascript-namespace
branch
from
b8f5fb4
to
b0c753c
Compare
Pull Request Prelude
Changes Proposed
Part 1 of a major rewrite to our dearest file that hangs low-powered computers and triggers out-of-memory situations all the time.
At first, move static functions (except functions that will be bound to Lua methods) out of the
LuaScriptInterfaceclass into thetfs::luanamespace. This should help reducing the load to compile this file and enables cleaning up the header in the future.A few unused functions were removed, and some that weren't used outside
luascript.cppwere moved into it as static, within an anonymous namespace.