Fix some miscellaneous bugs

Author: SpaghettDev

.gitignore

@@ -1,3 +1,8 @@
 /.vs
 /.vscode
 /build
+/build-ninja
+
+# clangd stuff
+/.cache
+/.clangd

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - `RLDifficultyNode` wrong position when playing roulette
 - `RLLoadingCircle` wrong position for a split second when offline
+- Some miscellaneous bugs
 
 ## [2.0.4] - 2024-03-13
 

CMakeLists.txt

@@ -7,8 +7,6 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 project(GD-Roulette LANGUAGES CXX VERSION 1.0.0)
 
 set(SRC_DIR "${PROJECT_SOURCE_DIR}/src")
-set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 file(GLOB_RECURSE SRC_MAIN
     "${SRC_DIR}/**.hpp"

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "2.0.0-beta.23",
+	"geode": "2.0.0-beta.24",
 	"gd": {
 		"win": "2.204",
 		"android": "2.205",

src/custom_layers/base/BaseCustomAlertLayer.hpp

@@ -4,6 +4,7 @@
 
 #include <Geode/cocos/include/ccTypes.h>
 #include <Geode/cocos/cocoa/CCObject.h>
+#include <Geode/binding/FLAlertLayer.hpp>
 #include <Geode/binding/CCMenuItemSpriteExtra.hpp>
 
 using namespace geode::prelude;

src/custom_nodes/RLDifficultyNode.cpp

@@ -108,18 +108,14 @@ void RLDifficultyNode::setDifficulty(const DifficultyInfo& di)
 				m_feature_sprite = CCSprite::createWithSpriteFrameName(
 					rl::constants::feature_state_to_sprite.at(di.feature_state).data()
 				);
+				m_feature_sprite->setID("feature-sprite");
+				this->addChild(m_feature_sprite, -1);
 			break;
 
 			default:
 				m_feature_sprite = nullptr;
 			break;
 		}
-
-		if (m_feature_sprite)
-		{
-			m_feature_sprite->setID("feature-sprite");
-			this->addChild(m_feature_sprite, -1);
-		}
 	}
 
 	m_difficulty_info = di;

src/roulette/layers/RLRouletteInfoLayer.cpp

@@ -4,6 +4,7 @@
 #include "../../custom_nodes/RLDifficultyNode.hpp"
 #include "../../utils.hpp"
 
+#include <functional>
 #include <matjson/stl_serialize.hpp>
 #include <Geode/Bindings.hpp>
 #include <Geode/Geode.hpp>
@@ -128,13 +129,11 @@ void RLRouletteInfoLayer::onToggleButton(CCObject* sender)
 	// yeah...
 	auto changeListWrapper = [&](const std::function<void()>& f) {
 		g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(button->getTag()) = false;
-		g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(prevIdx) = false;
 		g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(0) = true;
 
 		f();
 
 		g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(0) = false;
-		g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(prevIdx) = false;
 		g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(button->getTag()) = true;
 	};
 

src/roulette/layers/RLRouletteLayer.cpp

@@ -128,7 +128,10 @@ bool RLRouletteLayer::init()
 	plusButton->setPosition({ 135.f, -20.f });
 	plusButton->setSizeMult(1.2f);
 	plusButton->setID("demon-plus-button");
-	plusButton->setVisible(m_selected_difficulty >= GJDifficulty::Demon);
+	plusButton->setVisible(
+		rl::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("selected-list-array").as_array(), true) != 0 ||
+		m_selected_difficulty >= GJDifficulty::Demon
+	);
 	main_menu->addChild(plusButton);
 
 	auto startButtonText = CCLabelBMFont::create("Start", "bigFont.fnt");
@@ -733,7 +736,12 @@ CCMenuItemSpriteExtra* RLRouletteLayer::createDifficultyButton(
 		this,
 		menu_selector(RLRouletteLayer::onDifficultyButton)
 	);
-	if (m_selected_difficulty != difficulty)
+	if (
+		(
+			rl::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("selected-list-array").as_array(), true) != 0 &&
+			m_selected_difficulty != difficulty
+		) || m_selected_difficulty != difficulty
+		)
 		button->setColor({ 125, 125, 125 });
 	button->setPosition(point);
 	button->setTag(static_cast<int>(difficulty));

src/roulette/manager/RouletteManager.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include <atomic>
-#include <array>
 #include <matjson/stl_serialize.hpp>
 
 #include <Geode/loader/Mod.hpp>