mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-05 13:06:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_my_errors' into 'master'

Browse source 
Fix minor doc error, throw error when attempting to assign a value to a non-existing global variable in lua

See merge request OpenMW/openmw!3548
This commit is contained in:
Evil Eye 2023-11-03 16:31:23 +00:00
commit eb0ddf72d8
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwlua/mwscriptbindings.cpp
View file

@ -140,7 +140,7 @@ namespace MWLua
= sol::overload([](const GlobalStore& store, std::string_view globalId, float val) { = sol::overload([](const GlobalStore& store, std::string_view globalId, float val) {
auto g = store.search(ESM::RefId::deserializeText(globalId)); auto g = store.search(ESM::RefId::deserializeText(globalId));
if (g == nullptr) if (g == nullptr)
return; throw std::runtime_error("No variable \"" + std::string(globalId) + "\" in GlobalStore");
char varType = MWBase::Environment::get().getWorld()->getGlobalVariableType(globalId); char varType = MWBase::Environment::get().getWorld()->getGlobalVariableType(globalId);
if (varType == 's' || varType == 'l') if (varType == 's' || varType == 'l')
{ {

1
files/lua_api/openmw/types.lua
View file

@ -930,7 +930,6 @@
-- Whether teleportation for this player is enabled. -- Whether teleportation for this player is enabled.
-- @function [parent=#Player] isTeleportingEnabled -- @function [parent=#Player] isTeleportingEnabled
-- @param openmw.core#GameObject player -- @param openmw.core#GameObject player
-- @param #boolean player
-- @return #boolean -- @return #boolean
--- ---