Skip to content

fix: #1460 Failed to fetch sprite #1468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mehah merged 3 commits into from
Nov 21, 2025
Merged

fix: #1460 Failed to fetch sprite #1468

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58914dc
test
kokekanon Nov 20, 2025
4bdb27d
Merge remote-tracking branch 'upstream/main' into fix-spr
kokekanon Nov 20, 2025
ae48e98
.
kokekanon Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 32 additions & 28 deletions src/client/thingtype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,23 +758,25 @@ void ThingType::loadTexture(const int animationPhase)
return;

if (!spriteImage) {
g_logger.error("Failed to fetch sprite id {} for thing {} ({}, {}), layer {}, pattern {}x{}x{}, frame {}", spriteId, m_name, m_id, categoryName(m_category), l, x, y, z, animationPhase);
return;
}

// verifies that the first block in the lower right corner is transparent.
if (!spriteImage || spriteImage->hasTransparentPixel()) {
fullImage->setTransparentPixel(true);
}
if (spriteId != 0) {
g_logger.error("Failed to fetch sprite id {} for thing {} ({}, {}), layer {}, pattern {}x{}x{}, frame {}", spriteId, m_name, m_id, categoryName(m_category), l, x, y, z, animationPhase);
return;
}
} else {
// verifies that the first block in the lower right corner is transparent.
if (spriteImage->hasTransparentPixel()) {
fullImage->setTransparentPixel(true);
}

if (spriteMask) {
spriteImage->overwriteMask(maskColors[(l - 1)]);
}
if (spriteMask) {
spriteImage->overwriteMask(maskColors[(l - 1)]);
}

auto spriteSize = spriteImage->getSize() / g_gameConfig.getSpriteSize();
auto spriteSize = spriteImage->getSize() / g_gameConfig.getSpriteSize();

const Point& spritePos = Point(m_size.width() - spriteSize.width(), m_size.height() - spriteSize.height()) * g_gameConfig.getSpriteSize();
fullImage->blit(framePos + spritePos, spriteImage);
const Point& spritePos = Point(m_size.width() - spriteSize.width(), m_size.height() - spriteSize.height()) * g_gameConfig.getSpriteSize();
fullImage->blit(framePos + spritePos, spriteImage);
}
} else {
for (int h = 0; h < m_size.height(); ++h) {
for (int w = 0; w < m_size.width(); ++w) {
Expand All @@ -787,21 +789,23 @@ void ThingType::loadTexture(const int animationPhase)
return;

if (!spriteImage) {
g_logger.error("Failed to fetch sprite id {} for thing {} ({}, {}), layer {}, pattern {}x{}x{}, frame {}, offset {}x{}", spriteId, m_name, m_id, categoryName(m_category), l, x, y, z, framePos, w, h);
return;
}

// verifies that the first block in the lower right corner is transparent.
if (h == 0 && w == 0 && (!spriteImage || spriteImage->hasTransparentPixel())) {
fullImage->setTransparentPixel(true);
if (spriteId != 0) {
g_logger.error("Failed to fetch sprite id {} for thing {} ({}, {}), layer {}, pattern {}x{}x{}, frame {}, offset {}x{}", spriteId, m_name, m_id, categoryName(m_category), l, x, y, z, framePos, w, h);
return;
}
} else {
// verifies that the first block in the lower right corner is transparent.
if (h == 0 && w == 0 && spriteImage->hasTransparentPixel()) {
fullImage->setTransparentPixel(true);
}

if (spriteMask) {
spriteImage->overwriteMask(maskColors[(l - 1)]);
}

const Point& spritePos = Point(m_size.width() - w - 1, m_size.height() - h - 1) * g_gameConfig.getSpriteSize();
fullImage->blit(framePos + spritePos, spriteImage);
}

if (spriteMask) {
spriteImage->overwriteMask(maskColors[(l - 1)]);
}

const Point& spritePos = Point(m_size.width() - w - 1, m_size.height() - h - 1) * g_gameConfig.getSpriteSize();
fullImage->blit(framePos + spritePos, spriteImage);
}
}
}
Expand Down
Loading