Skip to content

Commit 3bdc8cd

Browse files
committed
saved 40-ish lines
1 parent d7fdf33 commit 3bdc8cd

File tree

2 files changed

+4
-41
lines changed

2 files changed

+4
-41
lines changed

include/Surge/layers/IslandSelectLayer.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@ class IslandSelectLayer : public CCLayer, public BoomScrollLayerDelegate, public
2121
void onClose(CCObject*);
2222
void onPrev(CCObject*);
2323
void onNext(CCObject*);
24-
void onDownload(CCObject*);
25-
void onSoundtracks(CCObject*);
2624
void onBack(CCObject*);
2725
void keyBackClicked() override;
2826
void onIslandLevel(CCObject* sender);
2927
void runParticle();
3028
void scrollLayerMoved(CCPoint) override;
31-
CCNode* createSideArt();
3229
void keyDown(int);
3330
void updateColors();
3431
static IslandSelectLayer* create(int page);

src/layers/IslandSelectLayer.cpp

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,23 +1308,15 @@ bool IslandSelectLayer::init(int page) {
13081308
level1arrow->runAction(repeatAction);
13091309
}
13101310

1311-
m_background = CCSprite::create("GJ_gradientBG.png");
1312-
m_background->setAnchorPoint({ 0.f, 0.f });
1313-
addChild(m_background, -4);
1314-
1315-
m_background->setScaleX((winSize.width + 10.f) / m_background->getTextureRect().size.width);
1316-
m_background->setScaleY((winSize.height + 10.f) / m_background->getTextureRect().size.height);
1317-
m_background->setPosition(ccp(-5, -5));
1318-
m_background->setColor(GM->colorForIdx(4));
1319-
1311+
m_background = createLayerBG();
13201312
m_background->setZOrder(-4);
1313+
this->addChild(m_background);
1314+
13211315
sprite3->setColor(ccBLACK);
13221316
sprite3->setOpacity(40);
13231317

13241318
m_background->setColor({ 0, 125, 255 });
1325-
CCNode* sideArt = createSideArt();
1326-
1327-
addChild(sideArt);
1319+
addSideArt(this, SideArt::Bottom, false);
13281320

13291321
auto pageBtnsMenu = CCMenu::create();
13301322
pageBtnsMenu->setPosition({ 0, 0 });
@@ -1466,32 +1458,6 @@ void IslandSelectLayer::runParticle() {
14661458
particles->addChild(circlewave2, 2);
14671459
}
14681460

1469-
CCNode* IslandSelectLayer::createSideArt() {
1470-
CCNode* sideArt = CCNode::create();
1471-
1472-
CCDirector* director = CCDirector::sharedDirector();
1473-
const float screenLeft = director->getScreenLeft();
1474-
const float screenRight = director->getScreenRight();
1475-
const float screenBottom = director->getScreenBottom();
1476-
1477-
CCSprite* left = CCSprite::createWithSpriteFrameName(
1478-
"GJ_sideArt_001.png"
1479-
);
1480-
left->setAnchorPoint({ 0.0f, 0.0f });
1481-
left->setPosition({ screenLeft - 1.0f, screenBottom - 1.0f });
1482-
sideArt->addChild(left);
1483-
1484-
CCSprite* right = CCSprite::createWithSpriteFrameName(
1485-
"GJ_sideArt_001.png"
1486-
);
1487-
right->setAnchorPoint({ 1.0f, 0.0f });
1488-
right->setPosition({ screenRight + 1.0f, screenBottom - 1.0f });
1489-
right->setFlipX(true);
1490-
sideArt->addChild(right);
1491-
1492-
return sideArt;
1493-
}
1494-
14951461
void IslandSelectLayer::keyBackClicked() {
14961462
CCDirector::sharedDirector()->popSceneWithTransition(0.5f, PopTransition::kPopTransitionFade);
14971463
}

0 commit comments

Comments
 (0)