Skip to content

Commit 87f484b

Browse files
s1ddoks1ddok
authored andcommitted
Eliminate warnings
1 parent 0d7e90a commit 87f484b

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

cocos2d/CCActionInstant.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,4 +368,5 @@
368368
*/
369369
-(id) initWithSpriteFrame:(CCSpriteFrame*)spriteFrame;
370370

371-
@end
371+
@end
372+

cocos2d/CCResponderManager.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(CCTouchEvent *)event
240240
// go through all touches
241241
for (CCTouch *touch in touches)
242242
{
243-
CGPoint worldTouchLocation = [[CCDirector sharedDirector] convertToGL:[touch locationInView:(CCGLView*)[CCDirector sharedDirector].view]];
243+
CGPoint worldTouchLocation = [[CCDirector sharedDirector] convertToGL:[touch locationInView:[CCDirector sharedDirector].view]];
244244

245245
// scan backwards through touch responders
246246
for (int index = _responderListCount - 1; index >= 0; index --)
@@ -317,7 +317,7 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(CCTouchEvent *)event
317317
else
318318
{
319319
// as node does not lock touch, check if it was moved outside
320-
if (![node hitTestWithWorldPos:[[CCDirector sharedDirector] convertToGL:[touch locationInView:(CCGLView*)[CCDirector sharedDirector].view]]])
320+
if (![node hitTestWithWorldPos:[[CCDirector sharedDirector] convertToGL:[touch locationInView:[CCDirector sharedDirector].view]]])
321321
{
322322
// cancel the touch
323323
if ([node respondsToSelector:@selector(touchCancelled:withEvent:)])
@@ -346,7 +346,7 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(CCTouchEvent *)event
346346
CCNode *node = _responderList[index];
347347

348348
// if the touch responder does not lock touch, it will receive a touchBegan if a touch is moved inside
349-
if (!node.claimsUserInteraction && [node hitTestWithWorldPos:[[CCDirector sharedDirector] convertToGL:[touch locationInView:(CCGLView*)[CCDirector sharedDirector].view ]]])
349+
if (!node.claimsUserInteraction && [node hitTestWithWorldPos:[[CCDirector sharedDirector] convertToGL:[touch locationInView:[CCDirector sharedDirector].view]]])
350350
{
351351
// check if node has exclusive touch
352352
if (node.isExclusiveTouch)

cocos2d/CCSprite.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ typedef struct CCSpriteTexCoordSet {
5454
5555
The default anchorPoint in CCSprite is (0.5, 0.5).
5656
*/
57-
@interface CCSprite : CCNode <CCTextureProtocol, CCShaderProtocol, CCBlendProtocol, CCEffectProtocol>
57+
@interface CCSprite : CCNode <CCTextureProtocol, CCShaderProtocol, CCBlendProtocol
58+
// A bit ugly, will refactor later
59+
#if CC_EFFECTS
60+
, CCEffectProtocol
61+
#endif
62+
>
5863

5964
/// -----------------------------------------------------------------------
6065
/// @name Creating a Sprite with an Image File or Sprite Frame Name

0 commit comments

Comments
 (0)