File tree Expand file tree Collapse file tree 2 files changed +6
-13
lines changed
Expand file tree Collapse file tree 2 files changed +6
-13
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,11 @@ using namespace geode::prelude;
1111AndroidZoomLayer* AndroidZoomLayer::instance = nullptr ;
1212
1313AndroidZoomLayer* AndroidZoomLayer::create (CCNode* sceneLayer) {
14+ if (instance) {
15+ instance = nullptr ;
16+ geode::log::info (" AndroidZoomLayer already exists, deleting it!" );
17+ }
18+
1419 auto layer = new AndroidZoomLayer ();
1520 if (layer && layer->init (sceneLayer)) {
1621 layer->autorelease ();
@@ -22,14 +27,6 @@ AndroidZoomLayer* AndroidZoomLayer::create(CCNode* sceneLayer) {
2227 return nullptr ;
2328}
2429
25- AndroidZoomLayer* AndroidZoomLayer::getOrCreate (CCNode* sceneLayer) {
26- if (instance) {
27- return instance;
28- }
29-
30- return create (sceneLayer);
31- }
32-
3330bool AndroidZoomLayer::init (CCNode* sceneLayer) {
3431 if (!CCLayer::init ())
3532 return false ;
@@ -39,7 +36,6 @@ bool AndroidZoomLayer::init(CCNode* sceneLayer) {
3936 return false ;
4037 }
4138
42-
4339 if (sceneLayer->getChildByID (" AnodroidZoomLayer" )) {
4440 geode::log::error (" AnodroidZoomLayer already exists in scene!" );
4541 return false ;
@@ -196,7 +192,7 @@ class $modify(AndroidZoomPauseLayer, PauseLayer) {
196192 }
197193
198194 void onZoomButton (CCObject* sender) {
199- AndroidZoomLayer* layer = AndroidZoomLayer::getOrCreate (this ->getParent ());
195+ AndroidZoomLayer::create (this ->getParent ());
200196 }
201197};
202198
Original file line number Diff line number Diff line change @@ -9,9 +9,7 @@ using namespace geode::prelude;
99class AndroidZoomLayer : public CCLayer {
1010public:
1111 static AndroidZoomLayer* instance;
12-
1312 static AndroidZoomLayer* create (CCNode* sceneLayer);
14- static AndroidZoomLayer* getOrCreate (CCNode* sceneLayer);
1513
1614 bool init (CCNode* sceneLayer);
1715 bool ccTouchBegan (CCTouch* pTouch, CCEvent* pEvent) override ;
@@ -20,7 +18,6 @@ class AndroidZoomLayer : public CCLayer {
2018 void ccTouchCancelled (CCTouch* pTouch, CCEvent* pEvent) override ;
2119 void onBackButton (CCObject* sender);
2220 void onBackButton23 (CCObject* sender);
23-
2421 void removeTouchEvent (CCTouch* pTouch, CCEvent* pEvent);
2522private:
2623 CCPoint getAnchorPoint (CCTouch* touch1, CCTouch* touch2);
You can’t perform that action at this time.
0 commit comments