Revert to working state

Author: Alphalaneous

src/ui/hooks/CreatorLayer.h

@@ -55,9 +55,9 @@ class $modify(MyCreatorLayer, CreatorLayer){
 
 		MCButton* questsButton = MCButton::create("Quests", 38.1f, this, menu_selector(CreatorLayer::onChallenge));
 		MCButton* gauntletsButton = MCButton::create("Gauntlets", 38.1f, this, menu_selector(CreatorLayer::onGauntlets));
-		MCButton* pathsButton = MCButton::create("Paths", 38.1f, this, menu_selector(CreatorLayer::onGauntlets));//(CreatorLayer::onPaths));
+		MCButton* pathsButton = MCButton::create("Paths", 38.1f, this, menu_selector(CreatorLayer::onPaths));
 		MCButton* listsButton = MCButton::create("Lists", 38.1f, this, menu_selector(CreatorLayer::onTopLists));
-		MCButton* mapPacksButton = MCButton::create("Map Packs", 38.1f, this, menu_selector(CreatorLayer::onGauntlets));//(CreatorLayer::onMapPacks));
+		MCButton* mapPacksButton = MCButton::create("Map Packs", 38.1f, this, menu_selector(CreatorLayer::onMapPacks));
 		MCButton* vaultButton = MCButton::create("Vault", 38.1f, this, menu_selector(CreatorLayer::onSecretVault));
 		MCButton* treasureButton = MCButton::create("Treasure", 38.1f, this, menu_selector(CreatorLayer::onTreasureRoom));
 
@@ -122,7 +122,7 @@ class $modify(MyCreatorLayer, CreatorLayer){
 		content->addChild(importantButtonMenu);
 
 
-		MCButton* doneButton = MCButton::create("Done", 49.1f, this, menu_selector(CreatorLayer::onGauntlets));//(CreatorLayer::onBack));
+		MCButton* doneButton = MCButton::create("Done", 49.1f, this, menu_selector(CreatorLayer::onBack));
 
 		doneButton->setPosition({winSize.width/2, 16});
 		doneButton->setID("done-button"_spr);

src/ui/hooks/MenuLayer.h

@@ -84,12 +84,12 @@ class $modify(MyMenuLayer, MenuLayer) {
 
 		CCMenu* menu = CCMenu::create();
 
-		MCButton* playButton = MCButton::create("Singleplayer", 49.1f, this, menu_selector(MyMenuLayer::onMods));//(MenuLayer::onPlay));
-		MCButton* editButton = MCButton::create("Online Levels", 49.1f, this, menu_selector(MyMenuLayer::onMods));//(MenuLayer::onCreator));
+		MCButton* playButton = MCButton::create("Singleplayer", 49.1f, this, menu_selector(MenuLayer::onPlay));
+		MCButton* editButton = MCButton::create("Online Levels", 49.1f, this, menu_selector(MenuLayer::onCreator));
 		MCButton* modsButton = MCButton::create("Mods", 24.0f, this, menu_selector(MyMenuLayer::onMods));
-		MCButton* skinButton = MCButton::create("Skins", 24.0f, this, menu_selector(MyMenuLayer::onMods));//(MenuLayer::onGarage));
+		MCButton* skinButton = MCButton::create("Skins", 24.0f, this, menu_selector(MenuLayer::onGarage));
 
-		MCButton* optionsButton = MCButton::create("Options...", 24.0f, this, menu_selector(MyMenuLayer::onMods));//(MyMenuLayer::onOptions));
+		MCButton* optionsButton = MCButton::create("Options...", 24.0f, this, menu_selector(MyMenuLayer::onOptions));
 		MCButton* quitButton = MCButton::create("Quit Game", 24.0f, this, menu_selector(MyMenuLayer::onExit));
 
 		MCButton* profileButton = MCButton::create("", 5.0f, this, menu_selector(MyMenuLayer::onMyProfile));
@@ -364,7 +364,7 @@ class $modify(MyMenuLayer, MenuLayer) {
 
 		createQuickPopup("Quit Game", "Are you sure you want to <cr>quit</c>?", "Cancel", "Yes", [this](FLAlertLayer*, bool button2){
 			if(button2){
-				//endGame();
+				endGame();
 			}
 		});
 	}

src/ui/hooks/PlayLayer.h

@@ -34,10 +34,10 @@ class $modify(MyPlayLayer, PlayLayer){
         CCConfiguration* config = CCConfiguration::sharedConfiguration();
         CCDictionary* dict = public_cast(config, m_pValueDict);
 
-        m_fields->gpuVendor = std::string(typeinfo_cast<CCString*>(dict->objectForKey("gl.vendor"))->getCString());
-        m_fields->gpuRenderer = std::string(typeinfo_cast<CCString*>(dict->objectForKey("gl.renderer"))->getCString());
-        m_fields->gpuVersion = std::string(typeinfo_cast<CCString*>(dict->objectForKey("gl.version"))->getCString());
-        m_fields->cocosVersion = std::string(typeinfo_cast<CCString*>(dict->objectForKey("cocos2d.x.version"))->getCString());
+        m_fields->gpuVendor = std::string(static_cast<CCString*>(dict->objectForKey("gl.vendor"))->getCString());
+        m_fields->gpuRenderer = std::string(static_cast<CCString*>(dict->objectForKey("gl.renderer"))->getCString());
+        m_fields->gpuVersion = std::string(static_cast<CCString*>(dict->objectForKey("gl.version"))->getCString());
+        m_fields->cocosVersion = std::string(static_cast<CCString*>(dict->objectForKey("cocos2d.x.version"))->getCString());
 
         #ifndef GEODE_IS_ANDROID
 

src/ui/layers/ExtrasLayer.cpp

@@ -115,7 +115,7 @@ bool ExtrasLayer::init() {
 
     MCButton* dailyChestButton = MCButton::create("Daily Chests", 39.1f, this, menu_selector(MenuLayer::onDaily));
     MCButton* achievementsButton = MCButton::create("Achievements", 39.1f, this, menu_selector(MenuLayer::onAchievements));
-    MCButton* statsButton = MCButton::create("Stats", 39.1f, this, menu_selector(MenuLayer::onAchievements));//(MenuLayer::onStats));
+    MCButton* statsButton = MCButton::create("Stats", 39.1f, this, menu_selector(MenuLayer::onStats));
     MCButton* newgroundsButton = MCButton::create("Newgrounds", 39.1f, this, menu_selector(ExtrasLayer::onNewgrounds));
     MCButton* moreGamesButton = MCButton::create("More Games", 39.1f, this, menu_selector(MenuLayer::onMoreGames));
 

src/ui/nodes/MCButtonChild.cpp

@@ -132,7 +132,9 @@ void MCButtonChild::onHoverExit(){
 }
 
 void MCButtonChild::unselected(){
+    #ifdef GEODE_IS_ANDROID
     onHoverExit();
+    #endif
 }
 
 void MCButtonChild::doClick(){

src/utils/Utils.h

@@ -313,7 +313,7 @@ class Utils {
         if(auto btn = static_cast<MyCCMenuItemToggler*>(toggler)){
             newToggler = CCMenuItemToggler::create(offBtn, onBtn, btn->m_pListener, btn->m_pfnSelector);
             newToggler->setTag(toggler->getTag());
-            //newToggler->setSizeMult(0);
+            newToggler->setSizeMult(0);
 
             auto onBtnToggler = static_cast<MyCCMenuItemSpriteExtra*>(newToggler->m_onButton);
             onBtnToggler->m_fields->m_isMCButton = true;