Skip to content

Commit 92dcc6e

Browse files
author
s1ddok
committed
fixes for extensions
1 parent 1ebd554 commit 92dcc6e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

cocos2d-ext/CCBReader/CCAnimationManager.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,9 @@ - (CCActionInterval*)actionFromKeyframe0:(CCBKeyframe*)kf0 andKeyframe1:(CCBKeyf
230230
// TODO is this a mild bug?
231231
// What happens if an easing curve is applied to this?
232232
return (CCActionInterval *)[CCActionSpriteFrame actionWithSpriteFrame:kf1.value];
233-
} else if ([node isKindOfClass:[CCLightNode class]]) {
233+
}
234+
#if CC_LIGHTING
235+
else if ([node isKindOfClass:[CCLightNode class]]) {
234236
if ([name isEqualToString:@"intensity"] ||
235237
[name isEqualToString:@"specularIntensity"] ||
236238
[name isEqualToString:@"ambientIntensity"] ||
@@ -244,6 +246,8 @@ - (CCActionInterval*)actionFromKeyframe0:(CCBKeyframe*)kf0 andKeyframe1:(CCBKeyf
244246
{
245247
return [CCBActionTweenColor actionWithDuration:duration key:name from:kf0.value to:kf1.value];
246248
}
249+
}
250+
#endif
247251
} else {
248252
CCLOG(@"CCBReader: Failed to create animation for property: %@", name);
249253
}

cocos2d/cocos2d.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636

3737
if ([COCOS2D_BUILD isEqualToString:@"release"])
3838
{
39-
return [NSString stringWithFormat:@"Cocos2D-Swift version %d.%d.%d", major, minor, rev];
39+
return [NSString stringWithFormat:@"Cocos2D-ObjC version %d.%d.%d", major, minor, rev];
4040
}
4141
else
4242
{
43-
return([[NSString stringWithFormat:@"Cocos2D-Swift version %d.%d.%d-", major, minor, rev] stringByAppendingString:COCOS2D_BUILD]);
43+
return([[NSString stringWithFormat:@"Cocos2D-ObjC version %d.%d.%d-", major, minor, rev] stringByAppendingString:COCOS2D_BUILD]);
4444
}
4545
}

0 commit comments

Comments
 (0)