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

summaryrefslogtreecommitdiff
path: root/source/core/StarJsonExtra.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2023-06-25 16:10:57 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2023-06-25 16:10:57 +1000
commite2424b7dcf60d18b277b092eb7f2a947fff27415 (patch)
tree1887d34419f16a6720405182d16829a97463e6df /source/core/StarJsonExtra.cpp
parentf7d5ff8debbbc1d80e8cd892d1184cb5aeb5bca4 (diff)
Fix up new Object directives handling, more directives rendering improvements, fix chat bubbles and nametags only moving every 2px
Diffstat (limited to 'source/core/StarJsonExtra.cpp')
-rw-r--r--source/core/StarJsonExtra.cpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/source/core/StarJsonExtra.cpp b/source/core/StarJsonExtra.cpp
index 7a660d1..aed4989 100644
--- a/source/core/StarJsonExtra.cpp
+++ b/source/core/StarJsonExtra.cpp
@@ -301,7 +301,7 @@ StringList jsonToStringList(Json const& v) {
Json jsonFromStringList(List<String> const& v) {
JsonArray result;
- for (auto e : v)
+ for (auto& e : v)
result.push_back(e);
return result;
}
@@ -322,7 +322,7 @@ StringSet jsonToStringSet(Json const& v) {
Json jsonFromStringSet(StringSet const& v) {
JsonArray result;
- for (auto e : v)
+ for (auto& e : v)
result.push_back(e);
return result;
}
@@ -369,6 +369,20 @@ List<Color> jsonToColorList(Json const& v) {
return result;
}
+List<Directives> jsonToDirectivesList(Json const& v) {
+ List<Directives> result;
+ for (auto const& entry : v.iterateArray())
+ result.append(move(entry.toString()));
+ return result;
+}
+
+Json jsonFromDirectivesList(List<Directives> const& v) {
+ JsonArray result;
+ for (auto& e : v)
+ result.push_back(e.toString());
+ return result;
+}
+
Json weightedChoiceFromJson(Json const& source, Json const& default_) {
if (source.isNull())
return default_;