MacOS will be fixed later

Author: SpaghettDev

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Made the difficulty buttons in RLDifficultySelectLayer in another menu
 - Refactored RLDifficultySelectLayer.cpp
 - Use structured bindings (i forgor they existed)
+- `RLDifficultyNode` now inherits from CCNodeRGBA (rookie mistake)
 
 ### Fixed
 

src/custom_nodes/RLDifficultyNode.cpp

@@ -18,7 +18,7 @@ RLDifficultyNode* RLDifficultyNode::create(GJDifficulty difficulty, bool feature
 
 bool RLDifficultyNode::init(GJDifficulty difficulty, bool featured, bool epic)
 {
-	if (!CCNode::init()) return false;
+	if (!CCNodeRGBA::init()) return false;
 
 	m_difficulty_info = { difficulty, featured, epic };
 	m_color = { 255, 255, 255 };
@@ -55,6 +55,7 @@ bool RLDifficultyNode::init(GJDifficulty difficulty, bool featured, bool epic)
 
 void RLDifficultyNode::setColor(const ccColor3B& color)
 {
+	log::debug("called with r:{} g:{} b:{}", color.r, color.g, color.b);
 	m_difficulty_sprite->setColor(color);
 	if (m_featured_sprite)
 		m_featured_sprite->setColor(color);
@@ -64,7 +65,7 @@ void RLDifficultyNode::setColor(const ccColor3B& color)
 	m_color = color;
 }
 
-// basically RLDifficultyNode::init but without the call to CCNode::init and some extra checks
+// basically RLDifficultyNode::init but without the call to CCNodeRGBA::init and some extra checks
 void RLDifficultyNode::setDifficulty(GJDifficulty difficulty, bool featured, bool epic)
 {
 	if (m_difficulty_info == DifficultyInfo{ difficulty, featured, epic }) return;

src/custom_nodes/RLDifficultyNode.hpp

@@ -1,11 +1,12 @@
 #pragma once
-
-#include <Geode/Bindings.hpp>
+// #include <Geode/cocos/base_nodes/CCNode.h>
+// #include <Geode/cocos/sprite_nodes/CCSprite.h>
+// #include <Geode/cocos/include/ccTypes.h>
+#include <Geode/Geode.hpp>
 
 using namespace geode::prelude;
 
-// TODO: mfw CCNodeRGBA
-class RLDifficultyNode : public CCNode
+class RLDifficultyNode : public CCNodeRGBA
 {
 private:
 	struct DifficultyInfo
@@ -26,8 +27,9 @@ class RLDifficultyNode : public CCNode
 	static RLDifficultyNode* create(GJDifficulty, bool = false, bool = false);
 	bool init(GJDifficulty, bool = false, bool = false);
 
-	void setColor(const ccColor3B&);
+	// TODO: fix this setColor fuckery
+	void setColor(const ccColor3B&) override;
 
 	void setDifficulty(GJDifficulty, bool = false, bool = false);
-	DifficultyInfo getDifficultyInfo() const { return m_difficulty_info; };
+	const DifficultyInfo& getDifficultyInfo() const { return m_difficulty_info; };
 };

src/roulette/layers/RLRouletteLayer.cpp

@@ -19,7 +19,7 @@ std::string RLRouletteLayer::m_list_fetcher_error;
 
 RLRouletteLayer* RLRouletteLayer::create()
 {
-	auto ret = new RLRouletteLayer();
+	auto* ret = new RLRouletteLayer();
 	m_list_fetcher.init();
 
 	if (ret && ret->init())

src/roulette/layers/RLRouletteLayer.hpp

@@ -52,6 +52,7 @@ class RLRouletteLayer : public BaseCustomAlertLayer
 	void onNextLevel(bool = false, bool = false, float = -175.f);
 
 	void registerWithTouchDispatcher() override;
+
 	CCMenuItemSpriteExtra* getDifficultyButton(GJDifficulty);
 	void setDifficultyButtonColor(GJDifficulty, const ccColor3B&);