diff --git a/HelloWorld/android/project.properties b/HelloWorld/android/project.properties index 113acb7213..f049142c17 100644 --- a/HelloWorld/android/project.properties +++ b/HelloWorld/android/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-9 +target=android-10 diff --git a/tests/tests/TouchesTest/Paddle.cpp b/tests/tests/TouchesTest/Paddle.cpp index 1e2c4ddf23..5f43a6945a 100644 --- a/tests/tests/TouchesTest/Paddle.cpp +++ b/tests/tests/TouchesTest/Paddle.cpp @@ -78,6 +78,12 @@ void Paddle::ccTouchMoved(CCTouch* touch, CCEvent* event) setPosition( CCPointMake(touchPoint.x, getPosition().y) ); } +CCObject* Paddle::copyWithZone(CCZone *pZone) +{ + this->retain(); + return this; +} + void Paddle::ccTouchEnded(CCTouch* touch, CCEvent* event) { CCAssert(m_state == kPaddleStateGrabbed, L"Paddle - Unexpected state!"); diff --git a/tests/tests/TouchesTest/Paddle.h b/tests/tests/TouchesTest/Paddle.h index 0a6e6b051b..6c3e7f6902 100644 --- a/tests/tests/TouchesTest/Paddle.h +++ b/tests/tests/TouchesTest/Paddle.h @@ -1,14 +1,14 @@ -#ifndef _PADDLE_H_ -#define _PADDLE_H_ +#ifndef _PADDLE_H_ +#define _PADDLE_H_ #include "cocos2d.h" using namespace cocos2d; -typedef enum tagPaddleState -{ - kPaddleStateGrabbed, - kPaddleStateUngrabbed +typedef enum tagPaddleState +{ + kPaddleStateGrabbed, + kPaddleStateUngrabbed } PaddleState; class Paddle : public CCSprite, public CCTargetedTouchDelegate @@ -20,18 +20,19 @@ public: virtual ~Paddle(void); CCRect rect(); - bool initWithTexture(CCTexture2D* aTexture); - virtual void onEnter(); - virtual void onExit(); - bool containsTouchLocation(CCTouch* touch); - virtual bool ccTouchBegan(CCTouch* touch, CCEvent* event); - virtual void ccTouchMoved(CCTouch* touch, CCEvent* event); - virtual void ccTouchEnded(CCTouch* touch, CCEvent* event); - - virtual void touchDelegateRetain(); - virtual void touchDelegateRelease(); + bool initWithTexture(CCTexture2D* aTexture); + virtual void onEnter(); + virtual void onExit(); + bool containsTouchLocation(CCTouch* touch); + virtual bool ccTouchBegan(CCTouch* touch, CCEvent* event); + virtual void ccTouchMoved(CCTouch* touch, CCEvent* event); + virtual void ccTouchEnded(CCTouch* touch, CCEvent* event); + virtual CCObject* copyWithZone(CCZone *pZone); - static Paddle* paddleWithTexture(CCTexture2D* aTexture); + virtual void touchDelegateRetain(); + virtual void touchDelegateRelease(); + + static Paddle* paddleWithTexture(CCTexture2D* aTexture); }; #endif diff --git a/tests/tests/TouchesTest/TouchesTest.cpp b/tests/tests/TouchesTest/TouchesTest.cpp index 19c1409a7b..3f1ea0a1d9 100644 --- a/tests/tests/TouchesTest/TouchesTest.cpp +++ b/tests/tests/TouchesTest/TouchesTest.cpp @@ -24,7 +24,6 @@ enum // //------------------------------------------------------------------ PongScene::PongScene() -:TestScene(true) { PongLayer *pongLayer = new PongLayer();//PongLayer::node(); addChild(pongLayer); @@ -33,7 +32,6 @@ PongScene::PongScene() void PongScene::MainMenuCallback(CCObject* pSender) { - CCDirector::sharedDirector()->setDeviceOrientation(CCDeviceOrientationPortrait); TestScene::MainMenuCallback(pSender); }