diff options
Diffstat (limited to 'source/game/scripting')
-rw-r--r-- | source/game/scripting/StarWorldLuaBindings.cpp | 4 | ||||
-rw-r--r-- | source/game/scripting/StarWorldLuaBindings.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/game/scripting/StarWorldLuaBindings.cpp b/source/game/scripting/StarWorldLuaBindings.cpp index 6d1648e..087f88c 100644 --- a/source/game/scripting/StarWorldLuaBindings.cpp +++ b/source/game/scripting/StarWorldLuaBindings.cpp @@ -1421,7 +1421,7 @@ namespace LuaBindings { return {}; } - Maybe<JsonArray> WorldEntityCallbacks::entityPortrait(World* world, EntityId entityId, String const& portraitMode) { + LuaNullTermWrapper<Maybe<JsonArray>> WorldEntityCallbacks::entityPortrait(World* world, EntityId entityId, String const& portraitMode) { auto entity = world->entity(entityId); if (auto portraitEntity = as<PortraitEntity>(entity)) { @@ -1471,7 +1471,7 @@ namespace LuaBindings { return Json(); } - Maybe<String> WorldEntityCallbacks::entityUniqueId(World* world, EntityId entityId) { + LuaNullTermWrapper<Maybe<String>> WorldEntityCallbacks::entityUniqueId(World* world, EntityId entityId) { if (auto entity = world->entity(entityId)) return entity->uniqueId(); return {}; diff --git a/source/game/scripting/StarWorldLuaBindings.hpp b/source/game/scripting/StarWorldLuaBindings.hpp index 725e824..e2d082c 100644 --- a/source/game/scripting/StarWorldLuaBindings.hpp +++ b/source/game/scripting/StarWorldLuaBindings.hpp @@ -122,10 +122,10 @@ namespace LuaBindings { Maybe<String> entityGender(World* world, EntityId entityId); Maybe<String> entityName(World* world, EntityId entityId); Maybe<String> entityDescription(World* world, EntityId entityId, Maybe<String> const& species); - Maybe<JsonArray> entityPortrait(World* world, EntityId entityId, String const& portraitMode); + LuaNullTermWrapper<Maybe<JsonArray>> entityPortrait(World* world, EntityId entityId, String const& portraitMode); Maybe<String> entityHandItem(World* world, EntityId entityId, String const& handName); Json entityHandItemDescriptor(World* world, EntityId entityId, String const& handName); - Maybe<String> entityUniqueId(World* world, EntityId entityId); + LuaNullTermWrapper<Maybe<String>> entityUniqueId(World* world, EntityId entityId); Json getObjectParameter(World* world, EntityId entityId, String const& parameterName, Maybe<Json> const& defaultValue); Json getNpcScriptParameter(World* world, EntityId entityId, String const& parameterName, Maybe<Json> const& defaultValue); List<Vec2I> objectSpaces(World* world, EntityId entityId); |