Skip to content

Commit 1cb5881

Browse files
committed
fixes
1 parent 8d417a2 commit 1cb5881

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

src/headers/src/ProjectInfoPopup.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ ProjectInfoPopup* ProjectInfoPopup::setProject(GJGameLevel* level) {
407407
projThumb->ignoreAnchorPointForPosition(false);
408408
projThumb->setPosition({ m_clippingNode->getScaledContentWidth() / 2, m_clippingNode->getScaledContentHeight() / 2 });
409409

410-
bool isCustomThumbnail = false; // whether the thumbnail is a custom one or not
410+
bool isCustomThumbnail = false; // whether the thumbnail is custom
411411

412412
if (m_avalProject.thumbnail.empty()) {
413413
AVAL_LOG_INFO("Using default thumbnail for project '{}'", m_avalProject.name);
@@ -508,7 +508,10 @@ ProjectInfoPopup* ProjectInfoPopup::setProject(GJGameLevel* level) {
508508

509509
linkedProjClippingNode->addChild(linkedProjClippingNodeBg);
510510

511-
auto art_bottomLeft_linkedProj = CCSprite::createWithSpriteFrameName(m_cornerArtType.c_str());
511+
// corner art deco for linked project
512+
auto corner = "rewardCorner_001.png";
513+
514+
auto art_bottomLeft_linkedProj = CCSprite::createWithSpriteFrameName(corner);
512515
art_bottomLeft_linkedProj->setID("bottom-left-corner");
513516
art_bottomLeft_linkedProj->setAnchorPoint({ 0, 0 });
514517
art_bottomLeft_linkedProj->setPosition({ 0, 0 });
@@ -519,7 +522,7 @@ ProjectInfoPopup* ProjectInfoPopup::setProject(GJGameLevel* level) {
519522

520523
linkedProjClippingNode->addChild(art_bottomLeft_linkedProj);
521524

522-
auto art_bottomRight_linkedProj = CCSprite::createWithSpriteFrameName(m_cornerArtType.c_str());
525+
auto art_bottomRight_linkedProj = CCSprite::createWithSpriteFrameName(corner);
523526
art_bottomRight_linkedProj->setID("bottom-right-corner");
524527
art_bottomRight_linkedProj->setAnchorPoint({ 1, 0 });
525528
art_bottomRight_linkedProj->setPosition({ linkedProjClippingNode->getScaledContentWidth(), 0 });
@@ -530,7 +533,7 @@ ProjectInfoPopup* ProjectInfoPopup::setProject(GJGameLevel* level) {
530533

531534
linkedProjClippingNode->addChild(art_bottomRight_linkedProj);
532535

533-
auto art_topLeft_linkedProj = CCSprite::createWithSpriteFrameName(m_cornerArtType.c_str());
536+
auto art_topLeft_linkedProj = CCSprite::createWithSpriteFrameName(corner);
534537
art_topLeft_linkedProj->setID("top-left-corner");
535538
art_topLeft_linkedProj->setAnchorPoint({ 0, 1 });
536539
art_topLeft_linkedProj->setPosition({ 0, linkedProjClippingNode->getScaledContentHeight() });
@@ -541,7 +544,7 @@ ProjectInfoPopup* ProjectInfoPopup::setProject(GJGameLevel* level) {
541544

542545
linkedProjClippingNode->addChild(art_topLeft_linkedProj);
543546

544-
auto art_topRight_linkedProj = CCSprite::createWithSpriteFrameName(m_cornerArtType.c_str());
547+
auto art_topRight_linkedProj = CCSprite::createWithSpriteFrameName(corner);
545548
art_topRight_linkedProj->setID("top-right-corner");
546549
art_topRight_linkedProj->setAnchorPoint({ 1, 1 });
547550
art_topRight_linkedProj->setPosition({ linkedProjClippingNode->getScaledContentWidth(), linkedProjClippingNode->getScaledContentHeight() });
@@ -569,14 +572,16 @@ ProjectInfoPopup* ProjectInfoPopup::setProject(GJGameLevel* level) {
569572
linkedProjThumb->initWithSpriteFrameName("unavailable.png"_spr);
570573
};
571574

575+
linkedProjThumb->setScale(1.f);
572576
linkedProjThumb->setScale(linkedProjClippingNode->getScaledContentHeight() / linkedProjThumb->getScaledContentHeight());
577+
573578
linkedProjThumb->setPosition(linkedProjClippingNode->getPosition());
574579
linkedProjThumb->ignoreAnchorPointForPosition(false);
575580
linkedProjThumb->setColor({ 250, 250, 250 });
576581
linkedProjThumb->setOpacity(250);
577582
});
578583

579-
bool isCustomThumbnail = false; // whether the thumbnail is a custom one or not
584+
bool isCustomThumbnail = false; // whether the thumbnail is custom
580585

581586
// check if linked project has a custom thumbnail
582587
if (linkedProj.thumbnail.empty()) {

0 commit comments

Comments
 (0)