From a38d51693a36deee24f9aad04ffb8ffc146613e9 Mon Sep 17 00:00:00 2001 From: TheSillyDoggo Date: Mon, 30 Sep 2024 21:42:46 +1000 Subject: [PATCH] fix MAJOR bug --- changelog.md | 1 + src/Labels/Labels.cpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index f2a4083..31113fb 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,7 @@ - Fixed lag in game caused by custom fonts - Rewrote Copy Hack to work better - Fixed Monster Show Hitbox fix being broken with scaling +- Fixed Event Trigger not detecting player 2 jump - Added **Custom Icon Effect Speed** # 1.6.8 diff --git a/src/Labels/Labels.cpp b/src/Labels/Labels.cpp index 5c93682..877bd16 100644 --- a/src/Labels/Labels.cpp +++ b/src/Labels/Labels.cpp @@ -371,9 +371,9 @@ void StatusNode::updateCPS(float dt) class $modify (PlayerObject) { - void pushButton(PlayerButton p0) + bool pushButton(PlayerButton p0) { - PlayerObject::pushButton(p0); + auto ret = PlayerObject::pushButton(p0); if (p0 == PlayerButton::Jump && GJBaseGameLayer::get() && GJBaseGameLayer::get()->m_player1 == this) { @@ -386,11 +386,13 @@ class $modify (PlayerObject) stn->sLabels[8]->setColor(ccc3(0, 255, 0)); } } + + return ret; } - void releaseButton(PlayerButton p0) + bool releaseButton(PlayerButton p0) { - PlayerObject::releaseButton(p0); + auto ret = PlayerObject::releaseButton(p0); if (p0 == PlayerButton::Jump && GJBaseGameLayer::get()) { @@ -404,6 +406,8 @@ class $modify (PlayerObject) stn->sLabels[8]->runAction(CCTintTo::create(1, 255, 255, 255)); } } + + return ret; } };