games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

vcmi: modernize lua

Browse Source
This commit is contained in:
Konstantin
2023-02-05 19:24:34 +03:00
parent fb38050f9b
commit 976c5e7bd4
11 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripting/lua/LuaScriptingContext.cpp
View File

@ -34,13 +34,12 @@ namespace scripting
const std::string LuaContext::STATE_FIELD = "DATA";
LuaContext::LuaContext(const Script * source, const Environment * env_)
: ContextBase(env_->logger()),
LuaContext::LuaContext(const Script * source, const Environment * env_):
ContextBase(env_->logger()),
L(luaL_newstate()),
script(source),
env(env_)
{
L = luaL_newstate();
static const std::vector<luaL_Reg> STD_LIBS =
{
{"", luaopen_base},
@ -417,7 +416,7 @@ void LuaContext::popAll()
std::string LuaContext::toStringRaw(int index)
{
size_t len = 0;
auto raw = lua_tolstring(L, index, &len);
const auto *raw = lua_tolstring(L, index, &len);
return std::string(raw, len);
}
@ -431,7 +430,7 @@ void LuaContext::registerCore()
popAll();//just in case
for(auto & registar : api::Registry::get()->getCoreData())
for(const auto & registar : api::Registry::get()->getCoreData())
{
registar.second->pushMetatable(L); //table
@ -446,7 +445,7 @@ void LuaContext::registerCore()
int LuaContext::require(lua_State * L)
{
LuaContext * self = static_cast<LuaContext *>(lua_touserdata(L, lua_upvalueindex(1)));
auto * self = static_cast<LuaContext *>(lua_touserdata(L, lua_upvalueindex(1)));
if(!self)
{
@ -503,7 +502,7 @@ int LuaContext::loadModule()
if(scope.empty())
{
auto registar = api::Registry::get()->find(modulePath);
const auto *registar = api::Registry::get()->find(modulePath);
if(!registar)
{
@ -519,7 +518,7 @@ int LuaContext::loadModule()
boost::algorithm::replace_all(modulePath, ".", "/");
auto loader = CResourceHandler::get(CModHandler::scopeBuiltin());
auto *loader = CResourceHandler::get(CModHandler::scopeBuiltin());
modulePath = "scripts/lib/" + modulePath;
@ -582,7 +581,7 @@ int LuaContext::printImpl()
int LuaContext::logError(lua_State * L)
{
LuaContext * self = static_cast<LuaContext *>(lua_touserdata(L, lua_upvalueindex(1)));
auto * self = static_cast<LuaContext *>(lua_touserdata(L, lua_upvalueindex(1)));
if(!self)
{