Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/scripting/StarWorldLuaBindings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/game/scripting/StarWorldLuaBindings.cpp')
-rw-r--r--source/game/scripting/StarWorldLuaBindings.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/game/scripting/StarWorldLuaBindings.cpp b/source/game/scripting/StarWorldLuaBindings.cpp
index 64d1f30..9f5465a 100644
--- a/source/game/scripting/StarWorldLuaBindings.cpp
+++ b/source/game/scripting/StarWorldLuaBindings.cpp
@@ -1455,16 +1455,19 @@ namespace LuaBindings {
Maybe<Json> WorldEntityCallbacks::entityNametag(World* world, EntityId entityId) {
auto entity = world->entity(entityId);
+ Json result;
if (auto nametagEntity = as<NametagEntity>(entity)) {
- return JsonObject{
+ Json result = JsonObject{
{"nametag", nametagEntity->nametag()},
{"displayed", nametagEntity->displayNametag()},
{"color", jsonFromColor(Color::rgb(nametagEntity->nametagColor()))},
{"origin", jsonFromVec2F(nametagEntity->nametagOrigin())},
};
+ if (auto status = nametagEntity->statusText())
+ result.set("status", *status);
}
- return {};
+ return result;
}
Maybe<String> WorldEntityCallbacks::entityDescription(World* world, EntityId entityId, Maybe<String> const& species) {