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

summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2023-07-23 22:54:34 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2023-07-23 22:54:34 +1000
commitc6a1d9880f8d0b32c3399d3f9b7cc848aed271d0 (patch)
tree05af604273b0de6c806fbb72146783ce212bcc28 /source
parent3b8ea95d61a714eaee72978c67c4890774396fa3 (diff)
Add DanceDatabase fallback
fixes being crashed when another player uses a modded dance
Diffstat (limited to 'source')
-rw-r--r--source/game/StarDanceDatabase.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/game/StarDanceDatabase.cpp b/source/game/StarDanceDatabase.cpp
index 3ad2277..2e81fe5 100644
--- a/source/game/StarDanceDatabase.cpp
+++ b/source/game/StarDanceDatabase.cpp
@@ -17,7 +17,12 @@ DanceDatabase::DanceDatabase() {
}
DancePtr DanceDatabase::getDance(String const& name) const {
- return m_dances.get(name);
+ if (auto dance = m_dances.ptr(name))
+ return *dance;
+ else {
+ Logger::error("Invalid dance '{}', using default", name);
+ return m_dances.get("assetmissing");
+ }
}
DancePtr DanceDatabase::readDance(String const& path) {