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

summaryrefslogtreecommitdiff
path: root/source/game/StarEffectEmitter.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2024-09-14 15:59:01 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2024-09-14 15:59:01 +1000
commit8155ec671581b051feca4187d5067ddbd149b387 (patch)
treefe87f75c0940b049fc0ea6def2b9508037be5b17 /source/game/StarEffectEmitter.cpp
parent9dbc4daacc59c1fe506d803d1d8653a395c60822 (diff)
protected dungeon ID optimization + /settileprotection improvements
Diffstat (limited to 'source/game/StarEffectEmitter.cpp')
-rw-r--r--source/game/StarEffectEmitter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/game/StarEffectEmitter.cpp b/source/game/StarEffectEmitter.cpp
index ddb0355..28e2986 100644
--- a/source/game/StarEffectEmitter.cpp
+++ b/source/game/StarEffectEmitter.cpp
@@ -94,14 +94,14 @@ void EffectEmitter::render(RenderCallback* renderCallback) {
Json EffectEmitter::toJson() const {
return JsonObject{{"activeSources",
- jsonFromSet<pair<String, String>>(m_activeSources.get(),
+ jsonFromSet<Set<pair<String, String>>>(m_activeSources.get(),
[](pair<String, String> const& entry) {
return JsonObject{{"position", entry.first}, {"source", entry.second}};
})}};
}
void EffectEmitter::fromJson(Json const& diskStore) {
- m_activeSources.set(jsonToSet<pair<String, String>>(diskStore.get("activeSources"),
+ m_activeSources.set(jsonToSet<Set<pair<String, String>>>(diskStore.get("activeSources"),
[](Json const& v) {
return pair<String, String>{v.getString("position"), v.getString("source")};
}));