From 06e0caae6e6f87e78876a8201f603df01316b767 Mon Sep 17 00:00:00 2001 From: Cvolton Date: Sun, 7 Jul 2024 19:37:49 +0200 Subject: [PATCH] use cvoltonalertlayerstub for customlevelsearchlayer --- src/layers/CustomLevelSearchLayer.cpp | 35 ++------------------------- src/layers/CustomLevelSearchLayer.h | 4 +-- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/src/layers/CustomLevelSearchLayer.cpp b/src/layers/CustomLevelSearchLayer.cpp index 66fe6bd..83a617a 100644 --- a/src/layers/CustomLevelSearchLayer.cpp +++ b/src/layers/CustomLevelSearchLayer.cpp @@ -1,4 +1,5 @@ #include "CustomLevelSearchLayer.h" +#include "_bases/CvoltonAlertLayerStub.h" using namespace geode::prelude; @@ -62,42 +63,10 @@ void CustomLevelSearchLayer::onNeighbors(CCObject* sender) { } bool CustomLevelSearchLayer::init(GJGameLevel* level){ - bool init = cocos2d::CCLayerColor::initWithColor({0x00, 0x00, 0x00, 0x4B}); - if(!init) return false; + if(!CvoltonAlertLayerStub::init({360.f, 180.f})) return false; this->m_level = level; - cocos2d::CCDirector* director = cocos2d::CCDirector::sharedDirector(); - /*director->getTouchDispatcher()->incrementForcePrio(2);*/ - - setTouchEnabled(true); - setKeypadEnabled(true); - - cocos2d::CCSize winSize = director->getWinSize(); - m_mainLayer = cocos2d::CCLayer::create(); - - this->addChild(m_mainLayer); - - cocos2d::extension::CCScale9Sprite* bg = cocos2d::extension::CCScale9Sprite::create("GJ_square01.png", { 0.0f, 0.0f, 80.0f, 80.0f }); - bg->setContentSize({ 360.0f, 180.0f }); - m_mainLayer->addChild(bg, -1); - m_mainLayer->setID("main-layer"_spr); - bg->setPosition({ winSize.width / 2, winSize.height / 2 }); - - auto closeButton = CCMenuItemSpriteExtra::create( - CCSprite::createWithSpriteFrameName("GJ_closeBtn_001.png"), - this, - menu_selector(CustomLevelSearchLayer::onClose) - ); - - m_buttonMenu = CCMenu::create(); - m_buttonMenu->setID("button-menu"_spr); - m_mainLayer->addChild(m_buttonMenu, 10); - m_buttonMenu->addChild(closeButton); - closeButton->setPosition({-170.5f, 79}); - closeButton->setSizeMult(1.2f); - closeButton->setID("close-button"_spr); - auto searchTitle = CCLabelBMFont::create("Search", "bigFont.fnt"); searchTitle->setPosition({0,66}); searchTitle->setID("search-title"_spr); diff --git a/src/layers/CustomLevelSearchLayer.h b/src/layers/CustomLevelSearchLayer.h index ea5f3a9..4df8245 100644 --- a/src/layers/CustomLevelSearchLayer.h +++ b/src/layers/CustomLevelSearchLayer.h @@ -2,11 +2,11 @@ #include #include "../utils.hpp" +#include "_bases/CvoltonAlertLayerStub.h" using namespace geode::prelude; -//TODO: use CvoltonAlertLayerStub -class BI_DLL CustomLevelSearchLayer : public FLAlertLayer { +class BI_DLL CustomLevelSearchLayer : public CvoltonAlertLayerStub { Ref m_level = nullptr; public: static CustomLevelSearchLayer* create(GJGameLevel* level);