Skip to content

Fixed conflicting variable names in readPropertyForNode:parent:isExtraProp: #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richard-sim wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed conflicting variable names in readPropertyForNode:parent:isExtraProp: #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88bfc75
Still trying to get changes to CCBReader picked up...
richard-sim Apr 10, 2013
390df2d
Fixed bug with interpolation of keyframes that are set to Instant int…
richard-sim May 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CCBReader/CCBAnimationManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ - (void) update:(ccTime)time
@implementation CCEaseInstant
-(void) update: (ccTime) t
{
if (t < 0)
if (t < 1)
{
[self.inner update:0];
}
Expand Down
60 changes: 30 additions & 30 deletions CCBReader/CCBReader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ - (NSString*) readCachedString
- (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(BOOL)isExtraProp
{
// Read type and property name
int type = [self readIntWithSign:NO];
int prop_type = [self readIntWithSign:NO];
NSString* name = [self readCachedString];

// Check if the property can be set for this platform
Expand Down Expand Up @@ -259,7 +259,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[extraPropNames addObject:name];
}

if (type == kCCBPropTypePosition)
if (prop_type == kCCBPropTypePosition)
{
float x = [self readFloat];
float y = [self readFloat];
Expand All @@ -284,8 +284,8 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if(type == kCCBPropTypePoint
|| type == kCCBPropTypePointLock)
else if(prop_type == kCCBPropTypePoint
|| prop_type == kCCBPropTypePointLock)
{
float x = [self readFloat];
float y = [self readFloat];
Expand All @@ -300,7 +300,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
#endif
}
}
else if (type == kCCBPropTypeSize)
else if (prop_type == kCCBPropTypeSize)
{
float w = [self readFloat];
float h = [self readFloat];
Expand All @@ -314,7 +314,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setRelativeSize:size type:type parentSize:containerSize propertyName:name];
}
}
else if (type == kCCBPropTypeScaleLock)
else if (prop_type == kCCBPropTypeScaleLock)
{
float x = [self readFloat];
float y = [self readFloat];
Expand All @@ -335,7 +335,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if (type == kCCBPropTypeFloatXY)
else if (prop_type == kCCBPropTypeFloatXY)
{
float xFloat = [self readFloat];
float yFloat = [self readFloat];
Expand All @@ -348,8 +348,8 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:[NSNumber numberWithFloat:yFloat] forKey:nameY];
}
}
else if (type == kCCBPropTypeDegrees
|| type == kCCBPropTypeFloat)
else if (prop_type == kCCBPropTypeDegrees
|| prop_type == kCCBPropTypeFloat)
{
float f = [self readFloat];

Expand All @@ -364,7 +364,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if (type == kCCBPropTypeFloatScale)
else if (prop_type == kCCBPropTypeFloatScale)
{
float f = [self readFloat];
int type = [self readIntWithSign:NO];
Expand All @@ -374,8 +374,8 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setRelativeFloat:f type:type propertyName:name];
}
}
else if (type == kCCBPropTypeInteger
|| type == kCCBPropTypeIntegerLabeled)
else if (prop_type == kCCBPropTypeInteger
|| prop_type == kCCBPropTypeIntegerLabeled)
{
int d = [self readIntWithSign:YES];

Expand All @@ -384,7 +384,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:[NSNumber numberWithInt:d] forKey:name];
}
}
else if (type == kCCBPropTypeFloatVar)
else if (prop_type == kCCBPropTypeFloatVar)
{
float f = [self readFloat];
float fVar = [self readFloat];
Expand All @@ -396,7 +396,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:[NSNumber numberWithFloat:fVar] forKey:nameVar];
}
}
else if (type == kCCBPropTypeCheck)
else if (prop_type == kCCBPropTypeCheck)
{
BOOL b = [self readBool];

Expand All @@ -411,7 +411,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if (type == kCCBPropTypeSpriteFrame)
else if (prop_type == kCCBPropTypeSpriteFrame)
{
NSString* spriteSheet = [self readCachedString];
NSString* spriteFile = [self readCachedString];
Expand Down Expand Up @@ -446,7 +446,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if(type == kCCBPropTypeAnimation)
else if(prop_type == kCCBPropTypeAnimation)
{
NSString* animationFile = [self readCachedString];
NSString* animation = [self readCachedString];
Expand All @@ -472,7 +472,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:pAnimation forKey:name];
}
}
else if (type == kCCBPropTypeTexture)
else if (prop_type == kCCBPropTypeTexture)
{
NSString* spriteFile = [self readCachedString];

Expand All @@ -482,7 +482,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:texture forKey:name];
}
}
else if (type == kCCBPropTypeByte)
else if (prop_type == kCCBPropTypeByte)
{
int byte = [self readByte];

Expand All @@ -497,7 +497,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if (type == kCCBPropTypeColor3)
else if (prop_type == kCCBPropTypeColor3)
{
int r = [self readByte];
int g = [self readByte];
Expand All @@ -515,7 +515,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if (type == kCCBPropTypeColor4FVar)
else if (prop_type == kCCBPropTypeColor4FVar)
{
float r = [self readFloat];
float g = [self readFloat];
Expand All @@ -537,7 +537,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:cVarVal forKey:nameVar];
}
}
else if (type == kCCBPropTypeFlip)
else if (prop_type == kCCBPropTypeFlip)
{
BOOL xFlip = [self readBool];
BOOL yFlip = [self readBool];
Expand All @@ -550,7 +550,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:[NSNumber numberWithBool:yFlip] forKey:nameY];
}
}
else if (type == kCCBPropTypeBlendmode)
else if (prop_type == kCCBPropTypeBlendmode)
{
int src = [self readIntWithSign:NO];
int dst = [self readIntWithSign:NO];
Expand All @@ -564,13 +564,13 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:blendVal forKey:name];
}
}
else if (type == kCCBPropTypeFntFile)
else if (prop_type == kCCBPropTypeFntFile)
{
NSString* fntFile = [self readCachedString];
[node setValue:fntFile forKey:name];
}
else if (type == kCCBPropTypeText
|| type == kCCBPropTypeString)
else if (prop_type == kCCBPropTypeText
|| prop_type == kCCBPropTypeString)
{
NSString* txt = [self readCachedString];

Expand All @@ -579,7 +579,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:txt forKey:name];
}
}
else if (type == kCCBPropTypeFontTTF)
else if (prop_type == kCCBPropTypeFontTTF)
{
NSString* fnt = [self readCachedString];

Expand All @@ -592,7 +592,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
[node setValue:fnt forKey:name];
}
}
else if (type == kCCBPropTypeBlock)
else if (prop_type == kCCBPropTypeBlock)
{
NSString* selectorName = [self readCachedString];
int selectorTarget = [self readIntWithSign:NO];
Expand Down Expand Up @@ -655,7 +655,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if (type == kCCBPropTypeBlockCCControl)
else if (prop_type == kCCBPropTypeBlockCCControl)
{
NSString* selectorName = [self readCachedString];
int selectorTarget = [self readIntWithSign:NO];
Expand Down Expand Up @@ -691,7 +691,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
}
}
else if (type == kCCBPropTypeCCBFile)
else if (prop_type == kCCBPropTypeCCBFile)
{
NSString* ccbFileName = [self readCachedString];

Expand Down Expand Up @@ -737,7 +737,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
}
else
{
NSLog(@"CCBReader: Failed to read property type %d",type);
NSLog(@"CCBReader: Failed to read property type %d",prop_type);
}
}

Expand Down