diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-26 21:41:54 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-26 21:41:54 +1000 |
commit | 94c84ad01333850b88091f2c188e4f6173fd25e7 (patch) | |
tree | 724318996143d8ad24377813ad6be21988f9cddc /source/game/StarNetworkedAnimator.cpp | |
parent | f2fedb0c878120d4887ae9c1c14d4ac1a8881d85 (diff) |
Update StarNetworkedAnimator.cpp
Diffstat (limited to 'source/game/StarNetworkedAnimator.cpp')
-rw-r--r-- | source/game/StarNetworkedAnimator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/game/StarNetworkedAnimator.cpp b/source/game/StarNetworkedAnimator.cpp index c5b3591..7ce5e16 100644 --- a/source/game/StarNetworkedAnimator.cpp +++ b/source/game/StarNetworkedAnimator.cpp @@ -636,14 +636,14 @@ List<pair<Drawable, float>> NetworkedAnimator::drawablesWithZLevel(Vec2F const& String const& usedImage = processedImage ? processedImage.get() : image; if (!usedImage.empty() && usedImage[0] != ':' && usedImage[0] != '?') { - String relativeImage; - if (usedImage[0] != '/') - relativeImage = AssetPath::relativeTo(m_relativePath, usedImage); - - size_t hash = hashOf(relativeImage); + size_t hash = hashOf(usedImage); auto find = m_cachedPartDrawables.find(partName); bool fail = find == m_cachedPartDrawables.end() || find->second.first != hash; if (fail) { + String relativeImage; + if (usedImage[0] != '/') + relativeImage = AssetPath::relativeTo(m_relativePath, usedImage); + Drawable drawable = Drawable::makeImage(!relativeImage.empty() ? relativeImage : usedImage, 1.0f / TilePixels, centered, Vec2F()); if (find == m_cachedPartDrawables.end()) find = m_cachedPartDrawables.emplace(partName, std::pair{ hash, move(drawable) }).first; |