Skip to content

Fix the controller ids overriding coin ids (not setting the controller ids to the correct ones) #164

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

Open
Cosmella-v wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix the controller ids overriding coin ids (not setting the controller ids to the correct ones) #164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bce5f4
Fix index increment for coin sprite IDs
Cosmella-v Apr 18, 2026
c73d5b0
Make the code worse for speed
Apr 18, 2026
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
49 changes: 34 additions & 15 deletions src/EndLevelLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ using namespace geode::node_ids;
leaderboardButton->setID("practice-retry-button");
}

int currentCoin = 1;
int currentCoin = 0;
auto mainLayerChildren = CCArrayExt<CCNode*>(m_mainLayer->getChildren());
std::vector<CCPoint> coinPos;
for (auto child : CCArrayExt<CCNode*>(m_mainLayer->getChildren())) {
for (auto child : mainLayerChildren) {
for (auto framename : {
"secretCoin_b_01_001.png",
"secretCoin_2_b_01_001.png"
Expand All @@ -127,23 +128,42 @@ using namespace geode::node_ids;
}
}
}

for (auto child : CCArrayExt<CCNode*>(m_mainLayer->getChildren())) {
for (int i = 1; i < currentCoin; i++) {
if (child->getID().empty() && child->getPosition() == coinPos[i - 1]) {
child->setID(fmt::format("coin-{}-sprite", i));
}
}
}

/*
i was using it for a fullbreak but also goto aftercoinIDS is faster since
it doesn't make sense to add coins if there are none since it will already do this
in the for loop
*/
int matchedCoins = 0; // remove the "jump from this goto statement to its label is a Microsoft extension [-Wmicrosoft-goto]"
if (currentCoin <= 0) goto aftercoinIDS;
// fun fact the controller icon is always set before this one
for (auto child : CCArrayExt<CCNode*>(m_coinsToAnimate)) {
for (int i = 1; i < currentCoin; i++) {
if (child->getID().empty() && child->getPosition() == coinPos[i - 1]) {
for (int i = 0; i < currentCoin; i++) {
if (child->getID().empty() && child->getPosition() == coinPos[i]) {
child->setID(fmt::format("coin-{}-sprite", i));
matchedCoins++;
break;
}
}
}

// idx should be kept the same
if (matchedCoins >= currentCoin) goto aftercoinIDS;

// idx is after all the other ids, controller icons are always set after these for some reason?
for (int fl = idx; fl < mainLayerChildren.size(); fl++) {
auto child = mainLayerChildren[fl];
for (int i = 0; i < currentCoin; i++) {
if (child->getID().empty() && child->getPosition() == coinPos[i]) {
child->setID(fmt::format("coin-{}-sprite", i));
idx = fl+1;
matchedCoins++;
if (matchedCoins >= currentCoin) {
goto aftercoinIDS; // i wanted a double break whatever
}
break; // already set a id to this thing
};
};
};
aftercoinIDS:
if (PlatformToolbox::isControllerConnected()) {
setIDs(
m_mainLayer,
Expand All @@ -153,7 +173,6 @@ using namespace geode::node_ids;
);
idx += 2;
}

// original code by alphalaneous, adapted to node IDs by raydeeux
std::reverse(nodesToMove.begin(), nodesToMove.end());

Expand Down